diff --git a/nocts_cata_mod_BN/Terrain/Survivor_Encampments.json b/nocts_cata_mod_BN/Terrain/Survivor_Encampments.json
index 2f4e86be..ec9fa7a2 100644
--- a/nocts_cata_mod_BN/Terrain/Survivor_Encampments.json
+++ b/nocts_cata_mod_BN/Terrain/Survivor_Encampments.json
@@ -152,7 +152,7 @@
         "                        "
       ],
       "palettes": [ "roof_palette" ],
-      "terrain": { ",": "t_thatch_roof" }
+      "terrain": { ",": "t_thatch_roof", "=": "t_flat_roof" }
     }
   },
   {
@@ -513,7 +513,8 @@
         "                        ",
         "                        "
       ],
-      "palettes": [ "roof_palette" ]
+      "palettes": [ "roof_palette" ],
+      "terrain": { "=": "t_flat_roof" }
     }
   },
   {
@@ -674,7 +675,8 @@
         "                        ",
         "                        "
       ],
-      "palettes": [ "roof_palette" ]
+      "palettes": [ "roof_palette" ],
+      "terrain": { "=": "t_flat_roof" }
     }
   },
   {
@@ -870,7 +872,7 @@
         "                        "
       ],
       "palettes": [ "roof_palette" ],
-      "terrain": { ",": "t_thatch_roof" }
+      "terrain": { ",": "t_thatch_roof", "=": "t_flat_roof" }
     }
   }
 ]
diff --git a/nocts_cata_mod_BN/Weapons/c_magazines.json b/nocts_cata_mod_BN/Weapons/c_magazines.json
index 0ad0c336..1cd2404d 100644
--- a/nocts_cata_mod_BN/Weapons/c_magazines.json
+++ b/nocts_cata_mod_BN/Weapons/c_magazines.json
@@ -235,7 +235,7 @@
   {
     "id": "rifle_crank_battery_cell",
     "type": "MAGAZINE",
-    "category": "spare_parts",
+    "category": "battery",
     "name": { "str": "crank rifle capacitor bank" },
     "description": "This is a homemade power cell made from household batteries along with a series of capacitors, designed to translate mechanical force into enough voltage to more efficiently power a survivor's crank rifle.  It's a wonder this thing isn't an electrocution hazard.",
     "weight": "900 g",
@@ -255,7 +255,6 @@
     "id": "light_atomic_battery_cell_rechargeable",
     "copy-from": "light_atomic_battery_cell",
     "type": "MAGAZINE",
-    "category": "spare_parts",
     "name": { "str": "light rechargeable plutonium cell" },
     "description": "This battery uses a thin plutonium-244 rod to stabilize multiple proprietary exotic compounds.  Designed by Omnitech for a military contract, this modified plutonium battery is rechargeable, but as it made for military purposes there is very little this is compatible with.",
     "extend": { "flags": [ "RECHARGE" ] }
@@ -264,7 +263,6 @@
     "id": "medium_atomic_battery_cell_rechargeable",
     "copy-from": "medium_atomic_battery_cell",
     "type": "MAGAZINE",
-    "category": "spare_parts",
     "name": { "str": "medium rechargeable plutonium cell" },
     "description": "This battery uses a thin plutonium-244 rod to stabilize multiple proprietary exotic compounds.  Designed by Omnitech for a military contract, this modified plutonium battery is rechargeable, but as it made for military purposes there is very little this is compatible with.",
     "extend": { "flags": [ "RECHARGE" ] }
@@ -273,7 +271,6 @@
     "id": "heavy_atomic_battery_cell_rechargeable",
     "copy-from": "heavy_atomic_battery_cell",
     "type": "MAGAZINE",
-    "category": "spare_parts",
     "name": { "str": "heavy rechargeable plutonium cell" },
     "description": "This battery uses a thin plutonium-244 rod to stabilize multiple proprietary exotic compounds.  Designed by Omnitech for a military contract, this modified plutonium battery is rechargeable, but as it made for military purposes there is very little this is compatible with.",
     "extend": { "flags": [ "RECHARGE" ] }
diff --git a/nocts_cata_mod_DDA/Terrain/Survivor_Encampments.json b/nocts_cata_mod_DDA/Terrain/Survivor_Encampments.json
index 5a4a2c6f..66fd9b04 100644
--- a/nocts_cata_mod_DDA/Terrain/Survivor_Encampments.json
+++ b/nocts_cata_mod_DDA/Terrain/Survivor_Encampments.json
@@ -152,7 +152,7 @@
         "                        "
       ],
       "palettes": [ "roof_palette" ],
