diff --git a/data/mods/Magiclysm/Spells/debug.json b/data/mods/Magiclysm/Spells/debug.json
index 53ce675491361..bd35c0be034ec 100644
--- a/data/mods/Magiclysm/Spells/debug.json
+++ b/data/mods/Magiclysm/Spells/debug.json
@@ -142,7 +142,6 @@
     "message": "Debug spell %s cast.",
     "effect": "area_pull",
     "effect_filter": [ "ally", "hostile", "item", "fd_fire", "fd_blood" ],
-    "effect_iterations": 4,
     "valid_targets": [ "self", "ally", "hostile", "ground" ],
     "min_range": 5,
     "max_range": 15,
@@ -164,7 +163,6 @@
     "message": "Debug spell %s cast.",
     "effect": "area_pull",
     "effect_filter": [ "fd_fire", "fd_blood" ],
-    "effect_iterations": 4,
     "valid_targets": [ "self", "ally", "hostile", "ground" ],
     "min_range": 5,
     "max_range": 15,
@@ -186,7 +184,6 @@
     "message": "Debug spell %s cast.",
     "effect": "area_push",
     "effect_filter": [ "ally", "hostile", "item" ],
-    "effect_iterations": 4,
     "valid_targets": [ "self", "ally", "hostile", "ground" ],
     "min_range": 5,
     "max_range": 15,
diff --git a/data/mods/Magiclysm/Spells/dragonbreath.json b/data/mods/Magiclysm/Spells/dragonbreath.json
index 3f11b350e1879..a33c9113dcb22 100644
--- a/data/mods/Magiclysm/Spells/dragonbreath.json
+++ b/data/mods/Magiclysm/Spells/dragonbreath.json
@@ -18,7 +18,7 @@
     "min_field_intensity": 1,
     "max_field_intensity": 4,
     "field_chance": 2,
-    "intensity_increment": 0.1,
+    "field_intensity_increment": 0.1,
     "flags": [ "VERBAL", "NO_HANDS", "NO_LEGS" ]
   }
 ]
diff --git a/data/mods/Magiclysm/Spells/item_only.json b/data/mods/Magiclysm/Spells/item_only.json
index 63d1e67e96f8b..e56f493bf0101 100644
--- a/data/mods/Magiclysm/Spells/item_only.json
+++ b/data/mods/Magiclysm/Spells/item_only.json
@@ -3,7 +3,7 @@
     "id": "twisted_restore",
     "type": "SPELL",
     "name": "Twisted Restoration",
-    "\\": "Used for potion of Twisted Restoration, not castable",
+    "//": "Used for potion of Twisted Restoration, not castable",
     "description": "This spell overclocks your heart, generating new flesh and muscle. It is unwise to use this in immediate danger, and may be fatal if done in critical condition.",
     "valid_targets": [ "self" ],
     "flags": [ "SILENT", "NO_LEGS", "NO_HANDS" ],
@@ -31,7 +31,7 @@
     "id": "twisted_restore_improved",
     "type": "SPELL",
     "name": "Improved Twisted Restoration",
-    "\\": "Used for Animist-exclusive potion, not castable",
+    "//": "Used for Animist-exclusive potion, not castable",
     "description": "This spell overclocks your heart, generating new flesh and muscle. It is unwise to use this in immediate danger, and may be fatal if done in critical condition. Improved brewing mitigates the strain of the spell.",
     "valid_targets": [ "self" ],
     "flags": [ "SILENT", "NO_LEGS", "NO_HANDS" ],
diff --git a/data/mods/Magiclysm/Spells/kelvinist.json b/data/mods/Magiclysm/Spells/kelvinist.json
index 2241b15b97d45..2104605fb7c9a 100644
--- a/data/mods/Magiclysm/Spells/kelvinist.json
+++ b/data/mods/Magiclysm/Spells/kelvinist.json
@@ -117,7 +117,7 @@
     "field_id": "fd_cold_air2",
     "min_field_intensity": 0,
     "max_field_intensity": 4,
