diff --git a/data/json/items/armor/torso_armor.json b/data/json/items/armor/torso_armor.json
index e09f868f86056..d5cd4415e6814 100644
--- a/data/json/items/armor/torso_armor.json
+++ b/data/json/items/armor/torso_armor.json
@@ -391,30 +391,30 @@
     "subtypes": [ "ARMOR" ],
     "category": "armor",
     "name": { "str": "ichcahuipilli" },
-    "description": "A Mesoamerican armor of Nahuatl origin, somewhat similar to a European gambeson.  It is made of unspun cotton between two layers of quilted cotton crystalized by brine, edged with leather around its holes.  It is extremely thick and offers superb protection, but is also heavy.  This bad boy once stopped Spanish bullets and Aztec missiles alike, now its time has come to stop zombie bites.",
-    "//": "Reasoning for weight and volume parts are within the recipe.",
-    "weight": "8150 g",
-    "volume": "16300 ml",
+    "description": "A Mesoamerican armor of Nahuatl origin, somewhat similar to a European gambeson.  It is made of unspun cotton between two layers of quilted cotton crystalized by brine, edged with leather around its holes.  It is very thick, offers good protection from attacks, and isn't too warm.  This bad boy once stopped Spanish bullets and Aztec missiles alike, now its time has come to stop zombie bites.",
+    "//": "Reasoning for weight and volume in recipe, but stats roughly equalized to wool gambeson.",
+    "weight": "7280 g",
+    "volume": "15300 ml",
     "symbol": "[",
     "color": "light_gray",
     "looks_like": "gambeson",
     "price": "200 USD",
     "price_postapoc": "25 USD",
     "material": [ "cotton" ],
-    "warmth": 80,
+    "warmth": 50,
     "environmental_protection": 4,
-    "flags": [ "VARSIZE", "STURDY", "NORMAL", "RAINPROOF", "NO_REPAIR", "BLOCK_WHILE_WORN" ],
+    "flags": [ "VARSIZE", "STURDY", "NORMAL", "OUTER", "RAINPROOF", "NO_REPAIR", "BLOCK_WHILE_WORN" ],
     "max_worn": 1,
     "armor": [
       {
         "material": [
           { "type": "cotton_quilted_salted", "covered_by_mat": 100, "thickness": 2.5 },
-          { "type": "cotton", "covered_by_mat": 95, "thickness": 20 },
+          { "type": "cotton_raw", "covered_by_mat": 95, "thickness": 25 },
           { "type": "cotton_quilted_salted", "covered_by_mat": 100, "thickness": 2.5 }
         ],
         "covers": [ "torso" ],
         "coverage": 100,
-        "encumbrance": 40
+        "encumbrance": 27
       }
     ]
   },
diff --git a/data/json/items/resources/tailoring.json b/data/json/items/resources/tailoring.json
index 918a74c91121b..0d6d7b72285cf 100644
--- a/data/json/items/resources/tailoring.json
+++ b/data/json/items/resources/tailoring.json
@@ -362,7 +362,7 @@
     "type": "ITEM",
     "name": { "str": "patchwork cotton sheet" },
     "description": "A 12-inch by 24-inch sheet of cotton sewn together from patches of various clothing parts.  Suitable for making clothing if you lack proper material sheets.",
-    "//density": ".80 grams per mL, 203 GSM",
+    "//density": ".67 grams per mL, 203 GSM",
     "price": "2 USD",
     "price_postapoc": "20 cent"
   },
diff --git a/data/json/materials.json b/data/json/materials.json
index f5a293f7f753b..4b930943b880f 100644
--- a/data/json/materials.json
+++ b/data/json/materials.json
@@ -648,7 +648,16 @@
     "name": "Salt Hardened Quilted Cotton",
     "copy-from": "cotton",
     "repaired_with": "null",
