diff --git a/data/json/items/comestibles/drink.json b/data/json/items/comestibles/drink.json
index 9159895cb7711..32c029bc24503 100644
--- a/data/json/items/comestibles/drink.json
+++ b/data/json/items/comestibles/drink.json
@@ -127,14 +127,14 @@
     "id": "can_coconut",
     "looks_like": "milk",
     "name": { "str_sp": "coconut milk" },
-    "weight": "238 g",
+    "weight": "226 g",
     "color": "white",
     "spoils_in": "1 day",
     "container": "can_medium",
     "comestible_type": "FOOD",
     "symbol": "%",
     "quench": 5,
-    "calories": 470,
+    "calories": 445,
     "description": "A dense, sweet, creamy sauce, often used in curries.",
     "price": 350,
     "price_postapoc": 500,
@@ -142,7 +142,7 @@
     "volume": "500 ml",
     "phase": "liquid",
     "charges": 2,
-    "vitamins": [ [ "vitC", 4 ], [ "calcium", 3 ], [ "iron", 43 ] ],
+    "vitamins": [ [ "vitC", "2300 μg" ], [ "iron", "7500 μg" ], [ "calcium", "40700 μg" ] ],
     "fun": 1
   },
   {
@@ -1066,7 +1066,7 @@
     "phase": "liquid",
     "flags": [ "EATEN_COLD" ],
     "//": "most store-bought oj is fortified with calcium.",
-    "vitamins": [ [ "vitC", 96 ], [ "calcium", 23 ] ],
+    "vitamins": [ [ "vitC", "83700 μg" ], [ "iron", "320 μg" ], [ "calcium", "348600 μg" ] ],
     "fun": 3
   },
   {
@@ -1074,13 +1074,13 @@
     "id": "oj_fresh",
     "looks_like": "oj",
     "name": { "str_sp": "fresh orange juice" },
-    "weight": "249 g",
+    "weight": "248 g",
     "color": "yellow",
     "spoils_in": "2 days",
     "comestible_type": "DRINK",
     "symbol": "~",
     "quench": 35,
-    "calories": 126,
+    "calories": 111,
     "//": "Calories shouldn't matter since it won't spawn - should only be craftable.",
     "description": "Freshly-squeezed from real oranges!  Tasty and nutritious.",
     "price": 14,
@@ -1091,7 +1091,7 @@
     "charges": 1,
     "phase": "liquid",
     "flags": [ "EATEN_COLD" ],
-    "vitamins": [ [ "vitC", 83 ], [ "calcium", 1 ], [ "iron", 1 ] ],
+    "vitamins": [ [ "vitC", "124 mg" ], [ "iron", "500 μg" ], [ "calcium", "27300 μg" ] ],
     "fun": 3
   },
   {
@@ -1099,14 +1099,14 @@
     "id": "orangesoda",
     "looks_like": "juice",
     "name": { "str_sp": "orange soda" },
-    "weight": "248 g",
+    "weight": "227 g",
     "color": "yellow",
     "container": "can_drink",
     "comestible_type": "DRINK",
     "symbol": "~",
     "quench": 18,
     "healthy": -1,
-    "calories": 126,
+    "calories": 130,
     "description": "Unlike cola this is caffeine free, however it is still carbonated, sweet, and tastes vaguely orange-like.",
     "price": 95,
     "price_postapoc": 50,
diff --git a/data/json/items/comestibles/drink_other.json b/data/json/items/comestibles/drink_other.json
index 233f62c9686f1..b5d6150528cfb 100644
--- a/data/json/items/comestibles/drink_other.json
+++ b/data/json/items/comestibles/drink_other.json
@@ -354,15 +354,15 @@
     "price": 50,
     "price_postapoc": 10,
     "material": [ "water" ],
-    "weight": "250 g",
+    "weight": "240 g",
     "volume": "250 ml",
     "comestible_type": "DRINK",
     "container": "carton_sealed",
     "quench": 47,
-    "calories": 47,
+    "calories": 45,
     "fun": 3,
     "phase": "liquid",
-    "vitamins": [ [ "calcium", 6 ], [ "iron", 4 ], [ "vitC", 10 ] ]
+    "vitamins": [ [ "vitC", "5800 μg" ], [ "iron", "700 μg" ], [ "calcium", "57600 μg" ] ]
   },
   {
     "type": "COMESTIBLE",
diff --git a/data/json/items/comestibles/fruit_dishes.json b/data/json/items/comestibles/fruit_dishes.json
index 46b26ff2a6603..d506c34008f94 100644
--- a/data/json/items/comestibles/fruit_dishes.json
+++ b/data/json/items/comestibles/fruit_dishes.json
@@ -99,14 +99,14 @@
     "type": "COMESTIBLE",
     "id": "can_peach",
     "name": { "str_sp": "peaches in syrup" },
-    "weight": "244 g",
+    "weight": "251 g",
     "color": "yellow",
     "spoils_in": "1 day 6 hours",
     "container": "can_food",
     "comestible_type": "FOOD",
     "symbol": "%",
     "quench": 6,
-    "calories": 58,
+    "calories": 135,
     "sealed": true,
     "description": "Yellow cling peach slices packed in light syrup.",
     "price": 96,
@@ -114,7 +114,7 @@
     "material": [ "fruit" ],
     "volume": "250 ml",
     "fun": 5,
-    "vitamins": [ [ "vitC", 7 ], [ "iron", 4 ] ]
+    "vitamins": [ [ "vitC", "6 mg" ], [ "iron", "900 μg" ], [ "calcium", "7500 μg" ] ]
   },
   {
     "type": "COMESTIBLE",
@@ -134,7 +134,7 @@
     "material": [ "fruit" ],
     "volume": "250 ml",
     "fun": 7,
-    "vitamins": [ [ "vitC", 21 ], [ "calcium", 2 ], [ "iron", 5 ] ]
+    "vitamins": [ [ "vitC", "18900 μg" ], [ "iron", "1 mg" ], [ "calcium", "36900 μg" ] ]
   },
   {
     "type": "COMESTIBLE",
diff --git a/data/json/items/comestibles/raw_fruit.json b/data/json/items/comestibles/raw_fruit.json
index b63662a38bcd3..6794c6bcf0fdd 100644
--- a/data/json/items/comestibles/raw_fruit.json
+++ b/data/json/items/comestibles/raw_fruit.json
@@ -18,28 +18,28 @@
     "fun": 3,
     "flags": [ "FREEZERBURN", "SMOKABLE" ],
     "smoking_result": "dry_fruit",
-    "vitamins": [ [ "vitC", 9 ], [ "iron", 1 ] ]
+    "vitamins": [ [ "vitC", "8400 μg" ], [ "iron", "200 μg" ], [ "calcium", "10900 μg" ] ]
   },
   {
     "type": "COMESTIBLE",
     "id": "crabapple",
     "name": { "str": "crabapple" },
-    "weight": "35 g",
+    "weight": "50 g",
     "color": "red",
     "spoils_in": "6 days 16 hours",
     "comestible_type": "FOOD",
     "symbol": "%",
     "quench": 1,
-    "calories": 18,
+    "calories": 38,
     "description": "A term used to describe both wild apples native to North America as well as less appetizing feral varieties, these are rather small and far too sour.",
     "price": 40,
     "price_postapoc": 100,
     "material": [ "fruit" ],
-    "volume": "45 ml",
+    "volume": "64 ml",
     "fun": -1,
     "flags": [ "FREEZERBURN", "SMOKABLE" ],
     "smoking_result": "dry_fruit",
-    "vitamins": [ [ "vitC", 2 ] ]
+    "vitamins": [ [ "vitC", "4 mg" ], [ "iron", "200 μg" ], [ "calcium", "9 mg" ] ]
   },
   {
     "type": "COMESTIBLE",
@@ -59,40 +59,40 @@
     "fun": 5,
     "flags": [ "SMOKABLE" ],
     "smoking_result": "dry_fruit",
-    "vitamins": [ [ "vitC", 11 ], [ "iron", 1 ] ]
+    "vitamins": [ [ "vitC", "10300 μg" ], [ "iron", "300 μg" ], [ "calcium", "5900 μg" ] ]
   },
   {
     "type": "COMESTIBLE",
     "id": "orange",
     "name": { "str": "orange" },
-    "weight": "159 g",
+    "weight": "131 g",
     "color": "light_red",
     "spoils_in": "21 days",
     "comestible_type": "FOOD",
     "symbol": "%",
     "quench": 8,
-    "calories": 100,
+    "calories": 131,
     "description": "A sweet citrus fruit.  Also comes in juice form.  In case you were wondering, the color is named after the fruit, not the other way around.",
     "price": 35,
     "price_postapoc": 100,
     "material": [ "fruit" ],
-    "volume": "204 ml",
+    "volume": "156 ml",
     "fun": 3,
     "flags": [ "FREEZERBURN", "SMOKABLE" ],
     "smoking_result": "dry_fruit",
-    "vitamins": [ [ "vitC", 125 ], [ "calcium", 8 ], [ "iron", 7 ] ]
+    "vitamins": [ [ "vitC", "69700 μg" ], [ "iron", "100 μg" ], [ "calcium", "52400 μg" ] ]
   },
   {
     "type": "COMESTIBLE",
     "id": "lemon",
     "name": { "str": "lemon" },
-    "weight": "84 g",
+    "weight": "108 g",
     "color": "yellow",
     "spoils_in": "21 days",
     "comestible_type": "FOOD",
     "symbol": "%",
     "quench": 5,
-    "calories": 24,
+    "calories": 21,
     "description": "A very sour citrus fruit.  Can be eaten if you're desperate, but you should probably look for some other cooking application for this.",
     "price": 38,
     "price_postapoc": 100,
@@ -100,7 +100,7 @@
     "volume": "115 ml",
     "flags": [ "FREEZERBURN", "SMOKABLE", "RAW" ],
     "smoking_result": "dry_fruit",
-    "vitamins": [ [ "vitC", 49 ], [ "calcium", 1 ], [ "iron", 2 ] ],
+    "vitamins": [ [ "vitC", "83200 μg" ], [ "iron", "800 μg" ], [ "calcium", "65900 μg" ] ],
     "fun": -4
   },
   {
@@ -122,7 +122,7 @@
     "fun": 2,
     "flags": [ "SMOKABLE", "EDIBLE_FROZEN" ],
     "smoking_result": "dry_fruit",
-    "vitamins": [ [ "vitC", 16 ], [ "iron", 2 ] ]
+    "vitamins": [ [ "vitC", "14400 μg" ], [ "iron", "400 μg" ], [ "calcium", "8900 μg" ] ]
   },
   {
     "type": "COMESTIBLE",
@@ -143,13 +143,13 @@
     "fun": 5,
     "flags": [ "SMOKABLE", "EDIBLE_FROZEN" ],
     "smoking_result": "dry_fruit",
-    "vitamins": [ [ "vitC", 94 ], [ "calcium", 1 ], [ "iron", 3 ] ]
+    "vitamins": [ [ "vitC", "84700 μg" ], [ "iron", "600 μg" ], [ "calcium", "23 mg" ] ]
   },
   {
     "type": "COMESTIBLE",
     "id": "cranberries",
     "name": { "str": "handful of cranberries", "str_pl": "handfuls of cranberries" },
-    "weight": "106 g",
+    "weight": "100 g",
     "color": "red",
     "spoils_in": 640,
     "comestible_type": "FOOD",
@@ -164,7 +164,7 @@
     "fun": -5,
     "flags": [ "SMOKABLE", "EDIBLE_FROZEN" ],
     "smoking_result": "dry_fruit",
-    "vitamins": [ [ "vitC", 14 ], [ "iron", 1 ] ]
+    "vitamins": [ [ "vitC", "13300 μg" ], [ "iron", "300 μg" ], [ "calcium", "8 mg" ] ]
   },
   {
     "type": "COMESTIBLE",
@@ -185,7 +185,7 @@
     "fun": 4,
     "flags": [ "SMOKABLE", "EDIBLE_FROZEN" ],
     "smoking_result": "dry_fruit",
-    "vitamins": [ [ "vitC", 35 ], [ "calcium", 2 ], [ "iron", 4 ] ]
+    "vitamins": [ [ "vitC", "32200 μg" ], [ "iron", "800 μg" ], [ "calcium", "30800 μg" ] ]
   },
   {
     "type": "COMESTIBLE",
@@ -206,7 +206,7 @@
     "fun": 2,
     "flags": [ "SMOKABLE", "EDIBLE_FROZEN" ],
     "smoking_result": "dry_fruit",
-    "vitamins": [ [ "vitC", 5 ], [ "calcium", 1 ], [ "iron", 2 ] ]
+    "vitamins": [ [ "vitC", "4100 μg" ], [ "iron", "400 μg" ], [ "calcium", "8900 μg" ] ]
   },
   {
     "type": "COMESTIBLE",
@@ -288,7 +288,7 @@
     "fun": 4,
     "flags": [ "SMOKABLE", "EDIBLE_FROZEN" ],
     "smoking_result": "dry_fruit",
-    "vitamins": [ [ "vitC", 56 ], [ "calcium", 4 ], [ "iron", 14 ] ]
+    "vitamins": [ [ "vitC", "51 mg" ], [ "iron", "2600 μg" ], [ "calcium", "54600 μg" ] ]
   },
   {
     "type": "COMESTIBLE",
@@ -310,7 +310,7 @@
     "fun": -2,
     "flags": [ "SMOKABLE", "RAW", "EDIBLE_FROZEN" ],
     "smoking_result": "dry_fruit",
-    "vitamins": [ [ "vitC", 58 ], [ "calcium", 4 ], [ "iron", 13 ] ]
+    "vitamins": [ [ "vitC", "52200 μg" ], [ "iron", "2300 μg" ], [ "calcium", "55100 μg" ] ]
   },
   {
     "type": "COMESTIBLE",
@@ -331,7 +331,7 @@
     "volume": "250 ml",
     "fun": 2,
     "flags": [ "RAW", "EDIBLE_FROZEN", "INEDIBLE", "CATTLE", "RABBIT", "BIRD" ],
-    "vitamins": [ [ "vitC", 300 ], [ "calcium", 8 ], [ "iron", 4 ] ]
+    "vitamins": [ [ "vitC", "272640 μg" ], [ "iron", "678 μg" ], [ "calcium", "108160 μg" ] ]
   },
   {
     "type": "COMESTIBLE",
@@ -343,7 +343,7 @@
     "comestible_type": "FOOD",
     "symbol": "%",
     "quench": 1,
-    "calories": 102,
+    "calories": 103,
     "description": "Tart little fruits grown from a rose bush, now separated from their inedible seeds and spines.",
     "price": 200,
     "price_postapoc": 50,
@@ -352,13 +352,13 @@
     "fun": 2,
     "flags": [ "SMOKABLE", "RAW", "EDIBLE_FROZEN" ],
     "smoking_result": "dry_fruit",
-    "vitamins": [ [ "vitC", 300 ], [ "calcium", 8 ], [ "iron", 4 ] ]
+    "vitamins": [ [ "vitC", "272640 μg" ], [ "iron", "678 μg" ], [ "calcium", "108160 μg" ] ]
   },
   {
     "type": "COMESTIBLE",
     "id": "juice_pulp",
     "name": { "str_sp": "juice pulp" },
-    "weight": "62 g",
+    "weight": "20 g",
     "color": "light_red",
     "spoils_in": "2 days 12 hours",
     "comestible_type": "FOOD",
@@ -367,7 +367,7 @@
     "calories": 25,
     "description": "A handful of stringy pulp, left-over from juicing some kind of fruit.  It's not very tasty, but contains a lot of healthy fiber.",
     "price": 25,
-    "price_postapoc": 25,
+    "price_postapoc": 20,
     "material": [ "fruit" ],
     "volume": "100 ml",
     "flags": [ "SMOKABLE" ],
@@ -394,7 +394,7 @@
     "fun": 4,
     "flags": [ "FREEZERBURN", "SMOKABLE" ],
     "smoking_result": "dry_fruit",
-    "vitamins": [ [ "vitC", 8 ], [ "calcium", 1 ], [ "iron", 1 ] ]
+    "vitamins": [ [ "vitC", "7700 μg" ], [ "iron", "300 μg" ], [ "calcium", "16 mg" ] ]
   },
   {
     "type": "COMESTIBLE",
@@ -415,12 +415,12 @@
     "fun": 4,
     "flags": [ "FREEZERBURN", "SMOKABLE" ],
     "smoking_result": "dry_fruit",
-    "vitamins": [ [ "vitC", 139 ] ]
+    "vitamins": [ [ "vitC", "125600 μg" ], [ "iron", "100 μg" ], [ "calcium", "9900 μg" ] ]
   },
   {
     "type": "COMESTIBLE",
     "id": "maracuya",
-    "name": { "str": "passionfruit" },
+    "name": { "str": "handful of passionfruit", "str_pl": "handfuls of passionfruit" },
     "weight": "236 g",
     "color": "brown",
     "spoils_in": "14 days",
@@ -435,7 +435,7 @@
     "volume": "250 ml",
     "flags": [ "FREEZERBURN", "SMOKABLE" ],
     "smoking_result": "dry_fruit",
-    "vitamins": [ [ "vitC", 70 ], [ "iron", 21 ] ],
+    "vitamins": [ [ "vitC", "70800 μg" ], [ "iron", "3800 μg" ], [ "calcium", "28300 μg" ] ],
     "fun": 3
   },
   {
@@ -457,7 +457,7 @@
     "fun": 3,
     "flags": [ "FREEZERBURN", "SMOKABLE" ],
     "smoking_result": "dry_fruit",
-    "vitamins": [ [ "vitC", 4 ], [ "iron", 2 ] ]
+    "vitamins": [ [ "vitC", "3800 μg" ], [ "iron", "400 μg" ], [ "calcium", "9600 μg" ] ]
   },
   {
     "type": "COMESTIBLE",
@@ -477,7 +477,7 @@
     "volume": "455 ml",
     "flags": [ "FREEZERBURN", "SMOKABLE" ],
     "smoking_result": "dry_fruit",
-    "vitamins": [ [ "vitC", 101 ], [ "calcium", 2 ], [ "iron", 1 ] ],
+    "vitamins": [ [ "vitC", "91 mg" ], [ "iron", "300 μg" ], [ "calcium", "36900 μg" ] ],
     "fun": 2
   },
   {
@@ -499,7 +499,7 @@
     "fun": 3,
     "flags": [ "SMOKABLE", "EDIBLE_FROZEN" ],
     "smoking_result": "dry_fruit",
-    "vitamins": [ [ "vitC", 10 ], [ "calcium", 1 ], [ "iron", 2 ] ]
+    "vitamins": [ [ "vitC", "9700 μg" ], [ "iron", "500 μg" ], [ "calcium", "17900 μg" ] ]
   },
   {
     "type": "COMESTIBLE",
@@ -520,19 +520,19 @@
     "fun": 3,
     "flags": [ "SMOKABLE" ],
     "smoking_result": "dry_fruit",
-    "vitamins": [ [ "vitC", 7 ] ]
+    "vitamins": [ [ "vitC", "6300 μg" ], [ "iron", "100 μg" ], [ "calcium", "4 mg" ] ]
   },
   {
     "type": "COMESTIBLE",
     "id": "grapes",
     "name": { "str": "handful of grapes", "str_pl": "handfuls of grapes" },
-    "weight": "92 g",
+    "weight": "151 g",
     "color": "light_green",
     "spoils_in": "5 days",
     "comestible_type": "FOOD",
     "symbol": "%",
     "quench": 5,
-    "calories": 61,
+    "calories": 104,
     "description": "A handful of juicy grapes.  Quite calorie-dense compared to most fruit, and you might be able to make them into wine if you're ambitious enough.",
     "price": 29,
     "price_postapoc": 100,
@@ -541,7 +541,7 @@
     "fun": 4,
     "flags": [ "FREEZERBURN", "SMOKABLE", "EDIBLE_FROZEN" ],
     "smoking_result": "dry_fruit",
-    "vitamins": [ [ "vitC", 4 ], [ "calcium", 1 ], [ "iron", 1 ] ]
+    "vitamins": [ [ "vitC", "4800 μg" ], [ "iron", "500 μg" ], [ "calcium", "15100 μg" ] ]
   },
   {
     "type": "COMESTIBLE",
@@ -562,7 +562,7 @@
     "fun": -4,
     "flags": [ "SMOKABLE" ],
     "smoking_result": "dry_fruit",
-    "vitamins": [ [ "vitC", 480 ], [ "calcium", 9 ], [ "iron", 14 ] ],
+    "vitamins": [ [ "vitC", "432600 μg" ], [ "iron", "2600 μg" ], [ "calcium", "117700 μg" ] ],
     "melee_damage": { "bash": 1 }
   },
   {
@@ -584,7 +584,7 @@
     "fun": 4,
     "flags": [ "SMOKABLE" ],
     "smoking_result": "dry_fruit",
-    "vitamins": [ [ "vitC", 87 ], [ "calcium", 1 ], [ "iron", 2 ] ]
+    "vitamins": [ [ "vitC", "78900 μg" ], [ "iron", "500 μg" ], [ "calcium", "21500 μg" ] ]
   },
   {
     "type": "COMESTIBLE",
@@ -602,7 +602,7 @@
     "price_postapoc": 100,
     "material": [ "fruit" ],
     "volume": "1850 ml",
-    "vitamins": [ [ "vitC", 15 ], [ "calcium", 4 ], [ "iron", 36 ] ],
+    "vitamins": [ [ "vitC", "16200 μg" ], [ "iron", "8300 μg" ], [ "calcium", "102400 μg" ] ],
     "melee_damage": { "bash": 2 }
   },
   {
@@ -615,16 +615,16 @@
     "comestible_type": "FOOD",
     "symbol": "%",
     "quench": 5,
-    "calories": 82,
+    "calories": 283,
     "description": "A handful of coconut flesh.  It's surprisingly calorie-dense.",
-    "price": 283,
+    "price": 82,
     "price_postapoc": 50,
     "material": [ "fruit" ],
     "volume": "250 ml",
     "fun": 4,
     "flags": [ "SMOKABLE" ],
     "smoking_result": "dry_fruit",
-    "vitamins": [ [ "vitC", 2 ], [ "iron", 10 ] ]
+    "vitamins": [ [ "vitC", "2600 μg" ], [ "iron", "1900 μg" ], [ "calcium", "11200 μg" ] ]
   },
   {
     "type": "COMESTIBLE",
@@ -645,7 +645,7 @@
     "fun": 4,
     "flags": [ "SMOKABLE" ],
     "smoking_result": "dry_fruit",
-    "vitamins": [ [ "vitC", 11 ], [ "iron", 2 ] ]
+    "vitamins": [ [ "vitC", "9900 μg" ], [ "iron", "400 μg" ], [ "calcium", "9 mg" ] ]
   },
   {
     "type": "COMESTIBLE",
@@ -665,7 +665,7 @@
     "material": [ "fruit" ],
     "volume": "7150 ml",
     "flags": [ "EATEN_COLD", "FREEZERBURN", "INEDIBLE" ],
-    "vitamins": [ [ "vitC", 406 ], [ "calcium", 24 ], [ "iron", 60 ] ],
+    "vitamins": [ [ "vitC", "366 mg" ], [ "iron", "10800 μg" ], [ "calcium", "316300 μg" ] ],
     "melee_damage": { "bash": 2 }
   },
   {
@@ -687,7 +687,7 @@
     "flags": [ "EATEN_COLD", "FREEZERBURN", "SMOKABLE" ],
     "fun": 4,
     "smoking_result": "dry_fruit",
-    "vitamins": [ [ "vitC", 25 ], [ "calcium", 1 ], [ "iron", 4 ] ]
+    "vitamins": [ [ "vitC", "23200 μg" ], [ "iron", "700 μg" ], [ "calcium", "20 mg" ] ]
   },
   {
     "type": "COMESTIBLE",
@@ -707,7 +707,7 @@
     "volume": "1100 ml",
     "flags": [ "EATEN_COLD", "INEDIBLE" ],
     "fun": 4,
-    "vitamins": [ [ "vitC", 225 ], [ "calcium", 3 ], [ "iron", 6 ] ],
+    "vitamins": [ [ "vitC", "202600 μg" ], [ "iron", "1200 μg" ], [ "calcium", "49700 μg" ] ],
     "melee_damage": { "bash": 1 }
   },
   {
@@ -729,7 +729,7 @@
     "fun": 4,
     "flags": [ "SMOKABLE", "EATEN_COLD" ],
     "smoking_result": "dry_fruit",
-    "vitamins": [ [ "vitC", 65 ], [ "calcium", 1 ], [ "iron", 1 ] ]
+    "vitamins": [ [ "vitC", "50650 μg" ], [ "iron", "300 μg" ], [ "calcium", "12425 μg" ] ]
   },
   {
     "type": "COMESTIBLE",
@@ -750,7 +750,7 @@
     "fun": 4,
     "flags": [ "SMOKABLE", "EDIBLE_FROZEN" ],
     "smoking_result": "dry_fruit",
-    "vitamins": [ [ "vitC", 33 ], [ "calcium", 3 ], [ "iron", 5 ] ]
+    "vitamins": [ [ "vitC", "30200 μg" ], [ "iron", "900 μg" ], [ "calcium", "41800 μg" ] ]
   },
   {
     "type": "COMESTIBLE",
@@ -771,7 +771,7 @@
     "fun": 5,
     "flags": [ "SMOKABLE" ],
     "smoking_result": "dry_fruit",
-    "vitamins": [ [ "vitC", 83 ], [ "calcium", 1 ], [ "iron", 1 ] ]
+    "vitamins": [ [ "vitC", "75300 μg" ], [ "iron", "300 μg" ], [ "calcium", "22800 μg" ] ]
   },
   {
     "type": "COMESTIBLE",
@@ -792,7 +792,7 @@
     "fun": 7,
     "flags": [ "SMOKABLE" ],
     "smoking_result": "dry_fruit",
-    "vitamins": [ [ "vitC", 32 ], [ "calcium", 2 ], [ "iron", 4 ] ]
+    "vitamins": [ [ "vitC", "28800 μg" ], [ "iron", "800 μg" ], [ "calcium", "28200 μg" ] ]
   },
   {
     "type": "COMESTIBLE",
@@ -804,16 +804,16 @@
     "comestible_type": "FOOD",
     "symbol": "%",
     "quench": 24,
-    "calories": 496,
+    "calories": 130,
     "description": "A very sweet and soft tropical fruit.",
     "price": 118,
     "price_postapoc": 300,
     "material": [ "fruit" ],
-    "volume": "400 ml",
+    "volume": "594 ml",
     "fun": 5,
     "flags": [ "SMOKABLE" ],
     "smoking_result": "dry_fruit",
-    "vitamins": [ [ "vitC", 205 ], [ "calcium", 4 ], [ "iron", 4 ] ]
+    "vitamins": [ [ "vitC", "185100 μg" ], [ "iron", "800 μg" ], [ "calcium", "60800 μg" ] ]
   },
   {
     "type": "COMESTIBLE",
@@ -834,7 +834,7 @@
     "fun": 3,
     "flags": [ "SMOKABLE" ],
     "smoking_result": "dry_fruit",
-    "vitamins": [ [ "vitC", 71 ], [ "calcium", 1 ], [ "iron", 1 ] ]
+    "vitamins": [ [ "vitC", "64 mg" ], [ "iron", "200 μg" ], [ "calcium", "23500 μg" ] ]
   },
   {
     "type": "COMESTIBLE",
@@ -856,7 +856,7 @@
     "fun": 3,
     "flags": [ "SMOKABLE" ],
     "smoking_result": "dry_fruit",
-    "vitamins": [ [ "vitC", 15 ], [ "calcium", 1 ], [ "iron", 2 ] ]
+    "vitamins": [ [ "vitC", "14 mg" ], [ "iron", "500 μg" ], [ "calcium", "18200 μg" ] ]
   },
   {
     "type": "COMESTIBLE",
@@ -882,22 +882,22 @@
   {
     "type": "COMESTIBLE",
     "id": "cactus_pad",
-    "name": { "str": "cactus pad" },
-    "weight": "149 g",
+    "name": { "str": "handful of nopales", "str_pl": "handfuls of nopales" },
+    "weight": "86 g",
     "color": "green",
     "spoils_in": "1 days",
     "comestible_type": "FOOD",
     "symbol": "%",
     "quench": 15,
-    "calories": 15,
-    "description": "An edible pad from a cactus.",
+    "calories": 14,
+    "description": "A handful of edible pads from a cactus.",
     "price": 50,
     "price_postapoc": 25,
     "material": [ "fruit" ],
     "volume": "250 ml",
     "fun": -1,
     "flags": [ "RAW" ],
-    "vitamins": [ [ "vitC", 9 ], [ "calcium", 16 ], [ "iron", 3 ] ]
+    "vitamins": [ [ "vitC", "8 mg" ], [ "iron", "500 μg" ], [ "calcium", "141 mg" ] ]
   },
   {
     "type": "COMESTIBLE",
diff --git a/data/json/recipes/food/canned.json b/data/json/recipes/food/canned.json
index f7984a9bf3f2c..d5a13aee1cb16 100644
--- a/data/json/recipes/food/canned.json
+++ b/data/json/recipes/food/canned.json
@@ -1279,7 +1279,7 @@
     "activity_level": "NO_EXERCISE",
     "result": "oj_fresh",
     "id_suffix": "jarred_3l",
-    "byproducts": [ [ "water_clean", 12 ], [ "juice_pulp", 24 ] ],
+    "byproducts": [ [ "water_clean", 12 ], [ "juice_pulp", 192 ] ],
     "container": "jar_3l_glass_sealed",
     "category": "CC_FOOD",
     "subcategory": "CSC_FOOD_VEGGI",
@@ -1294,7 +1294,7 @@
     "using": [ [ "canning_low_heat", 6, "LIST" ] ],
     "//": "Acidic enough on their own that no canning_acid is needed",
     "//1": "waterbath canning is measured in 0.5 liter quantities, so 6u of canning_low_heat.",
-    "components": [ [ [ "jar_3l_glass_sealed", 1 ] ], [ [ "orange", 24 ] ], [ [ "water_clean", 6 ] ] ]
+    "components": [ [ [ "jar_3l_glass_sealed", 1 ] ], [ [ "orange", 48 ] ], [ [ "water_clean", 6 ] ] ]
   },
   {
     "type": "recipe",
@@ -1424,7 +1424,7 @@
     "activity_level": "NO_EXERCISE",
     "result": "oj_fresh",
     "id_suffix": "jarred",
-    "byproducts": [ [ "water_clean", 2 ], [ "juice_pulp", 4 ] ],
+    "byproducts": [ [ "water_clean", 2 ], [ "juice_pulp", 32 ] ],
     "container": "jar_glass_sealed",
     "category": "CC_FOOD",
     "subcategory": "CSC_FOOD_VEGGI",
@@ -1439,7 +1439,7 @@
     "using": [ [ "canning_low_heat", 1, "LIST" ] ],
     "//": "Acidic enough on their own that no canning_acid is needed",
     "//1": "waterbath canning is measured in 0.5 liter quantities, so 1u of canning_low_heat.",
-    "components": [ [ [ "jar_glass_sealed", 1 ] ], [ [ "orange", 4 ] ], [ [ "water_clean", 1 ] ] ]
+    "components": [ [ [ "jar_glass_sealed", 1 ] ], [ [ "orange", 8 ] ], [ [ "water_clean", 1 ] ] ]
   },
   {
     "//0": "--------------------Tin can recipes begin here--------------------",
@@ -2547,7 +2547,7 @@
     "activity_level": "NO_EXERCISE",
     "result": "oj_fresh",
     "id_suffix": "canned",
-    "byproducts": [ [ "juice_pulp", 4 ], [ "water_clean", 1 ] ],
+    "byproducts": [ [ "juice_pulp", 32 ], [ "water_clean", 1 ] ],
     "container": "can_medium",
     "category": "CC_FOOD",
     "subcategory": "CSC_FOOD_VEGGI",
@@ -2560,7 +2560,7 @@
     "contained": true,
     "batch_time_factors": [ 83, 5 ],
     "qualities": [ { "id": "STRAIN", "level": 2 } ],
-    "components": [ [ [ "water_clean", 1 ] ], [ [ "orange", 4 ] ] ],
+    "components": [ [ [ "water_clean", 1 ] ], [ [ "orange", 8 ] ] ],
     "//1": "tincan canning is measured in 0.25 liter quantities, so 2u of canning_metal.",
     "using": [ [ "canning_metal", 2, "LIST" ], [ "tincan_medium", 1 ] ]
   },
@@ -2569,7 +2569,7 @@
     "activity_level": "NO_EXERCISE",
     "result": "oj_fresh",
     "id_suffix": "canned_small",
-    "byproducts": [ [ "juice_pulp", 2 ], [ "water_clean", 1 ] ],
+    "byproducts": [ [ "juice_pulp", 16 ], [ "water_clean", 1 ] ],
     "container": "can_food",
     "category": "CC_FOOD",
     "subcategory": "CSC_FOOD_VEGGI",
@@ -2582,7 +2582,7 @@
     "contained": true,
     "batch_time_factors": [ 83, 5 ],
     "qualities": [ { "id": "STRAIN", "level": 2 } ],
-    "components": [ [ [ "water_clean", 1 ] ], [ [ "orange", 2 ] ] ],
+    "components": [ [ [ "water_clean", 1 ] ], [ [ "orange", 4 ] ] ],
     "//1": "tincan canning is measured in 0.25 liter quantities, so 1u of canning_metal.",
     "using": [ [ "canning_metal", 1, "LIST" ], [ "tincan_small", 1 ] ]
   },
