diff --git a/data/Unleash_The_Mods/Working_mods/Abrahms_Recipes/itemgroups/Locations_MapExtras/locations.json b/data/Unleash_The_Mods/Working_mods/Abrahms_Recipes/itemgroups/Locations_MapExtras/locations.json
index 46c5fd140..6dd5b1b6f 100644
--- a/data/Unleash_The_Mods/Working_mods/Abrahms_Recipes/itemgroups/Locations_MapExtras/locations.json
+++ b/data/Unleash_The_Mods/Working_mods/Abrahms_Recipes/itemgroups/Locations_MapExtras/locations.json
@@ -96,7 +96,7 @@
     "extend": {
       "items": [
         [ "water_clean", 90 ],
-        [ "1st_aid", 35 ],
+        { "group": "full_1st_aid", "prob": 35 },
         [ "rope_30", 35 ],
         [ "chain", 20 ],
         [ "boots_steel", 50 ],
@@ -143,7 +143,6 @@
         [ "grapnel", 1 ],
         [ "toolbox_empty", 1 ],
         [ "apron_leather", 10 ],
-        [ "tool_anfo_charge", 1 ],
         [ "remotevehcontrol", 10 ],
         [ "wheel_huge", 25 ]
       ]
diff --git a/data/Unleash_The_Mods/Working_mods/Abrahms_Recipes/itemgroups/activities_hobbies.json b/data/Unleash_The_Mods/Working_mods/Abrahms_Recipes/itemgroups/activities_hobbies.json
index f3758b1eb..11b3d3bda 100644
--- a/data/Unleash_The_Mods/Working_mods/Abrahms_Recipes/itemgroups/activities_hobbies.json
+++ b/data/Unleash_The_Mods/Working_mods/Abrahms_Recipes/itemgroups/activities_hobbies.json
@@ -85,13 +85,7 @@
         [ "roller_blades", 20 ],
         [ "rollerskates", 10 ],
         [ "manual_throw", 12 ],
-        {
-          "item": "protein_powder",
-          "prob": 12,
-          "container-item": "bottle_plastic_small",
-          "charges-min": 1,
-          "charges-max": 9
-        },
+        { "prob": 12, "group": "protein_powder_bottle_plastic_small_1_9" },
         [ "airhorn", 40 ],
         [ "whistle", 10 ],
         [ "boots_hiking", 10 ],
diff --git a/data/Unleash_The_Mods/Working_mods/Abrahms_Recipes/items/comestibles/drink_other.json b/data/Unleash_The_Mods/Working_mods/Abrahms_Recipes/items/comestibles/drink_other.json
index 967e544e0..5fb183bc3 100644
--- a/data/Unleash_The_Mods/Working_mods/Abrahms_Recipes/items/comestibles/drink_other.json
+++ b/data/Unleash_The_Mods/Working_mods/Abrahms_Recipes/items/comestibles/drink_other.json
@@ -13,7 +13,6 @@
     "volume": "25 ml",
     "calories": 10,
     "spoils_in": "360 days",
-    "charges": 1,
     "fun": -1,
     "flags": [ "NUTRIENT_OVERRIDE", "USE_EAT_VERB" ],
     "cooks_like": "mayonnaise"
@@ -31,7 +30,6 @@
     "weight": "2 g",
     "volume": "25 ml",
     "calories": 21,
-    "charges": 1,
     "fun": 4,
     "flags": [ "NUTRIENT_OVERRIDE" ],
     "cooks_like": "ketchup"
diff --git a/data/Unleash_The_Mods/Working_mods/Abrahms_Recipes/items/comestibles/veggy_dishes.json b/data/Unleash_The_Mods/Working_mods/Abrahms_Recipes/items/comestibles/veggy_dishes.json
index 478647db7..8293513a7 100644
--- a/data/Unleash_The_Mods/Working_mods/Abrahms_Recipes/items/comestibles/veggy_dishes.json
+++ b/data/Unleash_The_Mods/Working_mods/Abrahms_Recipes/items/comestibles/veggy_dishes.json
@@ -3,7 +3,7 @@
     "id": "pasta_marinara",
     "type": "COMESTIBLE",
     "name": { "str": "pasta marinara", "str_pl": "pasta marinara" },
-    "weight": "80 g",
+    "weight": "20 g",
     "color": "red",
     "spoils_in": "2 days",
     "comestible_type": "FOOD",
@@ -13,8 +13,7 @@
     "description": "Cooked pasta with a jar of tomato sauce. Not very nutritious, but very easy to make.",
     "price": "10 USD",
     "material": [ "wheat", "veggy" ],
-    "volume": "500 ml",
-    "charges": 4,
+    "volume": "125 ml",
     "flags": [ "EATEN_HOT", "FREEZERBURN" ],
     "fun": 15,
     "vitamins": [ [ "calcium", 10 ], [ "iron", 10 ] ]
@@ -23,7 +22,7 @@
     "id": "pasta_primavera",
     "type": "COMESTIBLE",
     "name": { "str": "pasta primavera", "str_pl": "pasta primavera" },
-    "weight": "150 g",
+    "weight": "19 g",
     "color": "yellow",
     "spoils_in": "2 days",
     "comestible_type": "FOOD",
@@ -33,8 +32,7 @@
     "description": "Pasta with sauteed veggies, spices, and olive oil.",
     "price": "10 USD",
     "material": [ "wheat", "veggy" ],
-    "volume": "1750 ml",
-    "charges": 8,
+    "volume": "219 ml",
     "flags": [ "EATEN_HOT", "FREEZERBURN" ],
     "fun": 4,
     "vitamins": [ [ "vitA", 3 ], [ "vitC", 3 ], [ "calcium", 13 ], [ "iron", 4 ] ]
diff --git a/data/Unleash_The_Mods/Working_mods/Abrahms_Recipes/items/comestibles/wheat.json b/data/Unleash_The_Mods/Working_mods/Abrahms_Recipes/items/comestibles/wheat.json
index bee4a46e1..3327e79de 100644
--- a/data/Unleash_The_Mods/Working_mods/Abrahms_Recipes/items/comestibles/wheat.json
+++ b/data/Unleash_The_Mods/Working_mods/Abrahms_Recipes/items/comestibles/wheat.json
@@ -3,7 +3,7 @@
     "id": "couscous_raw",
     "type": "COMESTIBLE",
     "name": { "str": "raw couscous pasta", "str_pl": "raw couscous pasta" },
-    "weight": "60 g",
+    "weight": "12 g",
     "color": "yellow",
     "spoils_in": "360 days",
     "container": "box_small",
@@ -13,8 +13,7 @@
     "description": "Durum semolina wheat flour dough, rubbed between the hands until it forms small rice-like pellets. Could be eaten raw, but only takes a couple of minutes to cook, so why bother?",
     "price": "120 cent",
     "material": [ "wheat" ],
-    "volume": "62 ml",
-    "charges": 5,
+    "volume": "12 ml",
     "flags": [ "EDIBLE_FROZEN", "RAW" ],
     "vitamins": [ [ "calcium", 1 ], [ "iron", 10 ] ],
     "fun": -8
@@ -24,7 +23,7 @@
     "type": "COMESTIBLE",
     "name": { "str": "fun batter", "str_pl": "fun batter" },
     "spoils_in": "3 days",
-    "weight": "60 g",
+    "weight": "12 g",
     "color": "yellow",
     "container": "jar_glass_sealed",
     "comestible_type": "FOOD",
@@ -33,8 +32,7 @@
     "description": "A thin batter of rice and water, used to make rice noodle sheets called fun.",
     "price": "120 cent",
     "material": [ "wheat" ],
-    "volume": "62 ml",
-    "charges": 5,
+    "volume": "12 ml",
     "flags": [ "EDIBLE_FROZEN", "RAW" ],
     "vitamins": [ [ "calcium", 1 ], [ "iron", 10 ] ],
     "fun": -1
@@ -44,7 +42,7 @@
     "type": "COMESTIBLE",
     "name": { "str": "raw fun", "str_pl": "raw fun" },
     "spoils_in": "3 days",
-    "weight": "60 g",
+    "weight": "12 g",
     "color": "yellow",
     "container": "box_small",
     "comestible_type": "FOOD",
@@ -53,8 +51,7 @@
     "description": "Thin, very wide Chinese rice noodles, made from a thin batter, steamed into sheets then cut into wide strips.",
     "price": "120 cent",
     "material": [ "wheat" ],
-    "volume": "62 ml",
-    "charges": 5,
+    "volume": "12 ml",
     "flags": [ "EDIBLE_FROZEN", "RAW" ],
     "vitamins": [ [ "calcium", 1 ], [ "iron", 10 ] ],
     "fun": 2
diff --git a/data/Unleash_The_Mods/Working_mods/Abrahms_Recipes/recipes/recipe_food.json b/data/Unleash_The_Mods/Working_mods/Abrahms_Recipes/recipes/recipe_food.json
index 5bd189fed..961140475 100644
--- a/data/Unleash_The_Mods/Working_mods/Abrahms_Recipes/recipes/recipe_food.json
+++ b/data/Unleash_The_Mods/Working_mods/Abrahms_Recipes/recipes/recipe_food.json
@@ -8,7 +8,7 @@
     "skill_used": "cooking",
     "difficulty": 1,
     "time": "20 m",
-    "charges": 4,
+    "charges": 16,
     "autolearn": true,
     "qualities": [ { "id": "CUT", "level": 1 }, { "id": "COOK", "level": 3 } ],
     "tools": [ [ [ "surface_heat", 15, "LIST" ] ] ],
@@ -28,7 +28,7 @@
     "skill_used": "cooking",
     "difficulty": 1,
     "time": "20 m",
-    "charges": 4,
+    "charges": 32,
     "autolearn": true,
     "qualities": [ { "id": "COOK", "level": 1 } ],
     "tools": [ [ [ "surface_heat", 25, "LIST" ] ] ],
@@ -53,7 +53,7 @@
     "skill_used": "cooking",
     "difficulty": 1,
     "time": "20 m",
-    "charges": 4,
+    "charges": 32,
     "autolearn": true,
     "qualities": [ { "id": "COOK", "level": 1 } ],
     "tools": [ [ [ "surface_heat", 25, "LIST" ] ] ],
@@ -102,7 +102,7 @@
     "skill_used": "cooking",
     "difficulty": 2,
     "time": "20 m",
-    "charges": 3,
+    "charges": 9,
     "autolearn": true,
     "qualities": [ { "id": "COOK", "level": 3 } ],
     "tools": [ [ [ "surface_heat", 30, "LIST" ] ] ],
@@ -125,7 +125,7 @@
     "skill_used": "cooking",
     "difficulty": 1,
     "time": "20 m",
-    "charges": 4,
+    "charges": 32,
     "autolearn": true,
     "qualities": [ { "id": "CUT", "level": 1 }, { "id": "COOK", "level": 3 } ],
     "tools": [ [ [ "surface_heat", 15, "LIST" ] ] ],
@@ -188,7 +188,7 @@
     "skill_used": "cooking",
     "difficulty": 4,
     "time": "4 h",
-    "charges": 2,
+    "charges": 20,
     "autolearn": true,
     "qualities": [ { "id": "COOK", "level": 2 } ],
     "proficiencies": [ { "proficiency": "prof_food_prep" }, { "proficiency": "prof_knife_skills" } ],
@@ -466,6 +466,7 @@
     "skill_used": "cooking",
     "difficulty": 4,
     "time": "30 m",
+    "charges": 5,
     "batch_time_factors": [ 25, 1 ],
     "proficiencies": [ { "proficiency": "prof_food_prep" } ],
     "autolearn": true,
@@ -482,6 +483,7 @@
     "time": "20 m",
     "batch_time_factors": [ 25, 1 ],
     "autolearn": true,
+    "charges": 5,
     "tools": [ [ [ "rock_quern", -1 ], [ "clay_quern", -1 ], [ "mortar_pestle", -1 ] ] ],
     "proficiencies": [ { "proficiency": "prof_food_prep" } ],
     "qualities": [ { "id": "BOIL", "level": 1 }, { "id": "CUT", "level": 1 } ],
@@ -497,6 +499,7 @@
     "difficulty": 4,
     "time": "4 m",
     "autolearn": true,
+    "charges": 5,
     "tools": [ [ [ "surface_heat", 5, "LIST" ] ], [ [ "sheet", -1 ] ], [ [ "pan_fun", -1 ] ] ],
     "proficiencies": [ { "proficiency": "prof_food_prep" } ],
     "qualities": [ { "id": "BOIL", "level": 1 }, { "id": "CUT", "level": 1 } ],