-    "resist": { "bash": 3.5, "cut": 3.5, "acid": 5, "heat": 10, "bullet": 2 }
+    "resist": { "bash": 2, "cut": 2.5, "acid": 5, "heat": 10, "bullet": 1.5 }
+  },
+  {
+    "type": "material",
+    "//": "low-density cotton for packing in gambeson",
+    "id": "cotton_raw",
+    "name": "Raw Cotton",
+    "copy-from": "cotton",
+    "repaired_with": "null",
+    "resist": { "bash": 0.2, "cut": 0.05, "acid": 0, "heat": 0, "bullet": 0.2 }
   },
   {
     "type": "material",
diff --git a/data/json/recipes/armor/torso.json b/data/json/recipes/armor/torso.json
index 7a43487cd01d8..23834a58457d8 100644
--- a/data/json/recipes/armor/torso.json
+++ b/data/json/recipes/armor/torso.json
@@ -307,15 +307,15 @@
     "result": "armor_aztec",
     "type": "recipe",
     "activity_level": "LIGHT_EXERCISE",
-    "//1": "Average ichcahuipilli was around 1 inch (~2.5 cm) thick. As cotton padding constituted the majority of its protective qualities, I'll consider the quilted part 0.5 cm thick.",
-    "//2": "This leaves us with 20 layers of cotton sheets, taking the thickness of a cotton sheet as 0.25 mm.",
+    "//1": "Average ichcahuipilli was around 1.6 fingers (~3 cm) thick. As unspun cotton padding constituted the majority of its protective qualities, I'll consider the quilted part 0.5 cm thick.",
+    "//2": "This leaves us with 17 layers of cotton sheets, taking the thickness of a cotton sheet as 0.3mm.",
     "//3": "Average length of a human male is around 170 cm. Average weight of a human (in North America) is 80 kg. BSA calculation and rule of the nines gives us about 0,68 m^2 or 7,3 sq feet.",
     "//3.5": "I'll round that down to 7 for ease, as well as compensating for average woman being shorter and thinner and Americans being exceptionally fat.",
     "//4": "Our cotton sheets are 1x2 feet. 20 layers x 7 sq ft / 2 sq ft of the sheets = 70 sheets. I know the outer layer of quilting would require more sheets because of the padding inbetween but I won't bother doing the maths for it",
-    "//5": "Cotton padding inbetween would make 0.065 ft (2 cm of cotton) x 7 sq ft of torso = 0,455 cube ft which is about 12,88 liters of cotton. Once again this calculation is off but again, I can't do the maths.",
-    "//5.5": "That's about… a lot of cotton, 1288 patches or 429 balls or 257 sheets to be precise. Byproducts I made up.",
-    "//6": "That's 70x0,04 + 1288x0,01 = 15,6 kgs and some more for leather and salt wtf",
-    "//7": "And 70x0,05 + 1288x0,01 = 16,3 L.",
+    "//5": "Cotton padding inbetween would make 0,082 ft (2.5 cm of cotton) x 7 sq ft of torso = 0,574 cube ft of cotton.",
+    "//6": "At the density of baled cotton, i.e. dried and packed, 0,448g/cm^3 = 12,7 kg/ft^3, the total weight of cotton padding = 7.28kg.",
+    "//7": "This is 610 cotton balls, by weight, which is 15.25L of cotton balls. Quite a few, but they get packed down a lot in the quilting process.",
+    "//7.5": "Equivalently; 8.5k scraps, 320 sheets, 1600 patchworks. It's quite a lot but not all of it is actually used.",
     "category": "CC_ARMOR",
     "subcategory": "CSC_ARMOR_TORSO",
     "skill_used": "tailor",
@@ -329,16 +329,16 @@
     "using": [ [ "tailoring_cotton_patchwork", 70 ], [ "filament", 100 ] ],
     "components": [
       [
-        [ "cotton_patchwork", 1288 ],
-        [ "scrap_cotton", 6000 ],
-        [ "cotton_ball", 429 ],
-        [ "sheet_cotton", 257 ],
-        [ "sheet_cotton_patchwork", 257 ]
+        [ "cotton_patchwork", 1600 ],
+        [ "scrap_cotton", 8500 ],
+        [ "cotton_ball", 610 ],
+        [ "sheet_cotton", 320 ],
+        [ "sheet_cotton_patchwork", 320 ]
       ],
       [ [ "salt_water", 80 ] ],
       [ [ "sheet_leather", 5 ], [ "sheet_leather_patchwork", 5 ] ]
     ],
-    "byproducts": [ [ "scrap_cotton", 250 ], [ "cotton_patchwork", 40 ] ]
+    "byproducts": [ [ "scrap_cotton", 300 ], [ "cotton_patchwork", 80 ] ]
   },
   {
     "result": "chestguard_metal_sheets",