@@ -2591,7 +2591,7 @@
     "activity_level": "NO_EXERCISE",
     "result": "oj_fresh",
     "id_suffix": "canned_big",
-    "byproducts": [ [ "juice_pulp", 24 ], [ "water_clean", 6 ] ],
+    "byproducts": [ [ "juice_pulp", 192 ], [ "water_clean", 6 ] ],
     "container": "can_food_big",
     "category": "CC_FOOD",
     "subcategory": "CSC_FOOD_VEGGI",
@@ -2604,7 +2604,7 @@
     "contained": true,
     "batch_time_factors": [ 83, 5 ],
     "qualities": [ { "id": "STRAIN", "level": 2 } ],
-    "components": [ [ [ "water_clean", 6 ] ], [ [ "orange", 24 ] ] ],
+    "components": [ [ [ "water_clean", 6 ] ], [ [ "orange", 48 ] ] ],
     "//1": "tincan canning is measured in 0.25 liter quantities, so 12u of canning_metal.",
     "using": [ [ "canning_metal", 12, "LIST" ], [ "tincan_large", 1 ] ]
   },
diff --git a/data/json/recipes/recipe_food.json b/data/json/recipes/recipe_food.json
index 715aac41ddc60..cf393a22800d6 100644
--- a/data/json/recipes/recipe_food.json
+++ b/data/json/recipes/recipe_food.json
@@ -3149,7 +3149,7 @@
     "type": "recipe",
     "activity_level": "LIGHT_EXERCISE",
     "result": "oj_fresh",