-    "intensity_increment": 0.5,
+    "field_intensity_increment": 0.5,
     "damage_type": "cold"
   },
   {
diff --git a/data/mods/Magiclysm/effects/effects.json b/data/mods/Magiclysm/effects/effects.json
index 79e5f68b1c8dc..77096ffd9ca93 100644
--- a/data/mods/Magiclysm/effects/effects.json
+++ b/data/mods/Magiclysm/effects/effects.json
@@ -59,7 +59,7 @@
     "remove_message": "Your energy field fades.",
     "rating": "good",
     "show_in_info": true,
-    "base_mods": { "environmental_protection": [ 5 ], "material_thickness": [ 3 ], "warmth": [ 50 ] }
+    "base_mods": {  }
   },
   {
     "type": "effect_type",
@@ -70,7 +70,7 @@
     "remove_message": "Your Frost Armor melts away.",
     "rating": "good",
     "show_in_info": true,
-    "base_mods": { "environmental_protection": [ 5 ], "material_thickness": [ 5 ], "warmth": [ 20 ] }
+    "base_mods": {  }
   },
   {
     "type": "effect_type",
diff --git a/data/mods/Magiclysm/enchanted/enchanted_wands.json b/data/mods/Magiclysm/enchanted/enchanted_wands.json
index 7188cee982ba6..ca7c696dd00c9 100644
--- a/data/mods/Magiclysm/enchanted/enchanted_wands.json
+++ b/data/mods/Magiclysm/enchanted/enchanted_wands.json
@@ -20,7 +20,7 @@
     "type": "TOOL",
     "id": "wand_magic_missile_minor",
     "name": "minor wand of magic missile",
-    "plural": "minor wands of magic missile",
+    "name_plural": "minor wands of magic missile",
     "copy-from": "spell_wand",
     "description": "A slender wooden wand with a mana crystal socket at the base that casts a spell when activated.  This wand casts magic missile.",
     "use_action": { "type": "cast_spell", "spell_id": "magic_missile", "no_fail": true, "level": 5, "need_wielding": true }
@@ -29,7 +29,7 @@
     "type": "TOOL",
     "id": "wand_magic_missile_lesser",
     "name": "lesser wand of magic missile",
-    "plural": "lesser wands of magic missile",
+    "name_plural": "lesser wands of magic missile",
     "copy-from": "spell_wand",
     "price": 20000,
     "description": "A slender wooden wand with a mana crystal socket at the base that casts a spell when activated.  This wand casts magic missile.",
@@ -39,7 +39,7 @@
     "type": "TOOL",
     "id": "wand_magic_missile_greater",
     "name": "greater wand of magic missile",
-    "plural": "greater wands of magic missile",
+    "name_plural": "greater wands of magic missile",
     "copy-from": "spell_wand",
     "price": 30000,
     "description": "A slender wooden wand with a mana crystal socket at the base that casts a spell when activated.  This wand casts magic missile.",
@@ -49,7 +49,7 @@
     "type": "TOOL",
     "id": "wand_fireball_minor",
     "name": "minor wand of fireball",
-    "plural": "minor wands of fireball",
+    "name_plural": "minor wands of fireball",
     "copy-from": "spell_wand",
     "description": "A slender wooden wand with a mana crystal socket at the base that casts a spell when activated.  This wand casts fireball.",
     "use_action": { "type": "cast_spell", "spell_id": "fireball", "no_fail": true, "level": 5, "need_wielding": true }
@@ -58,7 +58,7 @@
     "type": "TOOL",
     "id": "wand_fireball_lesser",
     "name": "lesser wand of fireball",
-    "plural": "lesser wands of fireball",
+    "name_plural": "lesser wands of fireball",
     "copy-from": "spell_wand",
     "price": 20000,
     "description": "A slender wooden wand with a mana crystal socket at the base that casts a spell when activated.  This wand casts fireball.",
@@ -68,7 +68,7 @@
     "type": "TOOL",
     "id": "wand_fireball_greater",
     "name": "greater wand of fireball",
-    "plural": "greater wands of fireball",
+    "name_plural": "greater wands of fireball",
     "copy-from": "spell_wand",
     "price": 30000,
     "description": "A slender wooden wand with a mana crystal socket at the base that casts a spell when activated.  This wand casts fireball.",
@@ -78,7 +78,7 @@
     "type": "TOOL",
     "id": "wand_mana_beam_minor",
     "name": "minor wand of mana beam",
-    "plural": "minor wands of mana beam",
+    "name_plural": "minor wands of mana beam",
     "copy-from": "spell_wand",
     "description": "A slender wooden wand with a mana crystal socket at the base that casts a spell when activated.  This wand casts mana beam.",
     "use_action": { "type": "cast_spell", "spell_id": "magus_mana_beam", "no_fail": true, "level": 5, "need_wielding": true }
@@ -87,7 +87,7 @@
     "type": "TOOL",
     "id": "wand_mana_beam_lesser",
     "name": "lesser wand of mana beam",
-    "plural": "lesser wands of mana beam",
+    "name_plural": "lesser wands of mana beam",
     "copy-from": "spell_wand",
     "price": 20000,
     "description": "A slender wooden wand with a mana crystal socket at the base that casts a spell when activated.  This wand casts mana beam.",
@@ -97,7 +97,7 @@
     "type": "TOOL",
     "id": "wand_mana_beam_greater",
     "name": "greater wand of mana beam",
-    "plural": "greater wands of mana beam",
+    "name_plural": "greater wands of mana beam",
     "copy-from": "spell_wand",
     "price": 30000,
     "description": "A slender wooden wand with a mana crystal socket at the base that casts a spell when activated.  This wand casts mana beam.",
@@ -107,7 +107,7 @@
     "type": "TOOL",
     "id": "wand_point_flare_minor",
     "name": "minor wand of point flare",
-    "plural": "minor wands of point flare",
+    "name_plural": "minor wands of point flare",
     "copy-from": "spell_wand",
     "description": "A slender wooden wand with a mana crystal socket at the base that casts a spell when activated.  This wand casts point flare.",
     "use_action": { "type": "cast_spell", "spell_id": "point_flare", "no_fail": true, "level": 5, "need_wielding": true }
@@ -116,7 +116,7 @@
     "type": "TOOL",
     "id": "wand_point_flare_lesser",
     "name": "lesser wand of point flare",
-    "plural": "lesser wands of point flare",
+    "name_plural": "lesser wands of point flare",
     "copy-from": "spell_wand",
     "price": 20000,
     "description": "A slender wooden wand with a mana crystal socket at the base that casts a spell when activated.  This wand casts point flare.",
@@ -126,7 +126,7 @@
     "type": "TOOL",
     "id": "wand_point_flare_greater",
     "name": "greater wand of point flare",
-    "plural": "greater wands of point flare",
+    "name_plural": "greater wands of point flare",
     "copy-from": "spell_wand",
     "price": 30000,
     "description": "A slender wooden wand with a mana crystal socket at the base that casts a spell when activated.  This wand casts point flare.",
@@ -136,7 +136,7 @@
     "type": "TOOL",
     "id": "wand_iceball_minor",
     "name": "minor wand of iceball",
-    "plural": "minor wands of iceball",
+    "name_plural": "minor wands of iceball",
     "copy-from": "spell_wand",
     "description": "A slender wooden wand with a mana crystal socket at the base that casts a spell when activated.  This wand casts iceball.",
     "use_action": { "type": "cast_spell", "spell_id": "iceball", "no_fail": true, "level": 5, "need_wielding": true }
@@ -145,7 +145,7 @@
     "type": "TOOL",
     "id": "wand_iceball_lesser",
     "name": "lesser wand of iceball",
-    "plural": "lesser wands of iceball",
+    "name_plural": "lesser wands of iceball",
     "copy-from": "spell_wand",
     "price": 20000,
     "description": "A slender wooden wand with a mana crystal socket at the base that casts a spell when activated.  This wand casts iceball.",
@@ -155,7 +155,7 @@
     "type": "TOOL",
     "id": "wand_iceball_greater",
     "name": "greater wand of iceball",
-    "plural": "greater wands of iceball",
+    "name_plural": "greater wands of iceball",
     "copy-from": "spell_wand",
     "price": 30000,
     "description": "A slender wooden wand with a mana crystal socket at the base that casts a spell when activated.  This wand casts iceball.",
@@ -165,7 +165,7 @@
     "type": "TOOL",
     "id": "wand_cone_cold_minor",
     "name": "minor wand of cone of cold",
-    "plural": "minor wands of cone of cold",
+    "name_plural": "minor wands of cone of cold",
     "copy-from": "spell_wand",
     "description": "A slender wooden wand with a mana crystal socket at the base that casts a spell when activated.  This wand casts cone of cold.",
     "use_action": { "type": "cast_spell", "spell_id": "cone_cold", "no_fail": true, "level": 5, "need_wielding": true }
@@ -174,7 +174,7 @@
     "type": "TOOL",
     "id": "wand_cone_cold_lesser",
     "name": "lesser wand of cone of cold",
-    "plural": "lesser wands of cone of cold",
+    "name_plural": "lesser wands of cone of cold",
     "copy-from": "spell_wand",
     "price": 20000,
     "description": "A slender wooden wand with a mana crystal socket at the base that casts a spell when activated.  This wand casts cone of cold.",
@@ -184,7 +184,7 @@
     "type": "TOOL",
     "id": "wand_cone_cold_greater",
     "name": "greater wand of cone of cold",
-    "plural": "greater wands of cone of cold",
+    "name_plural": "greater wands of cone of cold",
     "copy-from": "spell_wand",
     "price": 30000,
     "description": "A slender wooden wand with a mana crystal socket at the base that casts a spell when activated.  This wand casts cone of cold.",
diff --git a/data/mods/Magiclysm/itemgroups/itemgroups.json b/data/mods/Magiclysm/itemgroups/itemgroups.json
index a8799770d5e04..cf8e777af7581 100644
--- a/data/mods/Magiclysm/itemgroups/itemgroups.json
+++ b/data/mods/Magiclysm/itemgroups/itemgroups.json
@@ -64,7 +64,7 @@
   {
     "id": "coffee_display_2",
     "type": "item_group",
-    "item": [ [ "mana_potion_lesser", 10 ] ]
+    "items": [ [ "mana_potion_lesser", 10 ] ]
   },
   {
     "type": "item_group",
diff --git a/data/mods/Magiclysm/items/class_runes.json b/data/mods/Magiclysm/items/class_runes.json
index 1b4090bdcf25b..df61eb388a5f2 100644
--- a/data/mods/Magiclysm/items/class_runes.json
+++ b/data/mods/Magiclysm/items/class_runes.json
@@ -5,7 +5,6 @@
     "symbol": "=",
     "color": "pink",
     "name": "Biomancer rune",
-    "plural": "Biomancer runes",
     "description": "This magical pebble has an insignia of rended flesh and bones on it. It is necessary for Biomancers to channel magic into their crafts.",
     "volume": "5ml",
     "weight": 1,
@@ -16,8 +15,7 @@
     "id": "rune_biomancer_weapon",
     "type": "GENERIC",
     "name": "Biomancer spear",
-    "plural": "Biomancer spears",
-    "\\": "Effectively a durable stone spear +1 with IMPALE tech. based off Wicked Bonespear. Lorewise, it would make sense for novice Biomancers to be developing their skills in spears so they can adequately use the Bonespear(No whips/REACH3 for you!) once they're proficient enough to summon one. Should be weaker than other school weapons DPSwise due to reach.",
+    "//": "Effectively a durable stone spear +1 with IMPALE tech. based off Wicked Bonespear. Lorewise, it would make sense for novice Biomancers to be developing their skills in spears so they can adequately use the Bonespear(No whips/REACH3 for you!) once they're proficient enough to summon one. Should be weaker than other school weapons DPSwise due to reach.",
     "description": "A grotesque bone spearhead on a stout wooden pole. There is a Biomancer rune embedded at the base of the head.",
     "weight": 988,
     "volume": "1250 ml",
@@ -38,7 +36,6 @@
     "symbol": "=",
     "color": "blue",
     "name": "Technomancer rune",
-    "plural": "Technomancer runes",
     "description": "This magical pebble has an insignia of clockwork and gears on it. It is necessary for Technomancers to channel magic into their crafts.",
     "volume": "5ml",
     "weight": 1,
@@ -49,8 +46,7 @@
     "id": "rune_technomancer_weapon",
     "type": "GENERIC",
     "name": "Technomancer toolbar",
-    "plural": "Technomancer toolbars",
-    "\\": "Combat stats based off crowbar +1, techniques off Halligan bar(closest non-magical substitute), weight based on 75% of hammer & wrench(since their handles aren't included) + 100% crowbar with benefit from +1 enchantment",
+    "//": "Combat stats based off crowbar +1, techniques off Halligan bar(closest non-magical substitute), weight based on 75% of hammer & wrench(since their handles aren't included) + 100% crowbar with benefit from +1 enchantment",
     "description": "This staff incorporates a sturdy cresent wrench on top of a prybar and a hammer on the other in a convienent package. There is a Technomancer rune embedded in the hammerhead.",
     "weight": 1536,
     "volume": "1750 ml",
@@ -71,7 +67,7 @@
     "symbol": "=",
     "color": "magenta",
     "name": "Magus rune",
-    "plural": "Magi runes",
+    "name_plural": "Magi runes",
     "description": "This magical pebble has an insignia of crystal and mana orbs on it. It is necessary for Magi to channel magic into their crafts.",
     "volume": "5ml",
     "weight": 1,
@@ -82,8 +78,8 @@
     "id": "rune_magus_weapon",
     "type": "GENERIC",
     "name": "Magus staff",
-    "plural": "Magus staves",
-    "\\": "The classical vision of the wizard gets a classic weapon. DPS Stats are between the regular and ironshod versions. Stats are slightly worse than the QS+1 due to the glass weight slowing attack speed.",
+    "name_plural": "Magus staves",
+    "//": "The classical vision of the wizard gets a classic weapon. DPS Stats are between the regular and ironshod versions. Stats are slightly worse than the QS+1 due to the glass weight slowing attack speed.",
     "description": "A quarterstaff with runes carved into it and two glass jars, heat-tempered and infused with mana for durability, to act as mana receptacles. There are two Magi runes embedded at the tips.",
     "weight": 1530,
     "volume": "1500 ml",
@@ -102,7 +98,6 @@
     "symbol": "=",
     "color": "green",
     "name": "Earthshaper rune",
-    "plural": "Earthshaper runes",
     "description": "This magical pebble has an insignia of steel and rocks on it. It is necessary for Earthshapers to channel magic into their crafts.",
     "volume": "5ml",
     "weight": 1,
@@ -116,7 +111,7 @@
     "color": "light_gray",
     "name": "Earthshaper cestus",
     "name_plural": "Earthshaper cesti",
-    "\\": "Equivalent to cestus +1 with BRUTAL and WBLOCK1",
+    "//": "Equivalent to cestus +1 with BRUTAL and WBLOCK1",
     "description": "A stone battle glove with carved runes encasing the hand, protecting it while increasing striking power. There is an Earthshaper rune embedded in the palm.",
     "material": [ "stone", "leather", "steel" ],
     "volume": "500 ml",
@@ -133,7 +128,6 @@
     "symbol": "=",
     "color": "red",
     "name": "Kelvinist rune",
-    "plural": "Kelvinist runes",
     "description": "This magical pebble has an insignia of ice and flames on it. It is necessary for Kelvinists to channel magic into their crafts.",
     "volume": "5ml",
     "weight": 1,
@@ -144,8 +138,7 @@
     "id": "rune_kelvinist_weapon",
     "type": "GENERIC",
     "name": "Kelvinist flamberge",
-    "plural": "Kelvinist flamberges",
-    "\\": "Flame-bladed sword covers half of Kelvinist's heat-cold theme. Combat stats equivalent to cutlass +1 with BRUTAL technique.",
+    "//": "Flame-bladed sword covers half of Kelvinist's heat-cold theme. Combat stats equivalent to cutlass +1 with BRUTAL technique.",
     "description": "A sword with an undulating blade, reminiscent of a flame. There is a Kelvinist rune embedded in the pommel.",
     "weight": 1530,
     "volume": "1250 ml",
@@ -167,7 +160,6 @@
     "symbol": "=",
     "color": "yellow",
     "name": "Stormshaper rune",
-    "plural": "Stormshaper runes",
     "description": "This magical pebble has an insignia of lightning and storm clouds on it. It is necessary for Stormshapers to channel magic into their crafts.",
     "volume": "5ml",
     "weight": 1,
@@ -178,8 +170,7 @@
     "id": "rune_stormshaper_weapon",
     "type": "GENERIC",
     "name": "Stormshaper axe",
-    "plural": "Stormshaper axes",
-    "\\": "Equivalent to copper ax +1, with volume reduction so it can be sheathed like the other school weapons. Metals chosen for being two most conductive metals + balancing reasons",
+    "//": "Equivalent to copper ax +1, with volume reduction so it can be sheathed like the other school weapons. Metals chosen for being two most conductive metals + balancing reasons",
     "description": "A forged copper axe with silver trimmings and a wooden handle. There is a Stormshaper rune embedded in the eye.",
     "weight": 3330,
     "volume": "2 L",
@@ -201,7 +192,6 @@
     "symbol": "=",
     "color": "brown",
     "name": "Druid rune",
-    "plural": "Druid runes",
     "description": "This magical pebble has an insignia of nature and trees on it. It is necessary for Druids to channel magic into their crafts.",
     "volume": "5ml",
     "weight": 1,
@@ -214,7 +204,7 @@
     "symbol": "(",
     "color": "yellow",
     "name": "Druid composite bow",
-    "\\": "Equivalent to composite bow +1 for dispersion/reload/weight/range/encumb/bash, with two mod slots added equivalent to other weapons getting techniques",
+    "//": "Equivalent to composite bow +1 for dispersion/reload/weight/range/encumb/bash, with two mod slots added equivalent to other weapons getting techniques",
     "description": "A bow made of multiple materials to maximize energy efficiency. There are two Druid runes embedded at the tips.",
     "price": 32000,
     "material": [ "wood", "bone" ],
@@ -252,7 +242,6 @@
     "symbol": "=",
     "color": "light_red",
     "name": "Animist rune",
-    "plural": "Animist runes",
     "description": "This magical pebble has an insignia of summoners on it. It is necessary for Animists to channel magic into their crafts.",
     "volume": "5ml",
     "weight": 1,
@@ -264,7 +253,7 @@
     "type": "GENERIC",
     "name": "Animist athame",
     "name_plural": "Animist athames",
-    "\\": "Tool qualities equivalent to steak knife, combat equiv. to copper knife + 1 w/ RAPID and BLOCK1, size/weight off combat knife +1",
+    "//": "Tool qualities equivalent to steak knife, combat equiv. to copper knife + 1 w/ RAPID and BLOCK1, size/weight off combat knife +1",
     "description": "A steel ritual knife used by Animists to draw blood for summoning. Their school rune is embedded in the crossguard.",
     "weight": 504,
     "volume": "500 ml",
@@ -284,7 +273,6 @@
     "symbol": "=",
     "color": "black",
     "name": "alchemist rune",
-    "plural": "alchemist runes",
     "description": "This magical pebble has an insignia of alchemy and potions on it. While versatile in use, the lack of attunement to any school prevents creation of more advanced recipes.",
     "volume": "5ml",
     "weight": 1,
diff --git a/data/mods/Magiclysm/items/ethereal_items.json b/data/mods/Magiclysm/items/ethereal_items.json
index 590d1686c75da..b377d5218a4fa 100644
--- a/data/mods/Magiclysm/items/ethereal_items.json
+++ b/data/mods/Magiclysm/items/ethereal_items.json
@@ -13,12 +13,14 @@
     "material": [ "superalloy" ],
     "symbol": "[",
     "color": "light_gray",
-    "covers": [ "HANDS", "ARMS" ],
-    "coverage": 100,
-    "encumbrance": 0,
-    "warmth": 20,
-    "material_thickness": 4,
-    "environmental_protection": 10,
+    "armor_data": {
+      "covers": [ "HANDS", "ARMS" ],
+      "coverage": 100,
+      "encumbrance": 0,
+      "warmth": 20,
+      "material_thickness": 4,
+      "environmental_protection": 10
+    },
     "qualities": [ [ "HAMMER", 1 ] ],
     "flags": [ "VARSIZE", "STURDY", "UNARMED_WEAPON", "DURABLE_MELEE", "NONCONDUCTIVE", "MAGIC_FOCUS" ],
     "techniques": [ "WBLOCK_3" ]
@@ -158,7 +160,7 @@
     ],
     "volume": 5,
     "bashing": 30,
-    "electric": 15,
+    "//electric": 15,
     "price": 0,
     "qualities": [ [ "HAMMER", 1 ] ]
   },