-      "terrain": { ",": "t_thatch_roof" }
+      "terrain": { ",": "t_thatch_roof", "=": "t_flat_roof" }
     }
   },
   {
@@ -515,7 +515,8 @@
         "                        ",
         "                        "
       ],
-      "palettes": [ "roof_palette" ]
+      "palettes": [ "roof_palette" ],
+      "terrain": { "=": "t_flat_roof" }
     }
   },
   {
@@ -676,7 +677,8 @@
         "                        ",
         "                        "
       ],
-      "palettes": [ "roof_palette" ]
+      "palettes": [ "roof_palette" ],
+      "terrain": { "=": "t_flat_roof" }
     }
   },
   {
@@ -872,7 +874,7 @@
         "                        "
       ],
       "palettes": [ "roof_palette" ],
-      "terrain": { ",": "t_thatch_roof" }
+      "terrain": { ",": "t_thatch_roof", "=": "t_flat_roof" }
     }
   }
 ]
diff --git a/nocts_cata_mod_DDA/Weapons/c_magazines.json b/nocts_cata_mod_DDA/Weapons/c_magazines.json
index cc58a579..ec9f219b 100644
--- a/nocts_cata_mod_DDA/Weapons/c_magazines.json
+++ b/nocts_cata_mod_DDA/Weapons/c_magazines.json
@@ -235,7 +235,7 @@
   {
     "id": "rifle_crank_battery_cell",
     "type": "MAGAZINE",
-    "category": "spare_parts",
+    "category": "battery",
     "name": { "str": "crank rifle capacitor bank" },
     "description": "This is a homemade power cell made from household batteries along with a series of capacitors, designed to translate mechanical force into enough voltage to more efficiently power a survivor's crank rifle.  It's a wonder this thing isn't an electrocution hazard.",
     "weight": "500 g",
@@ -255,7 +255,6 @@
     "id": "light_atomic_battery_cell_rechargeable",
     "copy-from": "light_atomic_battery_cell",
     "type": "MAGAZINE",
-    "category": "spare_parts",
     "name": { "str": "light rechargeable plutonium cell" },
     "description": "This battery uses a thin plutonium-244 rod to stabilize multiple proprietary exotic compounds.  Designed by Omnitech for a military contract, this modified plutonium battery is rechargeable, but as it made for military purposes there is very little this is compatible with.",
     "extend": { "flags": [ "RECHARGE", "MAG_COMPACT" ] }
@@ -264,7 +263,6 @@
     "id": "medium_atomic_battery_cell_rechargeable",
     "copy-from": "medium_atomic_battery_cell",
     "type": "MAGAZINE",
-    "category": "spare_parts",
     "name": { "str": "medium rechargeable plutonium cell" },
     "description": "This battery uses a thin plutonium-244 rod to stabilize multiple proprietary exotic compounds.  Designed by Omnitech for a military contract, this modified plutonium battery is rechargeable, but as it made for military purposes there is very little this is compatible with.",
     "extend": { "flags": [ "RECHARGE", "MAG_COMPACT" ] }
@@ -273,7 +271,6 @@
     "id": "heavy_atomic_battery_cell_rechargeable",
     "copy-from": "heavy_atomic_battery_cell",
     "type": "MAGAZINE",
-    "category": "spare_parts",
     "name": { "str": "heavy rechargeable plutonium cell" },
     "description": "This battery uses a thin plutonium-244 rod to stabilize multiple proprietary exotic compounds.  Designed by Omnitech for a military contract, this modified plutonium battery is rechargeable, but as it made for military purposes there is very little this is compatible with.",
     "extend": { "flags": [ "RECHARGE", "MAG_BULKY" ] }