-    "byproducts": [ [ "juice_pulp", 2 ] ],
+    "byproducts": [ [ "juice_pulp", 16 ] ],
     "category": "CC_FOOD",
     "subcategory": "CSC_FOOD_DRINKS",
     "skill_used": "cooking",
@@ -3157,7 +3157,7 @@
     "time": "5 m",
     "autolearn": true,
     "qualities": [ { "id": "HAMMER", "level": 1 }, { "id": "CONTAIN", "level": 1 }, { "id": "STRAIN", "level": 2 } ],
-    "components": [ [ [ "orange", 2 ] ] ]
+    "components": [ [ [ "orange", 4 ] ] ]
   },
   {
     "type": "recipe",
diff --git a/tests/iteminfo_test.cpp b/tests/iteminfo_test.cpp
index 026550a9e1cc6..b9388485aa08d 100644
--- a/tests/iteminfo_test.cpp
+++ b/tests/iteminfo_test.cpp
@@ -1921,7 +1921,7 @@ TEST_CASE( "nutrients_in_food", "[iteminfo][food]" )
                "--\n"
                "Nutrition will <color_cyan>vary with chosen ingredients</color>.\n"
                "Vitamins (RDA): 63-354 mg Calcium (6-35%), 0-23 mg Iron (0-128%),"
-               " and 0-51 mg Vitamin C (0-56%)\n" );
+               " and 0-49 mg Vitamin C (0-54%)\n" );
     }
 }
 
diff --git a/tools/spell_checker/dictionary.txt b/tools/spell_checker/dictionary.txt
index 7621fbe1add35..523fd096feb64 100644
--- a/tools/spell_checker/dictionary.txt
+++ b/tools/spell_checker/dictionary.txt
@@ -2094,6 +2094,7 @@ nonuniform
 nonverbally
 noone
 nopal
+nopales
 nopalito
 nord
 norvegicus