@@ -193,7 +195,7 @@
     "volume": 1,
     "weight": 1,
     "bashing": 10,
-    "electric": 15,
+    "//electric": 15,
     "flags": [
       "UNARMED_WEAPON",
       "UNBREAKABLE_MELEE",
@@ -229,7 +231,6 @@
       "MAGIC_FOCUS"
     ],
     "cutting": 30,
-    "pierce": 6,
     "category": "weapons"
   },
   {
@@ -275,7 +276,6 @@
     "volume": 10,
     "bashing": 16,
     "cutting": 36,
-    "pierce": 8,
     "to_hit": 2
   },
   {
@@ -328,7 +328,6 @@
     "symbol": "!",
     "description": "A magical seed that can be squeezed to release purifying dust, which can then be used to purify up to a gallon of water",
     "volume": 1,
-    "stack_size": 100,
     "flags": [ "TRADER_AVOID" ]
   },
   {
diff --git a/data/mods/Magiclysm/items/fuel.json b/data/mods/Magiclysm/items/fuel.json
index 46c5e5eb3e280..36afecab841a5 100644
--- a/data/mods/Magiclysm/items/fuel.json
+++ b/data/mods/Magiclysm/items/fuel.json
@@ -50,7 +50,6 @@
     "weight": 265,
     "color": "red",
     "container": "flask_glass",
-    "comestible_type": "DRINK",
     "symbol": "~",
     "description": "Blood, possibly that of a human.  Disgusting!",
     "price": 0,
diff --git a/data/mods/Magiclysm/items/mana_crystals.json b/data/mods/Magiclysm/items/mana_crystals.json
index 5c6b4bab4633a..1685b7d223512 100644
--- a/data/mods/Magiclysm/items/mana_crystals.json
+++ b/data/mods/Magiclysm/items/mana_crystals.json
@@ -18,7 +18,6 @@
     "flags": "TRADER_AVOID",
     "volume": "100 ml",
     "ammo_type": "crystallized_mana",
-    "reload_time": 1,
     "count": 100,
     "looks_like": "battery",
     "fuel": { "energy": 1 }
diff --git a/data/mods/Magiclysm/items/obsolete.json b/data/mods/Magiclysm/items/obsolete.json
index 2573008eebe04..06008aa052864 100644
--- a/data/mods/Magiclysm/items/obsolete.json
+++ b/data/mods/Magiclysm/items/obsolete.json
@@ -2,7 +2,7 @@
   {
     "id": "wand_fireball",
     "name": "wand of fireballs",
-    "plural": "wands of fireball",
+    "name_plural": "wands of fireball",
     "description": "A classic, this wand shoots fireballs without fail.  A more skilled Kelvinist could cast them more efficiently, though.",
     "type": "TOOL",
     "weight": 230,
@@ -22,7 +22,7 @@
   {
     "id": "wand_magic_missile",
     "name": "wand of magic missiles",
-    "plural": "wands of magic missile",
+    "name_plural": "wands of magic missile",
     "description": "A classic, this wand shoots magic missiles without fail.  A more skilled Magus could cast them more efficiently, though.",
     "type": "TOOL",
     "weight": 230,
diff --git a/data/mods/Magiclysm/monsters/dragon.json b/data/mods/Magiclysm/monsters/dragon.json
index adc13c7fed12c..d6afb430f9255 100644
--- a/data/mods/Magiclysm/monsters/dragon.json
+++ b/data/mods/Magiclysm/monsters/dragon.json
@@ -26,7 +26,7 @@
     "armor_acid": 600,
     "vision_day": 30,
     "vision_night": 20,
-    "path_settings": { "min_dist": 8 },
+    "path_settings": { "//min_dist": 8 },
     "harvest": "dragon_black",
     "death_function": [ "NORMAL" ],
     "special_attacks": [
@@ -64,7 +64,6 @@
     "melee_cut": 16,
     "armor_bash": 8,
     "armor_cut": 20,
-    "armor_pierce": 6,
     "special_attacks": [
       { "type": "bite", "cooldown": 10 },
       [ "scratch", 3 ],
diff --git a/data/mods/Magiclysm/monsters/monsters.json b/data/mods/Magiclysm/monsters/monsters.json
index fd32a99da1790..624e4f373bbbf 100644
--- a/data/mods/Magiclysm/monsters/monsters.json
+++ b/data/mods/Magiclysm/monsters/monsters.json
@@ -65,7 +65,7 @@
         "spell_id": "bio_acidicspray",
         "cooldown": 20,
         "monster_message": "The black pudding burns you with acid!",
-        "level": 0
+        "spell_level": 0
       }
     ],
     "flags": [ "HEARS", "GOODHEARING", "NOHEAD", "POISON", "NO_BREATHE", "ACIDPROOF" ]
@@ -148,8 +148,7 @@
     "melee_skill": 6,
     "melee_dice": 4,
     "melee_dice_sides": 3,
-    "melee_bash": 20,
-    "melee_cut": 10,
+    "melee_damage": [ { "damage_type": "bash", "amount": 20 }, { "damage_type": "cut", "amount": 10 } ],
     "dodge": 2,
     "armor_bash": 32,
     "armor_cut": 30,
diff --git a/data/mods/Magiclysm/recipes/weapons.json b/data/mods/Magiclysm/recipes/weapons.json
index fcbab8a008ef0..692b2a030ab43 100644
--- a/data/mods/Magiclysm/recipes/weapons.json
+++ b/data/mods/Magiclysm/recipes/weapons.json
@@ -2,7 +2,7 @@
   {
     "type": "recipe",
     "result": "rune_magus_weapon",
-    "\\": "Forging and water included for glass heat-tempering process",
+    "//": "Forging and water included for glass heat-tempering process",
     "category": "CC_ENCHANTED",
     "subcategory": "CSC_ENCHANTED_WEAPONS",
     "skill_used": "fabrication",
diff --git a/data/mods/Magiclysm/worldgen/overmap_terrain.json b/data/mods/Magiclysm/worldgen/overmap_terrain.json
index 6e99e80728249..2642add833404 100644
--- a/data/mods/Magiclysm/worldgen/overmap_terrain.json
+++ b/data/mods/Magiclysm/worldgen/overmap_terrain.json
@@ -167,7 +167,7 @@
     "name": "solid rock",
     "sym": "%",
     "color": "light_gray",
-    "see,_cost": 5
+    "see_cost": 5
   },
   {
     "type": "overmap_terrain",
diff --git a/data/mods/Magiclysm/worldgen/regional_overlay.json b/data/mods/Magiclysm/worldgen/regional_overlay.json
index 40dfa330b3ffe..52695ee8cc1d5 100644
--- a/data/mods/Magiclysm/worldgen/regional_overlay.json
+++ b/data/mods/Magiclysm/worldgen/regional_overlay.json
@@ -1,7 +1,7 @@
 [
   {
     "type": "region_overlay",
-    "id": "magiclysm_buildings_overlay",
+    "//id": "magiclysm_buildings_overlay",
     "regions": [ "all" ],
     "city": { "shops": { "magic_shop": 100, "used_bookstore": 225 }, "basements": { "magic_basement": 50 } }
   }