diff --git a/ChangeLog.md b/ChangeLog.md
index 4adf454..cbbc498 100644
--- a/ChangeLog.md
+++ b/ChangeLog.md
@@ -5,3 +5,4 @@
   * Add initial loadout passenger cabins for Orca
   * Update costs and initial loadouts for Keelback and Type-7
   * Add resistances for hull reinforcement packages
+  * Added modifier actions to create modifications from raw data
diff --git a/dist/index.js b/dist/index.js
index 0f38607..5274b75 100644
--- a/dist/index.js
+++ b/dist/index.js
@@ -28,7 +28,7 @@ module.exports = {
         mass: 0,
         explres: -.4,
         kinres: -.2,
-        thermres: .2,
+        thermres: 0,
         hullboost: .8
       }, {
         id: "BD",
@@ -38,7 +38,7 @@ module.exports = {
         cost: 35120,
         mass: 3,
         explres: -.4,
-        kinres: .2,
+        kinres: -.2,
         thermres: 0,
         hullboost: 1.52
       }, {
@@ -49,7 +49,7 @@ module.exports = {
         cost: 79030,
         mass: 5,
         explres: -.4,
-        kinres: .2,
+        kinres: -.2,
         thermres: 0,
         hullboost: 2.5
       }, {
@@ -115,7 +115,7 @@ module.exports = {
         mass: 0,
         explres: -.4,
         kinres: -.2,
-        thermres: .2,
+        thermres: 0,
         hullboost: .8
       }, {
         id: "bU",
@@ -125,7 +125,7 @@ module.exports = {
         cost: 58787780,
         mass: 30,
         explres: -.4,
-        kinres: .2,
+        kinres: -.2,
         thermres: 0,
         hullboost: 1.52
       }, {
@@ -136,7 +136,7 @@ module.exports = {
         cost: 132272510,
         mass: 60,
         explres: -.4,
-        kinres: .2,
+        kinres: -.2,
         thermres: 0,
         hullboost: 2.5
       }, {
@@ -201,7 +201,7 @@ module.exports = {
         mass: 0,
         explres: -.4,
         kinres: -.2,
-        thermres: .2,
+        thermres: 0,
         hullboost: .8
       }, {
         id: "BI",
@@ -211,7 +211,7 @@ module.exports = {
         cost: 2664460,
         mass: 21,
         explres: -.4,
-        kinres: .2,
+        kinres: -.2,
         thermres: 0,
         hullboost: 1.52
       }, {
@@ -222,7 +222,7 @@ module.exports = {
         cost: 5995040,
         mass: 42,
         explres: -.4,
-        kinres: .2,
+        kinres: -.2,
         thermres: 0,
         hullboost: 2.5
       }, {
@@ -287,7 +287,7 @@ module.exports = {
         mass: 0,
         explres: -.4,
         kinres: -.2,
-        thermres: .2,
+        thermres: 0,
         hullboost: .8
       }, {
         id: "c2",
@@ -297,7 +297,7 @@ module.exports = {
         cost: 1584460,
         mass: 21,
         explres: -.4,
-        kinres: .2,
+        kinres: -.2,
         thermres: 0,
         hullboost: 1.52
       }, {
@@ -308,7 +308,7 @@ module.exports = {
         cost: 3565040,
         mass: 42,
         explres: -.4,
-        kinres: .2,
+        kinres: -.2,
         thermres: 0,
         hullboost: 2.5
       }, {
@@ -375,7 +375,7 @@ module.exports = {
         mass: 0,
         explres: -.4,
         kinres: -.2,
-        thermres: .2,
+        thermres: 0,
         hullboost: .8
       }, {
         id: "cm",
@@ -385,7 +385,7 @@ module.exports = {
         cost: 33813120,
         mass: 83,
         explres: -.4,
-        kinres: .2,
+        kinres: -.2,
         thermres: 0,
         hullboost: 1.52
       }, {
@@ -396,7 +396,7 @@ module.exports = {
         cost: 76079500,
         mass: 165,
         explres: -.4,
-        kinres: .2,
+        kinres: -.2,
         thermres: 0,
         hullboost: 2.5
       }, {
@@ -501,7 +501,7 @@ module.exports = {
         mass: 0,
         explres: -.4,
         kinres: -.2,
-        thermres: .2,
+        thermres: 0,
         hullboost: .8
       }, {
         id: "bl",
@@ -511,7 +511,7 @@ module.exports = {
         cost: 151890,
         mass: 14,
         explres: -.4,
-        kinres: .2,
+        kinres: -.2,
         thermres: 0,
         hullboost: 1.52
       }, {
@@ -522,7 +522,7 @@ module.exports = {
         cost: 341750,
         mass: 27,
         explres: -.4,
-        kinres: .2,
+        kinres: -.2,
         thermres: 0,
         hullboost: 2.5
       }, {
@@ -587,7 +587,7 @@ module.exports = {
         mass: 0,
         explres: -.4,
         kinres: -.2,
-        thermres: .2,
+        thermres: 0,
         hullboost: .8
       }, {
         id: "ch",
@@ -597,7 +597,7 @@ module.exports = {
         cost: 305890,
         mass: 14,
         explres: -.4,
-        kinres: .2,
+        kinres: -.2,
         thermres: 0,
         hullboost: 1.52
       }, {
@@ -608,7 +608,7 @@ module.exports = {
         cost: 688250,
         mass: 27,
         explres: -.4,
-        kinres: .2,
+        kinres: -.2,
         thermres: 0,
         hullboost: 2.5
       }, {
@@ -673,7 +673,7 @@ module.exports = {
         mass: 0,
         explres: -.4,
         kinres: -.2,
-        thermres: .2,
+        thermres: 0,
         hullboost: .8
       }, {
         id: "bb",
@@ -683,7 +683,7 @@ module.exports = {
         cost: 8e5,
         mass: 23,
         explres: -.4,
-        kinres: .2,
+        kinres: -.2,
         thermres: 0,
         hullboost: 1.52
       }, {
@@ -694,7 +694,7 @@ module.exports = {
         cost: 18e5,
         mass: 47,
         explres: -.4,
-        kinres: .2,
+        kinres: -.2,
         thermres: 0,
         hullboost: 2.5
       }, {
@@ -759,7 +759,7 @@ module.exports = {
         mass: 0,
         explres: -.4,
         kinres: -.2,
-        thermres: .2,
+        thermres: 0,
         hullboost: .8
       }, {
         id: "b6",
@@ -769,7 +769,7 @@ module.exports = {
         cost: 225700,
         mass: 13,
         explres: -.4,
-        kinres: .2,
+        kinres: -.2,
         thermres: 0,
         hullboost: 1.52
       }, {
@@ -780,7 +780,7 @@ module.exports = {
         cost: 507900,
         mass: 26,
         explres: -.4,
-        kinres: .2,
+        kinres: -.2,
         thermres: 0,
         hullboost: 2.5
       }, {
@@ -845,7 +845,7 @@ module.exports = {
         mass: 0,
         explres: -.4,
         kinres: -.2,
-        thermres: .2,
+        thermres: 0,
         hullboost: .8
       }, {
         id: "bZ",
@@ -855,7 +855,7 @@ module.exports = {
         cost: 26880,
         mass: 4,
         explres: -.4,
-        kinres: .2,
+        kinres: -.2,
         thermres: 0,
         hullboost: 1.52
       }, {
@@ -866,7 +866,7 @@ module.exports = {
         cost: 90050,
         mass: 8,
         explres: -.4,
-        kinres: .2,
+        kinres: -.2,
         thermres: 0,
         hullboost: 2.5
       }, {
@@ -931,7 +931,7 @@ module.exports = {
         mass: 0,
         explres: -.4,
         kinres: -.2,
-        thermres: .2,
+        thermres: 0,
         hullboost: .8
       }, {
         id: "bA",
@@ -941,7 +941,7 @@ module.exports = {
         cost: 7925680,
         mass: 44,
         explres: -.4,
-        kinres: .2,
+        kinres: -.2,
         thermres: 0,
         hullboost: 1.52
       }, {
@@ -952,7 +952,7 @@ module.exports = {
         cost: 17832780,
         mass: 87,
         explres: -.4,
-        kinres: .2,
+        kinres: -.2,
         thermres: 0,
         hullboost: 2.5
       }, {
@@ -1002,7 +1002,7 @@ module.exports = {
         boostEnergy: 27,
         agility: 2,
         baseShieldStrength: 555,
-        baseArmour: 666,
+        baseArmour: 370,
         hullMass: 900,
         masslock: 24,
         pipSpeed: .125,
@@ -1018,7 +1018,7 @@ module.exports = {
         mass: 0,
         explres: -.4,
         kinres: -.2,
-        thermres: .2,
+        thermres: 0,
         hullboost: .8
       }, {
         id: "BX",
@@ -1028,7 +1028,7 @@ module.exports = {
         cost: 75187790,
         mass: 30,
         explres: -.4,
-        kinres: .2,
+        kinres: -.2,
         thermres: 0,
         hullboost: 1.52
       }, {
@@ -1039,7 +1039,7 @@ module.exports = {
         cost: 169172510,
         mass: 60,
         explres: -.4,
-        kinres: .2,
+        kinres: -.2,
         thermres: 0,
         hullboost: 2.5
       }, {
@@ -1104,7 +1104,7 @@ module.exports = {
         mass: 0,
         explres: -.4,
         kinres: -.2,
-        thermres: .2,
+        thermres: 0,
         hullboost: .8
       }, {
         id: "bF",
@@ -1114,7 +1114,7 @@ module.exports = {
         cost: 5725680,
         mass: 44,
         explres: -.4,
-        kinres: .2,
+        kinres: -.2,
         thermres: 0,
         hullboost: 1.52
       }, {
@@ -1125,7 +1125,7 @@ module.exports = {
         cost: 12882780,
         mass: 87,
         explres: -.4,
-        kinres: .2,
+        kinres: -.2,
         thermres: 0,
         hullboost: 2.5
       }, {
@@ -1191,7 +1191,7 @@ module.exports = {
         mass: 0,
         explres: -.4,
         kinres: -.2,
-        thermres: .2,
+        thermres: 0,
         hullboost: .8
       }, {
         id: "bK",
@@ -1201,7 +1201,7 @@ module.exports = {
         cost: 14325690,
         mass: 44,
         explres: -.4,
-        kinres: .2,
+        kinres: -.2,
         thermres: 0,
         hullboost: 1.52
       }, {
@@ -1212,7 +1212,7 @@ module.exports = {
         cost: 32232790,
         mass: 87,
         explres: -.4,
-        kinres: .2,
+        kinres: -.2,
         thermres: 0,
         hullboost: 2.5
       }, {
@@ -1277,7 +1277,7 @@ module.exports = {
         mass: 0,
         explres: -.4,
         kinres: -.2,
-        thermres: .2,
+        thermres: 0,
         hullboost: .8
       }, {
         id: "Be",
@@ -1287,7 +1287,7 @@ module.exports = {
         cost: 20626820,
         mass: 19,
         explres: -.4,
-        kinres: .2,
+        kinres: -.2,
         thermres: 0,
         hullboost: 1.52
       }, {
@@ -1298,7 +1298,7 @@ module.exports = {
         cost: 46410340,
         mass: 38,
         explres: -.4,
-        kinres: .2,
+        kinres: -.2,
         thermres: 0,
         hullboost: 2.5
       }, {
@@ -1363,7 +1363,7 @@ module.exports = {
         mass: 0,
         explres: -.4,
         kinres: -.2,
-        thermres: .2,
+        thermres: 0,
         hullboost: .8
       }, {
         id: "Bj",
@@ -1373,7 +1373,7 @@ module.exports = {
         cost: 42180,
         mass: 1,
         explres: -.4,
-        kinres: .2,
+        kinres: -.2,
         thermres: 0,
         hullboost: 1.52
       }, {
@@ -1384,7 +1384,7 @@ module.exports = {
         cost: 185050,
         mass: 2,
         explres: -.4,
-        kinres: .2,
+        kinres: -.2,
         thermres: 0,
         hullboost: 2.5
       }, {
@@ -1449,7 +1449,7 @@ module.exports = {
         mass: 0,
         explres: -.4,
         kinres: -.2,
-        thermres: .2,
+        thermres: 0,
         hullboost: .8
       }, {
         id: "bq",
@@ -1459,7 +1459,7 @@ module.exports = {
         cost: 8918340,
         mass: 30,
         explres: -.4,
-        kinres: .2,
+        kinres: -.2,
         thermres: 0,
         hullboost: 1.52
       }, {
@@ -1470,7 +1470,7 @@ module.exports = {
         cost: 20066270,
         mass: 60,
         explres: -.4,
-        kinres: .2,
+        kinres: -.2,
         thermres: 0,
         hullboost: 2.5
       }, {
@@ -1535,7 +1535,7 @@ module.exports = {
         mass: 0,
         explres: -.4,
         kinres: -.2,
-        thermres: .2,
+        thermres: 0,
         hullboost: .8
       }, {
         id: "bg",
@@ -1545,7 +1545,7 @@ module.exports = {
         cost: 1017200,
         mass: 4,
         explres: -.4,
-        kinres: .2,
+        kinres: -.2,
         thermres: 0,
         hullboost: 1.52
       }, {
@@ -1556,7 +1556,7 @@ module.exports = {
         cost: 2288600,
         mass: 8,
         explres: -.4,
-        kinres: .2,
+        kinres: -.2,
         thermres: 0,
         hullboost: 2.5
       }, {
@@ -1622,7 +1622,7 @@ module.exports = {
         mass: 0,
         explres: -.4,
         kinres: -.2,
-        thermres: .2,
+        thermres: 0,
         hullboost: .8
       }, {
         id: "BS",
@@ -1632,7 +1632,7 @@ module.exports = {
         cost: 83587790,
         mass: 30,
         explres: -.4,
-        kinres: .2,
+        kinres: -.2,
         thermres: 0,
         hullboost: 1.52
       }, {
@@ -1643,7 +1643,7 @@ module.exports = {
         cost: 188072510,
         mass: 60,
         explres: -.4,
-        kinres: .2,
+        kinres: -.2,
         thermres: 0,
         hullboost: 2.5
       }, {
@@ -1708,7 +1708,7 @@ module.exports = {
         mass: 0,
         explres: -.4,
         kinres: -.2,
-        thermres: .2,
+        thermres: 0,
         hullboost: .8
       }, {
         id: "bv",
@@ -1718,7 +1718,7 @@ module.exports = {
         cost: 66500,
         mass: 4,
         explres: -.4,
-        kinres: .2,
+        kinres: -.2,
         thermres: 0,
         hullboost: 1.52
       }, {
@@ -1729,7 +1729,7 @@ module.exports = {
         cost: 222760,
         mass: 8,
         explres: -.4,
-        kinres: .2,
+        kinres: -.2,
         thermres: 0,
         hullboost: 2.5
       }, {
@@ -1795,7 +1795,7 @@ module.exports = {
         mass: 0,
         explres: -.4,
         kinres: -.2,
-        thermres: .2,
+        thermres: 0,
         hullboost: .8
       }, {
         id: "cc",
@@ -1805,7 +1805,7 @@ module.exports = {
         cost: 1250460,
         mass: 12,
         explres: -.4,
-        kinres: .2,
+        kinres: -.2,
         thermres: 0,
         hullboost: 1.52
       }, {
@@ -1816,7 +1816,7 @@ module.exports = {
         cost: 2813540,
         mass: 23,
         explres: -.4,
-        kinres: .2,
+        kinres: -.2,
         thermres: 0,
         hullboost: 2.5
       }, {
@@ -1882,7 +1882,7 @@ module.exports = {
         mass: 0,
         explres: -.4,
         kinres: -.2,
-        thermres: .2,
+        thermres: 0,
         hullboost: .8
       }, {
         id: "BN",
@@ -1892,7 +1892,7 @@ module.exports = {
         cost: 19415950,
         mass: 21,
         explres: -.4,
-        kinres: .2,
+        kinres: -.2,
         thermres: 0,
         hullboost: 1.52
       }, {
@@ -1903,7 +1903,7 @@ module.exports = {
         cost: 43685900,
         mass: 87,
         explres: -.4,
-        kinres: .2,
+        kinres: -.2,
         thermres: 0,
         hullboost: 2.5
       }, {
@@ -1988,7 +1988,7 @@ module.exports = {
         mass: 0,
         explres: -.4,
         kinres: -.2,
-        thermres: .2,
+        thermres: 0,
         hullboost: .8
       }, {
         id: "bP",
@@ -1998,7 +1998,7 @@ module.exports = {
         cost: 22791270,
         mass: 26,
         explres: -.4,
-        kinres: .2,
+        kinres: -.2,
         thermres: 0,
         hullboost: 1.52
       }, {
@@ -2009,7 +2009,7 @@ module.exports = {
         cost: 51280360,
         mass: 53,
         explres: -.4,
-        kinres: .2,
+        kinres: -.2,
         thermres: 0,
         hullboost: 2.5
       }, {
@@ -2074,7 +2074,7 @@ module.exports = {
         mass: 0,
         explres: -.4,
         kinres: -.2,
-        thermres: .2,
+        thermres: 0,
         hullboost: .8
       }, {
         id: "b1",
@@ -2084,7 +2084,7 @@ module.exports = {
         cost: 25600,
         mass: 2,
         explres: -.4,
-        kinres: .2,
+        kinres: -.2,
         thermres: 0,
         hullboost: 1.52
       }, {
@@ -2095,7 +2095,7 @@ module.exports = {
         cost: 80320,
         mass: 4,
         explres: -.4,
-        kinres: .2,
+        kinres: -.2,
         thermres: 0,
         hullboost: 2.5
       }, {
@@ -2160,7 +2160,7 @@ module.exports = {
         mass: 0,
         explres: -.4,
         kinres: -.2,
-        thermres: .2,
+        thermres: 0,
         hullboost: .8
       }, {
         id: "Bo",
@@ -2170,7 +2170,7 @@ module.exports = {
         cost: 418380,
         mass: 12,
         explres: -.4,
-        kinres: .2,
+        kinres: -.2,
         thermres: 0,
         hullboost: 1.52
       }, {
@@ -2181,7 +2181,7 @@ module.exports = {
         cost: 941350,
         mass: 23,
         explres: -.4,
-        kinres: .2,
+        kinres: -.2,
         thermres: 0,
         hullboost: 2.5
       }, {
@@ -2246,7 +2246,7 @@ module.exports = {
         mass: 0,
         explres: -.4,
         kinres: -.2,
-        thermres: .2,
+        thermres: 0,
         hullboost: .8
       }, {
         id: "Bt",
@@ -2256,7 +2256,7 @@ module.exports = {
         cost: 6988900,
         mass: 32,
         explres: -.4,
-        kinres: .2,
+        kinres: -.2,
         thermres: 0,
         hullboost: 1.52
       }, {
@@ -2267,7 +2267,7 @@ module.exports = {
         cost: 15725030,
         mass: 63,
         explres: -.4,
-        kinres: .2,
+        kinres: -.2,
         thermres: 0,
         hullboost: 2.5
       }, {
@@ -2333,7 +2333,7 @@ module.exports = {
         mass: 0,
         explres: -.4,
         kinres: -.2,
-        thermres: .2,
+        thermres: 0,
         hullboost: .8
       }, {
         id: "By",
@@ -2343,7 +2343,7 @@ module.exports = {
         cost: 30622340,
         mass: 75,
         explres: -.4,
-        kinres: .2,
+        kinres: -.2,
         thermres: 0,
         hullboost: 1.52
       }, {
@@ -2354,7 +2354,7 @@ module.exports = {
         cost: 68900260,
         mass: 150,
         explres: -.4,
-        kinres: .2,
+        kinres: -.2,
         thermres: 0,
         hullboost: 2.5
       }, {
@@ -2419,7 +2419,7 @@ module.exports = {
         mass: 0,
         explres: -.4,
         kinres: -.2,
-        thermres: .2,
+        thermres: 0,
         hullboost: .8
       }, {
         id: "B4",
@@ -2429,7 +2429,7 @@ module.exports = {
         cost: 57170,
         mass: 5,
         explres: -.4,
-        kinres: .2,
+        kinres: -.2,
         thermres: 0,
         hullboost: 1.52
       }, {
@@ -2440,7 +2440,7 @@ module.exports = {
         cost: 128640,
         mass: 9,
         explres: -.4,
-        kinres: .2,
+        kinres: -.2,
         thermres: 0,
         hullboost: 2.5
       }, {
@@ -2505,7 +2505,7 @@ module.exports = {
         mass: 0,
         explres: -.4,
         kinres: -.2,
-        thermres: .2,
+        thermres: 0,
         hullboost: .8
       }, {
         id: "c7",
@@ -2515,7 +2515,7 @@ module.exports = {
         cost: 175180,
         mass: 5,
         explres: -.4,
-        kinres: .2,
+        kinres: -.2,
         thermres: 0,
         hullboost: 1.52
       }, {
@@ -2526,7 +2526,7 @@ module.exports = {
         cost: 394140,
         mass: 9,
         explres: -.4,
-        kinres: .2,
+        kinres: -.2,
         thermres: 0,
         hullboost: 2.5
       }, {
@@ -2591,7 +2591,7 @@ module.exports = {
         mass: 0,
         explres: -.4,
         kinres: -.2,
-        thermres: .2,
+        thermres: 0,
         hullboost: .8
       }, {
         id: "B9",
@@ -2601,7 +2601,7 @@ module.exports = {
         cost: 1970250,
         mass: 17,
         explres: -.4,
-        kinres: .2,
+        kinres: -.2,
         thermres: 0,
         hullboost: 1.52
       }, {
@@ -2612,7 +2612,7 @@ module.exports = {
         cost: 4433050,
         mass: 35,
         explres: -.4,
-        kinres: .2,
+        kinres: -.2,
         thermres: 0,
         hullboost: 2.5
       }, {
@@ -3185,7 +3185,7 @@ module.exports = {
         integrity: 105,
         mass: 32,
         maxmass: 2430,
-        maxmul: 1.86,
+        maxmul: 1.06,
         minmass: 810,
         minmul: .86,
         optmass: 1620,
@@ -6338,14 +6338,14 @@ module.exports = {
         thermload: .2,
         type: "T"
       }, {
-        breachdmg: 15.25,
+        breachdmg: 1.5,
         breachmax: 0,
         breachmin: 0,
-        burst: 8,
-        burstrof: 20,
+        burst: 3,
+        burstrof: 15,
         class: 1,
         cost: 8800,
-        damage: 18,
+        damage: 2.4,
         distdraw: .4,
         edID: 128671449,
         eddbID: 1477,
@@ -8485,6 +8485,7 @@ module.exports = {
       } ],
       ch: [ {
         ammo: 10,
+        ammocost: 100,
         class: 0,
         clip: 1,
         cost: 8500,
@@ -8525,6 +8526,7 @@ module.exports = {
       } ],
       hs: [ {
         ammo: 2,
+        ammocost: 25,
         class: 0,
         clip: 1,
         cost: 3500,
@@ -9058,8 +9060,10 @@ module.exports = {
         cost: 7710,
         edID: 128671331,
         eddbID: 1530,
+        explres: .5,
         grp: "bsg",
         id: "B6",
+        kinres: .4,
         mass: 1.3,
         maxmass: 63,
         maxmul: 1.4,
@@ -9069,14 +9073,17 @@ module.exports = {
         optmul: .9,
         power: 1.2,
         rating: "C",
-        recover: 2.4
+        recover: 2.4,
+        thermres: -.2
       }, {
         class: 2,
         cost: 26710,
         edID: 128671332,
         eddbID: 1531,
+        explres: .5,
         grp: "bsg",
         id: "B5",
+        kinres: .4,
         mass: 2.5,
         maxmass: 138,
         maxmul: 1.4,
@@ -9086,14 +9093,17 @@ module.exports = {
         optmul: .9,
         power: 1.5,
         rating: "C",
-        recover: 2.4
+        recover: 2.4,
+        thermres: -.2
       }, {
         class: 3,
         cost: 84650,
         edID: 128671333,
         eddbID: 1532,
+        explres: .5,
         grp: "bsg",
         id: "B4",
+        kinres: .4,
         mass: 5,
         maxmass: 413,
         maxmul: 1.4,
@@ -9103,14 +9113,17 @@ module.exports = {
         optmul: .9,
         power: 1.8,
         rating: "C",
-        recover: 2.4
+        recover: 2.4,
+        thermres: -.2
       }, {
         class: 4,
         cost: 268350,
         edID: 128671334,
         eddbID: 1533,
+        explres: .5,
         grp: "bsg",
         id: "B3",
+        kinres: .4,
         mass: 10,
         maxmass: 713,
         maxmul: 1.4,
@@ -9120,14 +9133,17 @@ module.exports = {
         optmul: .9,
         power: 2.2,
         rating: "C",
-        recover: 2.85
+        recover: 2.85,
+        thermres: -.2
       }, {
         class: 5,
         cost: 850660,
         edID: 128671335,
         eddbID: 1534,
+        explres: .5,
         grp: "bsg",
         id: "B2",
+        kinres: .4,
         mass: 20,
         maxmass: 1013,
         maxmul: 1.4,
@@ -9137,14 +9153,17 @@ module.exports = {
         optmul: .9,
         power: 2.6,
         rating: "C",
-        recover: 3.75
+        recover: 3.75,
+        thermres: -.2
       }, {
         class: 6,
         cost: 2696600,
         edID: 128671336,
         eddbID: 1535,
+        explres: .5,
         grp: "bsg",
         id: "B1",
+        kinres: .4,
         mass: 40,
         maxmass: 1350,
         maxmul: 1.4,
@@ -9154,14 +9173,17 @@ module.exports = {
         optmul: .9,
         power: 3.1,
         rating: "C",
-        recover: 4.8
+        recover: 4.8,
+        thermres: -.2
       }, {
         class: 7,
         cost: 8548200,
         edID: 128671337,
         eddbID: 1536,
+        explres: .5,
         grp: "bsg",
         id: "B0",
+        kinres: .4,
         mass: 80,
         maxmass: 2650,
         maxmul: 1.4,
@@ -9171,14 +9193,17 @@ module.exports = {
         optmul: .9,
         power: 3.5,
         rating: "C",
-        recover: 6
+        recover: 6,
+        thermres: -.2
       }, {
         class: 8,
         cost: 27097750,
         edID: 128671338,
         eddbID: 1537,
+        explres: .5,
         grp: "bsg",
         id: "B7",
+        kinres: .4,
         mass: 160,
         maxmass: 4500,
         maxmul: 1.4,
@@ -9188,7 +9213,8 @@ module.exports = {
         optmul: .9,
         power: 4,
         rating: "C",
-        recover: 7.2
+        recover: 7.2,
+        thermres: -.2
       } ],
       cr: [ {
         cargo: 2,
@@ -9561,6 +9587,7 @@ module.exports = {
         cost: 575660,
         edID: 128727930,
         eddbID: 1560,
+        fightercost: 1030,
         grp: "fh",
         id: "fh",
         mass: 60,
@@ -9573,6 +9600,7 @@ module.exports = {
         cost: 1869350,
         edID: 128727931,
         eddbID: 1561,
+        fightercost: 1030,
         grp: "fh",
         id: "fm",
         mass: 40,
@@ -9585,6 +9613,7 @@ module.exports = {
         cost: 2369330,
         edID: 128727932,
         eddbID: 1562,
+        fightercost: 1030,
         grp: "fh",
         id: "fr",
         mass: 20,
@@ -10835,130 +10864,130 @@ module.exports = {
         cost: 15e4,
         edID: 128668545,
         eddbID: 1381,
-        explres: 2.5,
+        explres: .025,
         grp: "hr",
         id: "2e",
-        kinres: 2.5,
+        kinres: .025,
         mass: 64,
         rating: "E",
-        thermres: 2.5
+        thermres: .025
       }, {
         hullreinforcement: 390,
         class: 5,
         cost: 45e4,
         edID: 128668546,
         eddbID: 1382,
-        explres: 2.5,
+        explres: .025,
         grp: "hr",
         id: "2d",
-        kinres: 2.5,
+        kinres: .025,
         mass: 32,
         rating: "D",
-        thermres: 2.5
+        thermres: .025
       }, {
         hullreinforcement: 300,
         class: 4,
         cost: 65e3,
         edID: 128668543,
         eddbID: 1379,
-        explres: 2,
+        explres: .2,
         grp: "hr",
         id: "2c",
-        kinres: 2,
+        kinres: .2,
         mass: 32,
         rating: "E",
-        thermres: 2
+        thermres: .2
       }, {
         hullreinforcement: 330,
         class: 4,
         cost: 195e3,
         edID: 128668544,
         eddbID: 1380,
-        explres: 2,
+        explres: .2,
         grp: "hr",
         id: "2b",
-        kinres: 2,
+        kinres: .2,
         mass: 16,
         rating: "D",
-        thermres: 2
+        thermres: .2
       }, {
         hullreinforcement: 230,
         class: 3,
         cost: 28e3,
         edID: 128668541,
         eddbID: 1377,
-        explres: 1.5,
+        explres: .015,
         grp: "hr",
         id: "2a",
-        kinres: 1.5,
+        kinres: .015,
         mass: 16,
         rating: "E",
-        thermres: 1.5
+        thermres: .015
       }, {
         hullreinforcement: 260,
         class: 3,
         cost: 84e3,
         edID: 128668542,
         eddbID: 1378,
-        explres: 1.5,
+        explres: .015,
         grp: "hr",
         id: "29",
-        kinres: 1.5,
+        kinres: .015,
         mass: 8,
         rating: "D",
-        thermres: 1.5
+        thermres: .015
       }, {
         hullreinforcement: 150,
         class: 2,
         cost: 12e3,
         edID: 128668539,
         eddbID: 1375,
-        explres: 1,
+        explres: .01,
         grp: "hr",
         id: "28",
-        kinres: 1,
+        kinres: .01,
         mass: 8,
         rating: "E",
-        thermres: 1
+        thermres: .01
       }, {
         hullreinforcement: 190,
         class: 2,
         cost: 36e3,
         edID: 128668540,
         eddbID: 1376,
-        explres: 1,
+        explres: .01,
         grp: "hr",
         id: "27",
-        kinres: 1,
+        kinres: .01,
         mass: 4,
         rating: "D",
-        themres: 1
+        thermres: .01
       }, {
         hullreinforcement: 80,
         class: 1,
         cost: 5e3,
         edID: 128668537,
         eddbID: 1373,
-        explres: .5,
+        explres: .005,
         grp: "hr",
         id: "26",
-        kinres: .5,
+        kinres: .005,
         mass: 4,
         rating: "E",
-        thermres: .5
+        thermres: .005
       }, {
         hullreinforcement: 110,
         class: 1,
         cost: 15e3,
         edID: 128668538,
         eddbID: 1374,
-        explres: .5,
+        explres: .005,
         grp: "hr",
         id: "25",
-        kinres: .5,
+        kinres: .005,
         mass: 2,
         rating: "D",
-        thermres: .5
+        thermres: .005
       } ],
       pv: [ {
         bays: 4,
@@ -11032,8 +11061,10 @@ module.exports = {
         cost: 132200,
         edID: 128671323,
         eddbID: 1485,
+        explres: .5,
         grp: "psg",
         id: "p6",
+        kinres: .4,
         mass: 2.5,
         maxmass: 63,
         maxmul: 2,
@@ -11044,14 +11075,17 @@ module.exports = {
         power: 2.52,
         pp: "Aisling Duval",
         rating: "A",
-        recover: 1.2
+        recover: 1.2,
+        thermres: -.2
       }, {
         class: 2,
         cost: 240340,
         edID: 128671324,
         eddbID: 1486,
+        explres: .5,
         grp: "psg",
         id: "p5",
+        kinres: .4,
         mass: 5,
         maxmass: 138,
         maxmul: 2,
@@ -11062,14 +11096,17 @@ module.exports = {
         power: 3.15,
         pp: "Aisling Duval",
         rating: "A",
-        recover: 1.2
+        recover: 1.2,
+        thermres: -.2
       }, {
         class: 3,
         cost: 761870,
         edID: 128671325,
         eddbID: 1487,
+        explres: .5,
         grp: "psg",
         id: "p4",
+        kinres: .4,
         mass: 10,
         maxmass: 413,
         maxmul: 2,
@@ -11080,14 +11117,17 @@ module.exports = {
         power: 3.78,
         pp: "Aisling Duval",
         rating: "A",
-        recover: 1.2
+        recover: 1.2,
+        thermres: -.2
       }, {
         class: 4,
         cost: 2415120,
         edID: 128671326,
         eddbID: 1488,
+        explres: .5,
         grp: "psg",
         id: "p3",
+        kinres: .4,
         mass: 20,
         maxmass: 713,
         maxmul: 2,
@@ -11098,14 +11138,17 @@ module.exports = {
         power: 4.62,
         pp: "Aisling Duval",
         rating: "A",
-        recover: 1.425
+        recover: 1.425,
+        thermres: -.2
       }, {
         class: 5,
         cost: 7655930,
         edID: 128671327,
         eddbID: 1489,
+        explres: .5,
         grp: "psg",
         id: "p2",
+        kinres: .4,
         mass: 40,
         maxmass: 1013,
         maxmul: 2,
@@ -11116,14 +11159,17 @@ module.exports = {
         power: 5.46,
         pp: "Aisling Duval",
         rating: "A",
-        recover: 1.875
+        recover: 1.875,
+        thermres: -.2
       }, {
         class: 6,
         cost: 24269300,
         edID: 128671328,
         eddbID: 1490,
+        explres: .5,
         grp: "psg",
         id: "p1",
+        kinres: .4,
         mass: 80,
         maxmass: 1350,
         maxmul: 2,
@@ -11134,14 +11180,17 @@ module.exports = {
         power: 6.51,
         pp: "Aisling Duval",
         rating: "A",
-        recover: 2.4
+        recover: 2.4,
+        thermres: -.2
       }, {
         class: 7,
         cost: 76933670,
         edID: 128671329,
         eddbID: 1491,
+        explres: .5,
         grp: "psg",
         id: "p0",
+        kinres: .4,
         mass: 160,
         maxmass: 2650,
         maxmul: 2,
@@ -11152,14 +11201,17 @@ module.exports = {
         power: 7.35,
         pp: "Aisling Duval",
         rating: "A",
-        recover: 3
+        recover: 3,
+        thermres: -.2
       }, {
         class: 8,
         cost: 243879730,
         edID: 128671330,
         eddbID: 1492,
+        explres: .5,
         grp: "psg",
         id: "p7",
+        kinres: .4,
         mass: 320,
         maxmass: 4500,
         maxmul: 2,
@@ -11170,7 +11222,8 @@ module.exports = {
         power: 8.4,
         pp: "Aisling Duval",
         rating: "A",
-        recover: 3.6
+        recover: 3.6,
+        thermres: -.2
       } ],
       pc: [ {
         class: 7,
@@ -11821,7 +11874,7 @@ module.exports = {
         mass: 160,
         power: 1.44,
         rating: "E",
-        recharge: 476,
+        shieldreinforcement: 476,
         rechargerating: "C",
         spinup: 5,
         thermload: 800
@@ -11840,7 +11893,7 @@ module.exports = {
         mass: 64,
         power: 1.92,
         rating: "D",
-        recharge: 629,
+        shieldreinforcement: 629,
         rechargerating: "D",
         spinup: 5,
         thermload: 800
@@ -11859,7 +11912,7 @@ module.exports = {
         mass: 160,
         power: 2.4,
         rating: "C",
-        recharge: 799,
+        shieldreinforcement: 799,
         rechargerating: "C",
         spinup: 5,
         thermload: 800
@@ -11878,7 +11931,7 @@ module.exports = {
         mass: 256,
         power: 2.88,
         rating: "B",
-        recharge: 952,
+        shieldreinforcement: 952,
         rechargerating: "B",
         spinup: 5,
         thermload: 800
@@ -11897,7 +11950,7 @@ module.exports = {
         mass: 160,
         power: 3.36,
         rating: "A",
-        recharge: 1105,
+        shieldreinforcement: 1105,
         rechargerating: "A",
         spinup: 5,
         thermload: 800
@@ -11916,7 +11969,7 @@ module.exports = {
         mass: 80,
         power: 1.24,
         rating: "E",
-        recharge: 264,
+        shieldreinforcement: 264,
         rechargerating: "E",
         spinup: 5,
         thermload: 720
@@ -11935,7 +11988,7 @@ module.exports = {
         mass: 32,
         power: 1.66,
         rating: "D",
-        recharge: 352,
+        shieldreinforcement: 352,
         rechargerating: "D",
         spinup: 5,
         thermload: 720
@@ -11954,7 +12007,7 @@ module.exports = {
         mass: 80,
         power: 2.07,
         rating: "C",
-        recharge: 451,
+        shieldreinforcement: 451,
         rechargerating: "C",
         spinup: 5,
         thermload: 720
@@ -11973,7 +12026,7 @@ module.exports = {
         mass: 128,
         power: 2.48,
         rating: "B",
-        recharge: 539,
+        shieldreinforcement: 539,
         rechargerating: "B",
         spinup: 5,
         thermload: 720
@@ -11992,7 +12045,7 @@ module.exports = {
         mass: 80,
         power: 2.9,
         rating: "A",
-        recharge: 627,
+        shieldreinforcement: 627,
         rechargerating: "A",
         spinup: 5,
         thermload: 720
@@ -12011,7 +12064,7 @@ module.exports = {
         mass: 40,
         power: 1.06,
         rating: "E",
-        recharge: 160,
+        shieldreinforcement: 160,
         rechargerating: "E",
         spinup: 5,
         thermload: 640
@@ -12030,7 +12083,7 @@ module.exports = {
         mass: 16,
         power: 1.42,
         rating: "D",
-        recharge: 208,
+        shieldreinforcement: 208,
         rechargerating: "D",
         spinup: 5,
         thermload: 640
@@ -12049,7 +12102,7 @@ module.exports = {
         mass: 40,
         power: 1.77,
         rating: "C",
-        recharge: 264,
+        shieldreinforcement: 264,
         rechargerating: "C",
         spinup: 5,
         thermload: 640
@@ -12068,7 +12121,7 @@ module.exports = {
         mass: 64,
         power: 2.12,
         rating: "B",
-        recharge: 312,
+        shieldreinforcement: 312,
         rechargerating: "B",
         spinup: 5,
         thermload: 640
@@ -12087,7 +12140,7 @@ module.exports = {
         mass: 40,
         power: 2.48,
         rating: "A",
-        recharge: 368,
+        shieldreinforcement: 368,
         rechargerating: "A",
         spinup: 5,
         thermload: 640
@@ -12106,7 +12159,7 @@ module.exports = {
         mass: 20,
         power: .9,
         rating: "E",
-        recharge: 105,
+        shieldreinforcement: 105,
         rechargerating: "E",
         spinup: 5,
         thermload: 540
@@ -12125,7 +12178,7 @@ module.exports = {
         mass: 8,
         power: 1.2,
         rating: "D",
-        recharge: 140,
+        shieldreinforcement: 140,
         rechargerating: "D",
         spinup: 5,
         thermload: 540
@@ -12144,7 +12197,7 @@ module.exports = {
         mass: 20,
         power: 1.5,
         rating: "C",
-        recharge: 175,
+        shieldreinforcement: 175,
         rechargerating: "C",
         spinup: 5,
         thermload: 540
@@ -12163,7 +12216,7 @@ module.exports = {
         mass: 32,
         power: 1.8,
         rating: "B",
-        recharge: 205,
+        shieldreinforcement: 205,
         rechargerating: "B",
         spinup: 5,
         thermload: 540
@@ -12182,7 +12235,7 @@ module.exports = {
         mass: 20,
         power: 2.1,
         rating: "A",
-        recharge: 240,
+        shieldreinforcement: 240,
         rechargerating: "A",
         spinup: 5,
         thermload: 540
@@ -12201,7 +12254,7 @@ module.exports = {
         mass: 10,
         power: .74,
         rating: "E",
-        recharge: 60,
+        shieldreinforcement: 60,
         rechargerating: "E",
         spinup: 5,
         thermload: 410
@@ -12220,7 +12273,7 @@ module.exports = {
         mass: 4,
         power: .98,
         rating: "D",
-        recharge: 78,
+        shieldreinforcement: 78,
         rechargerating: "D",
         spinup: 5,
         thermload: 410
@@ -12239,7 +12292,7 @@ module.exports = {
         mass: 10,
         power: 1.23,
         rating: "C",
-        recharge: 99,
+        shieldreinforcement: 99,
         rechargerating: "C",
         spinup: 5,
         thermload: 410
@@ -12258,7 +12311,7 @@ module.exports = {
         mass: 16,
         power: 1.48,
         rating: "B",
-        recharge: 117,
+        shieldreinforcement: 117,
         rechargerating: "B",
         spinup: 5,
         thermload: 410
@@ -12277,7 +12330,7 @@ module.exports = {
         mass: 10,
         power: 1.72,
         rating: "A",
-        recharge: 138,
+        shieldreinforcement: 138,
         rechargerating: "A",
         spinup: 5,
         thermload: 410
@@ -12296,7 +12349,7 @@ module.exports = {
         mass: 5,
         power: .61,
         rating: "E",
-        recharge: 34,
+        shieldreinforcement: 34,
         rechargerating: "E",
         spinup: 5,
         thermload: 340
@@ -12315,7 +12368,7 @@ module.exports = {
         mass: 2,
         power: .82,
         rating: "D",
-        recharge: 46,
+        shieldreinforcement: 46,
         rechargerating: "D",
         spinup: 5,
         thermload: 340
@@ -12334,7 +12387,7 @@ module.exports = {
         mass: 5,
         power: 1.02,
         rating: "C",
-        recharge: 58,
+        shieldreinforcement: 58,
         rechargerating: "C",
         spinup: 5,
         thermload: 340
@@ -12353,7 +12406,7 @@ module.exports = {
         mass: 8,
         power: 1.22,
         rating: "B",
-        recharge: 70,
+        shieldreinforcement: 70,
         rechargerating: "B",
         spinup: 5,
         thermload: 340
@@ -12372,7 +12425,7 @@ module.exports = {
         mass: 5,
         power: 1.43,
         rating: "A",
-        recharge: 82,
+        shieldreinforcement: 82,
         rechargerating: "A",
         spinup: 5,
         thermload: 340
@@ -12391,7 +12444,7 @@ module.exports = {
         mass: 2.5,
         power: .5,
         rating: "E",
-        recharge: 28,
+        shieldreinforcement: 28,
         rechargerating: "E",
         spinup: 5,
         thermload: 240
@@ -12410,7 +12463,7 @@ module.exports = {
         mass: 1,
         power: .67,
         rating: "D",
-        recharge: 36,
+        shieldreinforcement: 36,
         rechargerating: "D",
         spinup: 5,
         thermload: 240
@@ -12429,7 +12482,7 @@ module.exports = {
         mass: 2.5,
         power: .84,
         rating: "C",
-        recharge: 46,
+        shieldreinforcement: 46,
         rechargerating: "C",
         spinup: 5,
         thermload: 240
@@ -12448,7 +12501,7 @@ module.exports = {
         mass: 4,
         power: 1.01,
         rating: "B",
-        recharge: 56,
+        shieldreinforcement: 56,
         rechargerating: "B",
         spinup: 5,
         thermload: 240
@@ -12467,7 +12520,7 @@ module.exports = {
         mass: 2.5,
         power: 1.18,
         rating: "A",
-        recharge: 64,
+        shieldreinforcement: 64,
         rechargerating: "A",
         spinup: 5,
         thermload: 240
@@ -12486,7 +12539,7 @@ module.exports = {
         mass: 1.3,
         power: .41,
         rating: "E",
-        recharge: 12,
+        shieldreinforcement: 12,
         rechargerating: "E",
         spinup: 5,
         thermload: 170
@@ -12505,7 +12558,7 @@ module.exports = {
         mass: .5,
         power: .55,
         rating: "D",
-        recharge: 12.5,
+        shieldreinforcement: 12.5,
         rechargerating: "D",
         spinup: 5,
         thermload: 170
@@ -12524,7 +12577,7 @@ module.exports = {
         mass: 1.3,
         power: .69,
         rating: "C",
-        recharge: 20,
+        shieldreinforcement: 20,
         rechargerating: "C",
         spinup: 5,
         thermload: 170
@@ -12543,7 +12596,7 @@ module.exports = {
         mass: 2,
         power: .83,
         rating: "B",
-        recharge: 24,
+        shieldreinforcement: 24,
         rechargerating: "B",
         spinup: 5,
         thermload: 170
@@ -12562,7 +12615,7 @@ module.exports = {
         mass: 1.3,
         power: .97,
         rating: "A",
-        recharge: 28,
+        shieldreinforcement: 28,
         rechargerating: "A",
         spinup: 5,
         thermload: 170
@@ -12572,8 +12625,10 @@ module.exports = {
         cost: 2007240,
         edID: 128064293,
         eddbID: 1146,
+        explres: .5,
         grp: "sg",
         id: "4t",
+        kinres: .4,
         mass: 160,
         maxmass: 4500,
         maxmul: 1.3,
@@ -12583,14 +12638,17 @@ module.exports = {
         optmul: .8,
         power: 2.4,
         rating: "E",
-        recover: 4.8
+        recover: 4.8,
+        thermres: -.2
       }, {
         class: 8,
         cost: 6021720,
         edID: 128064294,
         eddbID: 1147,
+        explres: .5,
         grp: "sg",
         id: "4s",
+        kinres: .4,
         mass: 64,
         maxmass: 4500,
         maxmul: 1.4,
@@ -12600,14 +12658,17 @@ module.exports = {
         optmul: .9,
         power: 3.2,
         rating: "D",
-        recover: 4.8
+        recover: 4.8,
+        thermres: -.2
       }, {
         class: 8,
         cost: 18065170,
         edID: 128064295,
         eddbID: 1148,
+        explres: .5,
         grp: "sg",
         id: "4r",
+        kinres: .4,
         mass: 160,
         maxmass: 4500,
         maxmul: 1.5,
@@ -12617,14 +12678,17 @@ module.exports = {
         optmul: 1,
         power: 4,
         rating: "C",
-        recover: 4.8
+        recover: 4.8,
+        thermres: -.2
       }, {
         class: 8,
         cost: 54195500,
         edID: 128064296,
         eddbID: 1149,
+        explres: .5,
         grp: "sg",
         id: "4q",
+        kinres: .4,
         mass: 256,
         maxmass: 4500,
         maxmul: 1.6,
@@ -12634,14 +12698,17 @@ module.exports = {
         optmul: 1.1,
         power: 4.8,
         rating: "B",
-        recover: 4.8
+        recover: 4.8,
+        thermres: -.2
       }, {
         class: 8,
         cost: 162586490,
         edID: 128064297,
         eddbID: 1150,
+        explres: .5,
         grp: "sg",
         id: "4p",
+        kinres: .4,
         mass: 160,
         maxmass: 4500,
         maxmul: 1.7,
@@ -12651,14 +12718,17 @@ module.exports = {
         optmul: 1.2,
         power: 5.6,
         rating: "A",
-        recover: 4.8
+        recover: 4.8,
+        thermres: -.2
       }, {
         class: 7,
         cost: 633200,
         edID: 128064288,
         eddbID: 1141,
+        explres: .5,
         grp: "sg",
         id: "4o",
+        kinres: .4,
         mass: 80,
         maxmass: 2650,
         maxmul: 1.3,
@@ -12668,14 +12738,17 @@ module.exports = {
         optmul: .8,
         power: 2.1,
         rating: "E",
-        recover: 4
+        recover: 4,
+        thermres: -.2
       }, {
         class: 7,
         cost: 1899600,
         edID: 128064289,
         eddbID: 1142,
+        explres: .5,
         grp: "sg",
         id: "4n",
+        kinres: .4,
         mass: 32,
         maxmass: 2650,
         maxmul: 1.4,
@@ -12685,14 +12758,17 @@ module.exports = {
         optmul: .9,
         power: 2.8,
         rating: "D",
-        recover: 4
+        recover: 4,
+        thermres: -.2
       }, {
         class: 7,
         cost: 5698790,
         edID: 128064290,
         eddbID: 1143,
+        explres: .5,
         grp: "sg",
         id: "4m",
+        kinres: .4,
         mass: 80,
         maxmass: 2650,
         maxmul: 1.5,
@@ -12702,14 +12778,17 @@ module.exports = {
         optmul: 1,
         power: 3.5,
         rating: "C",
-        recover: 4
+        recover: 4,
+        thermres: -.2
       }, {
         class: 7,
         cost: 17096370,
         edID: 128064291,
         eddbID: 1144,
+        explres: .5,
         grp: "sg",
         id: "4l",
+        kinres: .4,
         mass: 128,
         maxmass: 2650,
         maxmul: 1.6,
@@ -12719,14 +12798,17 @@ module.exports = {
         optmul: 1.1,
         power: 4.2,
         rating: "B",
-        recover: 4
+        recover: 4,
+        thermres: -.2
       }, {
         class: 7,
         cost: 51289110,
         edID: 128064292,
         eddbID: 1145,
+        explres: .5,
         grp: "sg",
         id: "4k",
+        kinres: .4,
         mass: 80,
         maxmass: 2650,
         maxmul: 1.7,
@@ -12736,14 +12818,17 @@ module.exports = {
         optmul: 1.2,
         power: 4.9,
         rating: "A",
-        recover: 4
+        recover: 4,
+        thermres: -.2
       }, {
         class: 6,
         cost: 199750,
         edID: 128064283,
         eddbID: 1136,
+        explres: .5,
         grp: "sg",
         id: "4j",
+        kinres: .4,
         mass: 40,
         maxmass: 1350,
         maxmul: 1.3,
@@ -12753,14 +12838,17 @@ module.exports = {
         optmul: .8,
         power: 1.86,
         rating: "E",
-        recover: 3.2
+        recover: 3.2,
+        thermres: -.2
       }, {
         class: 6,
         cost: 599240,
         edID: 128064284,
         eddbID: 1137,
+        explres: .5,
         grp: "sg",
         id: "4i",
+        kinres: .4,
         mass: 16,
         maxmass: 1350,
         maxmul: 1.4,
@@ -12770,14 +12858,17 @@ module.exports = {
         optmul: .9,
         power: 2.48,
         rating: "D",
-        recover: 3.2
+        recover: 3.2,
+        thermres: -.2
       }, {
         class: 6,
         cost: 1797730,
         edID: 128064285,
         eddbID: 1138,
+        explres: .5,
         grp: "sg",
         id: "4h",
+        kinres: .4,
         mass: 40,
         maxmass: 1350,
         maxmul: 1.5,
@@ -12787,14 +12878,17 @@ module.exports = {
         optmul: 1,
         power: 3.1,
         rating: "C",
-        recover: 3.2
+        recover: 3.2,
+        thermres: -.2
       }, {
         class: 6,
         cost: 5393180,
         edID: 128064286,
         eddbID: 1139,
+        explres: .5,
         grp: "sg",
         id: "4g",
+        kinres: .4,
         mass: 64,
         maxmass: 1350,
         maxmul: 1.6,
@@ -12804,14 +12898,17 @@ module.exports = {
         optmul: 1.1,
         power: 3.72,
         rating: "B",
-        recover: 3.2
+        recover: 3.2,
+        thermres: -.2
       }, {
         class: 6,
         cost: 16179530,
         edID: 128064287,
         eddbID: 1140,
+        explres: .5,
         grp: "sg",
         id: "4f",
+        kinres: .4,
         mass: 40,
         maxmass: 1350,
         maxmul: 1.7,
@@ -12821,14 +12918,17 @@ module.exports = {
         optmul: 1.2,
         power: 4.34,
         rating: "A",
-        recover: 3.2
+        recover: 3.2,
+        thermres: -.2
       }, {
         class: 5,
         cost: 63010,
         edID: 128064278,
         eddbID: 1131,
+        explres: .5,
         grp: "sg",
         id: "4e",
+        kinres: .4,
         mass: 20,
         maxmass: 1013,
         maxmul: 1.3,
@@ -12838,14 +12938,17 @@ module.exports = {
         optmul: .8,
         power: 1.56,
         rating: "E",
-        recover: 2.5
+        recover: 2.5,
+        thermres: -.2
       }, {
         class: 5,
         cost: 189040,
         edID: 128064279,
         eddbID: 1132,
+        explres: .5,
         grp: "sg",
         id: "4d",
+        kinres: .4,
         mass: 8,
         maxmass: 1013,
         maxmul: 1.4,
@@ -12855,14 +12958,17 @@ module.exports = {
         optmul: .9,
         power: 2.08,
         rating: "D",
-        recover: 2.5
+        recover: 2.5,
+        thermres: -.2
       }, {
         class: 5,
         cost: 567110,
         edID: 128064280,
         eddbID: 1133,
+        explres: .5,
         grp: "sg",
         id: "4c",
+        kinres: .4,
         mass: 20,
         maxmass: 1013,
         maxmul: 1.5,
@@ -12872,14 +12978,17 @@ module.exports = {
         optmul: 1,
         power: 2.6,
         rating: "C",
-        recover: 2.5
+        recover: 2.5,
+        thermres: -.2
       }, {
         class: 5,
         cost: 1701320,
         edID: 128064281,
         eddbID: 1134,
+        explres: .5,
         grp: "sg",
         id: "4b",
+        kinres: .4,
         mass: 32,
         maxmass: 1013,
         maxmul: 1.6,
@@ -12889,14 +12998,17 @@ module.exports = {
         optmul: 1.1,
         power: 3.12,
         rating: "B",
-        recover: 2.5
+        recover: 2.5,
+        thermres: -.2
       }, {
         class: 5,
         cost: 5103950,
         edID: 128064282,
         eddbID: 1135,
+        explres: .5,
         grp: "sg",
         id: "4a",
+        kinres: .4,
         mass: 20,
         maxmass: 1013,
         maxmul: 1.7,
@@ -12906,14 +13018,17 @@ module.exports = {
         optmul: 1.2,
         power: 3.64,
         rating: "A",
-        recover: 2.5
+        recover: 2.5,
+        thermres: -.2
       }, {
         class: 4,
         cost: 19880,
         edID: 128064273,
         eddbID: 1126,
+        explres: .5,
         grp: "sg",
         id: "49",
+        kinres: .4,
         mass: 10,
         maxmass: 713,
         maxmul: 1.3,
@@ -12923,14 +13038,17 @@ module.exports = {
         optmul: .8,
         power: 1.32,
         rating: "E",
-        recover: 1.9
+        recover: 1.9,
+        thermres: -.2
       }, {
         class: 4,
         cost: 59630,
         edID: 128064274,
         eddbID: 1127,
+        explres: .5,
         grp: "sg",
         id: "48",
+        kinres: .4,
         mass: 4,
         maxmass: 713,
         maxmul: 1.4,
@@ -12940,14 +13058,17 @@ module.exports = {
         optmul: .9,
         power: 1.76,
         rating: "D",
-        recover: 1.9
+        recover: 1.9,
+        thermres: -.2
       }, {
         class: 4,
         cost: 178900,
         edID: 128064275,
         eddbID: 1128,
+        explres: .5,
         grp: "sg",
         id: "47",
+        kinres: .4,
         mass: 10,
         maxmass: 713,
         maxmul: 1.5,
@@ -12957,14 +13078,17 @@ module.exports = {
         optmul: 1,
         power: 2.2,
         rating: "C",
-        recover: 1.9
+        recover: 1.9,
+        thermres: -.2
       }, {
         class: 4,
         cost: 536690,
         edID: 128064276,
         eddbID: 1129,
+        explres: .5,
         grp: "sg",
         id: "46",
+        kinres: .4,
         mass: 16,
         maxmass: 713,
         maxmul: 1.6,
@@ -12974,14 +13098,17 @@ module.exports = {
         optmul: 1.1,
         power: 2.64,
         rating: "B",
-        recover: 1.9
+        recover: 1.9,
+        thermres: -.2
       }, {
         class: 4,
         cost: 1610080,
         edID: 128064277,
         eddbID: 1130,
+        explres: .5,
         grp: "sg",
         id: "45",
+        kinres: .4,
         mass: 10,
         maxmass: 713,
         maxmul: 1.7,
@@ -12991,14 +13118,17 @@ module.exports = {
         optmul: 1.2,
         power: 3.08,
         rating: "A",
-        recover: 1.9
+        recover: 1.9,
+        thermres: -.2
       }, {
         class: 3,
         cost: 6270,
         edID: 128064268,
         eddbID: 1121,
+        explres: .5,
         grp: "sg",
         id: "44",
+        kinres: .4,
         mass: 5,
         maxmass: 413,
         maxmul: 1.3,
@@ -13008,14 +13138,17 @@ module.exports = {
         optmul: .8,
         power: 1.08,
         rating: "E",
-        recover: 1.6
+        recover: 1.6,
+        thermres: -.2
       }, {
         class: 3,
         cost: 18810,
         edID: 128064269,
         eddbID: 1122,
+        explres: .5,
         grp: "sg",
         id: "43",
+        kinres: .4,
         mass: 2,
         maxmass: 413,
         maxmul: 1.4,
@@ -13025,14 +13158,17 @@ module.exports = {
         optmul: .9,
         power: 1.44,
         rating: "D",
-        recover: 1.6
+        recover: 1.6,
+        thermres: -.2
       }, {
         class: 3,
         cost: 56440,
         edID: 128064270,
         eddbID: 1123,
+        explres: .5,
         grp: "sg",
         id: "42",
+        kinres: .4,
         mass: 5,
         maxmass: 413,
         maxmul: 1.5,
@@ -13042,14 +13178,17 @@ module.exports = {
         optmul: 1,
         power: 1.8,
         rating: "C",
-        recover: 1.6
+        recover: 1.6,
+        thermres: -.2
       }, {
         class: 3,
         cost: 169300,
         edID: 128064271,
         eddbID: 1124,
+        explres: .5,
         grp: "sg",
         id: "41",
+        kinres: .4,
         mass: 8,
         maxmass: 413,
         maxmul: 1.6,
@@ -13059,14 +13198,17 @@ module.exports = {
         optmul: 1.1,
         power: 2.16,
         rating: "B",
-        recover: 1.6
+        recover: 1.6,
+        thermres: -.2
       }, {
         class: 3,
         cost: 507910,
         edID: 128064272,
         eddbID: 1125,
+        explres: .5,
         grp: "sg",
         id: "40",
+        kinres: .4,
         mass: 5,
         maxmass: 413,
         maxmul: 1.7,
@@ -13076,14 +13218,17 @@ module.exports = {
         optmul: 1.2,
         power: 2.52,
         rating: "A",
-        recover: 1.6
+        recover: 1.6,
+        thermres: -.2
       }, {
         class: 2,
         cost: 1980,
         edID: 128064263,
         eddbID: 1116,
+        explres: .5,
         grp: "sg",
         id: "3v",
+        kinres: .4,
         mass: 2.5,
         maxmass: 138,
         maxmul: 1.3,
@@ -13093,14 +13238,17 @@ module.exports = {
         optmul: .8,
         power: .9,
         rating: "E",
-        recover: 1.6
+        recover: 1.6,
+        thermres: -.2
       }, {
         class: 2,
         cost: 5930,
         edID: 128064264,
         eddbID: 1117,
+        explres: .5,
         grp: "sg",
         id: "3u",
+        kinres: .4,
         mass: 1,
         maxmass: 138,
         maxmul: 1.4,
@@ -13110,14 +13258,17 @@ module.exports = {
         optmul: .9,
         power: 1.2,
         rating: "D",
-        recover: 1.6
+        recover: 1.6,
+        thermres: -.2
       }, {
         class: 2,
         cost: 17800,
         edID: 128064265,
         eddbID: 1118,
+        explres: .5,
         grp: "sg",
         id: "3t",
+        kinres: .4,
         mass: 2.5,
         maxmass: 138,
         maxmul: 1.5,
@@ -13127,14 +13278,17 @@ module.exports = {
         optmul: 1,
         power: 1.5,
         rating: "C",
-        recover: 1.6
+        recover: 1.6,
+        thermres: -.2
       }, {
         class: 2,
         cost: 53410,
         edID: 128064266,
         eddbID: 1119,
+        explres: .5,
         grp: "sg",
         id: "3s",
+        kinres: .4,
         mass: 4,
         maxmass: 138,
         maxmul: 1.6,
@@ -13144,14 +13298,17 @@ module.exports = {
         optmul: 1.1,
         power: 1.8,
         rating: "B",
-        recover: 1.6
+        recover: 1.6,
+        thermres: -.2
       }, {
         class: 2,
         cost: 160220,
         edID: 128064267,
         eddbID: 1120,
+        explres: .5,
         grp: "sg",
         id: "3r",
+        kinres: .4,
         mass: 2.5,
         maxmass: 138,
         maxmul: 1.7,
@@ -13161,14 +13318,17 @@ module.exports = {
         optmul: 1.2,
         power: 2.1,
         rating: "A",
-        recover: 1.6
+        recover: 1.6,
+        thermres: -.2
       }, {
         class: 1,
         cost: 88075,
         edID: 128064262,
         eddbID: 1551,
+        explres: .5,
         grp: "sg",
         id: "1x",
+        kinres: .4,
         mass: 1.3,
         maxmass: 63,
         maxmul: 1.7,
@@ -13178,12 +13338,322 @@ module.exports = {
         optmul: 1.2,
         power: 1.68,
         rating: "A",
-        recover: 1
+        recover: 1,
+        thermres: -.2
       } ]
     }
   },
   Modifications: {
-    modifiers: [ "ammo", "boot", "brokenregen", "burst", "clip", "damage", "distdraw", "duration", "eff", "engcap", "engrate", "explres", "facinglimit", "hullboost", "hullreinforcement", "integrity", "jitter", "kinres", "mass", "maxfuel", "optmass", "optmul", "pgen", "piercing", "power", "range", "ranget", "regen", "reload", "rof", "shield", "shieldboost", "spinup", "syscap", "sysrate", "thermload", "thermres", "wepcap", "weprate" ],
+    modifications: [ "ammo", "boot", "brokenregen", "burst", "clip", "damage", "distdraw", "duration", "eff", "engcap", "engrate", "explres", "facinglimit", "hullboost", "hullreinforcement", "integrity", "jitter", "kinres", "mass", "maxfuel", "optmass", "optmul", "pgen", "piercing", "power", "range", "ranget", "regen", "reload", "rof", "shield", "shieldboost", "spinup", "syscap", "sysrate", "thermload", "thermres", "wepcap", "weprate", "shieldreinforcement" ],
+    modifierActions: {
+      mod_boot_time: {
+        boot: 1
+      },
+      mod_defencemodifier_explosive_mult: {
+        explres: 1
+      },
+      mod_defencemodifier_global_hull_mult: {
+        explres: 1,
+        kinres: 1,
+        thermres: 1
+      },
+      mod_defencemodifier_global_shield_mult: {
+        explres: 1,
+        kinres: 1,
+        thermres: 1
+      },
+      mod_defencemodifier_health_add: {
+        hullreinforcement: 1
+      },
+      mod_defencemodifier_health_mult: {
+        hullboost: 1
+      },
+      mod_defencemodifier_kinetic_mult: {
+        kinres: 1
+      },
+      mod_defencemodifier_shield_explosive_mult: {
+        explres: 1
+      },
+      mod_defencemodifier_shield_kinetic_mult: {
+        kinres: 1
+      },
+      mod_defencemodifier_shield_mult: {
+        shieldboost: 1
+      },
+      mod_defencemodifier_shield_thermic_mult: {
+        thermres: 1
+      },
+      mod_defencemodifier_thermic_mult: {
+        thermres: 1
+      },
+      mod_engine_heat: {
+        thermload: 1
+      },
+      mod_engine_mass_curve: {
+        optmass: 1
+      },
+      mod_engine_mass_curve_multiplier: {
+        optmul: 1
+      },
+      mod_fsd_heat_rate: {
+        thermload: 1
+      },
+      mod_fsd_max_fuel_per_jump: {
+        maxfuel: 1
+      },
+      mod_fsd_optimised_mass: {
+        optmass: 1
+      },
+      mod_fsdinterdictor_facing_limit: {
+        facinglimit: 1
+      },
+      mod_fsdinterdictor_range: {
+        ranget: 1
+      },
+      mod_health: {
+        integrity: 1
+      },
+      mod_mass: {
+        mass: 1
+      },
+      mod_passive_power: {
+        power: 1
+      },
+      mod_powerdistributor_engine_charge: {
+        engcap: 1
+      },
+      mod_powerdistributor_engine_rate: {
+        engrate: 1
+      },
+      mod_powerdistributor_global_charge: {
+        engcap: 1,
+        syscap: 1,
+        wepcap: 1
+      },
+      mod_powerdistributor_global_rate: {
+        engrate: 1,
+        sysrate: 1,
+        weprate: 1
+      },
+      mod_powerdistributor_system_charge: {
+        syscap: 1
+      },
+      mod_powerdistributor_system_rate: {
+        sysrate: 1
+      },
+      mod_powerdistributor_weapon_charge: {
+        wepcap: 1
+      },
+      mod_powerdistributor_weapon_rate: {
+        weprate: 1
+      },
+      mod_powerplant_heat: {
+        eff: 1
+      },
+      mod_powerplant_power: {
+        pgen: 1
+      },
+      mod_shield_broken_regen: {
+        brokenregen: 1
+      },
+      mod_shield_energy_per_regen: {
+        distdraw: 1
+      },
+      mod_shield_explosive_mult: {
+        explres: 1
+      },
+      mod_shield_global_mult: {
+        explres: 1,
+        kinres: 1,
+        thermres: 1
+      },
+      mod_shield_kinetic_mult: {
+        kinres: 1
+      },
+      mod_shield_mass_curve: {
+        optmass: 1
+      },
+      mod_shield_mass_curve_multiplier: {
+        optmul: 1
+      },
+      mod_shield_normal_regen: {
+        regen: 1
+      },
+      mod_shield_thermal_mult: {
+        thermres: 1
+      },
+      mod_shieldcell_charge_heat: {
+        thermload: 1
+      },
+      mod_shieldcell_duration: {
+        duration: 1
+      },
+      mod_shieldcell_shield_units: {
+        shieldreinforcement: 1
+      },
+      mod_shieldcell_spin_up: {
+        spinup: 1
+      },
+      mod_weapon_active_heat: {
+        thermload: 1
+      },
+      mod_weapon_active_power: {
+        distdraw: 1
+      },
+      mod_weapon_ammo_capacity: {
+        ammo: 1
+      },
+      mod_weapon_burst_interval: {
+        rof: 1
+      },
+      mod_weapon_burst_rof: {},
+      mod_weapon_burst_size: {},
+      mod_weapon_clip_size: {
+        clip: 1
+      },
+      mod_weapon_damage: {
+        damage: 1
+      },
+      mod_weapon_hardness_piercing: {
+        piercing: 1
+      },
+      mod_weapon_jitter_radius: {
+        jitter: 1
+      },
+      mod_weapon_range: {
+        range: 1
+      },
+      mod_weapon_reload_time: {
+        reload: 1
+      },
+      special_auto_loader: {},
+      special_choke_canister: {},
+      special_corrosive_shell: {
+        ammo: -.2
+      },
+      special_dispersal_field: {
+        damage: -.1
+      },
+      special_distortion_field: {},
+      special_drag_munitions: {},
+      special_emissive_munitions: {
+        thermload: 1
+      },
+      special_feedback_cascade: {},
+      special_high_yield_shell: {},
+      special_incendiary_rounds: {
+        rof: .05263157894736842,
+        thermload: 2
+      },
+      special_overload_munitions: {
+        ammo: -.2
+      },
+      special_phasing_sequence: {},
+      special_radiant_canister: {
+        ammo: -.25
+      },
+      special_regeneration_sequence: {},
+      special_scramble_spectrum: {
+        rof: .1111111111111111
+      },
+      special_shiftlock_canister: {
+        damage: -.2
+      },
+      special_thermal_cascade: {},
+      special_thermal_conduit: {},
+      special_thermal_vent: {
+        thermload: .25
+      },
+      special_thermalshock: {
+        damage: -.25
+      },
+      trade_cell_heat_cell_units: {},
+      trade_defence_health_add_defence_global_mult: {},
+      trade_distributor_engine_charge_system_charge: {
+        engcap: 1,
+        syscap: -1
+      },
+      trade_distributor_global_charge_mass: {
+        engcap: .75,
+        mass: 1,
+        syscap: .75,
+        wepcap: .75
+      },
+      trade_engine_curve_mult_engine_heat: {
+        optmul: .4,
+        thermload: 1
+      },
+      trade_fsd_fuel_per_jump_fsd_heat: {
+        maxfuel: .5,
+        thermload: 1
+      },
+      trade_interdictor_range_facing_limit: {},
+      trade_mass_defence_health_add: {
+        hullreinforcement: -.75,
+        mass: -1
+      },
+      trade_mass_health: {
+        integrity: 1,
+        mass: .4
+      },
+      trade_passive_power_booster_global_mult: {
+        explres: .4,
+        kinres: .4,
+        power: -1,
+        thermres: .4
+      },
+      trade_passive_power_boot_time: {
+        boot: 1,
+        power: -.5
+      },
+      trade_passive_power_cell_spin_up: {},
+      trade_passive_power_distributor_global_rate: {
+        engrate: -1,
+        power: -1,
+        sysrate: -1,
+        weprate: -1
+      },
+      trade_passive_power_engine_curve: {
+        optmass: -.66,
+        power: -1
+      },
+      trade_passive_power_shield_global_mult: {
+        explres: .5,
+        kinres: .5,
+        power: -1,
+        thermres: .5
+      },
+      trade_passive_power_weapon_active: {
+        distdraw: -.6,
+        power: 1
+      },
+      trade_shield_curve_shield_curve_mult: {
+        optmass: -1,
+        optmul: -.8
+      },
+      trade_shield_global_mult_shield_broken_regen: {
+        brokenregen: -1,
+        explres: -.5,
+        kinres: -.5,
+        thermres: -.5
+      },
+      trade_shield_kinetic_shield_thermic: {
+        kinres: 1,
+        thermres: -1
+      },
+      trade_weapon_active_passive_power: {
+        distdraw: -.67,
+        power: 1
+      },
+      trade_weapon_damage_weapon_active_power: {
+        damage: .5,
+        distdraw: 1
+      },
+      trade_weapon_hardness_weapon_heat: {
+        piercing: .4,
+        thermload: 1
+      }
+    },
     validity: {
       am: [ "integrity", "power" ],
       bh: [ "explres", "hullboost", "kinres", "mass", "thermres" ],
@@ -13217,7 +13687,7 @@ module.exports = {
       rf: [ "integrity", "power" ],
       rg: [ "ammo", "clip", "damage", "distdraw", "integrity", "jitter", "mass", "piercing", "power", "range", "reload", "rof", "thermload" ],
       sb: [ "explres", "integrity", "kinres", "mass", "power", "shieldboost", "thermres" ],
-      scb: [ "boot", "duration", "integrity", "power", "shield", "spinup", "thermload" ],
+      scb: [ "boot", "duration", "integrity", "power", "shieldreinforcement", "spinup", "thermload" ],
       sg: [ "boot", "brokenregen", "distdraw", "explres", "integrity", "kinres", "mass", "optmass", "optmul", "power", "regen", "thermload", "thermres" ],
       t: [ "integrity", "mass", "optmass", "optmul", "power", "thermload" ],
       tp: [ "damage", "distdraw", "integrity", "jitter", "mass", "piercing", "power", "range", "rof", "thermload" ],
diff --git a/dist/index.json b/dist/index.json
index 77759d2..c2350b6 100644
--- a/dist/index.json
+++ b/dist/index.json
@@ -29,7 +29,7 @@
 					"mass": 0,
 					"explres": -0.4,
 					"kinres": -0.2,
-					"thermres": 0.2,
+					"thermres": 0,
 					"hullboost": 0.8
 				},
 				{
@@ -40,7 +40,7 @@
 					"cost": 35120,
 					"mass": 3,
 					"explres": -0.4,
-					"kinres": 0.2,
+					"kinres": -0.2,
 					"thermres": 0,
 					"hullboost": 1.52
 				},
@@ -52,7 +52,7 @@
 					"cost": 79030,
 					"mass": 5,
 					"explres": -0.4,
-					"kinres": 0.2,
+					"kinres": -0.2,
 					"thermres": 0,
 					"hullboost": 2.5
 				},
@@ -162,7 +162,7 @@
 					"mass": 0,
 					"explres": -0.4,
 					"kinres": -0.2,
-					"thermres": 0.2,
+					"thermres": 0,
 					"hullboost": 0.8
 				},
 				{
@@ -173,7 +173,7 @@
 					"cost": 58787780,
 					"mass": 30,
 					"explres": -0.4,
-					"kinres": 0.2,
+					"kinres": -0.2,
 					"thermres": 0,
 					"hullboost": 1.52
 				},
@@ -185,7 +185,7 @@
 					"cost": 132272510,
 					"mass": 60,
 					"explres": -0.4,
-					"kinres": 0.2,
+					"kinres": -0.2,
 					"thermres": 0,
 					"hullboost": 2.5
 				},
@@ -328,7 +328,7 @@
 					"mass": 0,
 					"explres": -0.4,
 					"kinres": -0.2,
-					"thermres": 0.2,
+					"thermres": 0,
 					"hullboost": 0.8
 				},
 				{
@@ -339,7 +339,7 @@
 					"cost": 2664460,
 					"mass": 21,
 					"explres": -0.4,
-					"kinres": 0.2,
+					"kinres": -0.2,
 					"thermres": 0,
 					"hullboost": 1.52
 				},
@@ -351,7 +351,7 @@
 					"cost": 5995040,
 					"mass": 42,
 					"explres": -0.4,
-					"kinres": 0.2,
+					"kinres": -0.2,
 					"thermres": 0,
 					"hullboost": 2.5
 				},
@@ -474,7 +474,7 @@
 					"mass": 0,
 					"explres": -0.4,
 					"kinres": -0.2,
-					"thermres": 0.2,
+					"thermres": 0,
 					"hullboost": 0.8
 				},
 				{
@@ -485,7 +485,7 @@
 					"cost": 1584460,
 					"mass": 21,
 					"explres": -0.4,
-					"kinres": 0.2,
+					"kinres": -0.2,
 					"thermres": 0,
 					"hullboost": 1.52
 				},
@@ -497,7 +497,7 @@
 					"cost": 3565040,
 					"mass": 42,
 					"explres": -0.4,
-					"kinres": 0.2,
+					"kinres": -0.2,
 					"thermres": 0,
 					"hullboost": 2.5
 				},
@@ -610,7 +610,7 @@
 					"mass": 0,
 					"explres": -0.4,
 					"kinres": -0.2,
-					"thermres": 0.2,
+					"thermres": 0,
 					"hullboost": 0.8
 				},
 				{
@@ -621,7 +621,7 @@
 					"cost": 33813120,
 					"mass": 83,
 					"explres": -0.4,
-					"kinres": 0.2,
+					"kinres": -0.2,
 					"thermres": 0,
 					"hullboost": 1.52
 				},
@@ -633,7 +633,7 @@
 					"cost": 76079500,
 					"mass": 165,
 					"explres": -0.4,
-					"kinres": 0.2,
+					"kinres": -0.2,
 					"thermres": 0,
 					"hullboost": 2.5
 				},
@@ -806,7 +806,7 @@
 					"mass": 0,
 					"explres": -0.4,
 					"kinres": -0.2,
-					"thermres": 0.2,
+					"thermres": 0,
 					"hullboost": 0.8
 				},
 				{
@@ -817,7 +817,7 @@
 					"cost": 151890,
 					"mass": 14,
 					"explres": -0.4,
-					"kinres": 0.2,
+					"kinres": -0.2,
 					"thermres": 0,
 					"hullboost": 1.52
 				},
@@ -829,7 +829,7 @@
 					"cost": 341750,
 					"mass": 27,
 					"explres": -0.4,
-					"kinres": 0.2,
+					"kinres": -0.2,
 					"thermres": 0,
 					"hullboost": 2.5
 				},
@@ -942,7 +942,7 @@
 					"mass": 0,
 					"explres": -0.4,
 					"kinres": -0.2,
-					"thermres": 0.2,
+					"thermres": 0,
 					"hullboost": 0.8
 				},
 				{
@@ -953,7 +953,7 @@
 					"cost": 305890,
 					"mass": 14,
 					"explres": -0.4,
-					"kinres": 0.2,
+					"kinres": -0.2,
 					"thermres": 0,
 					"hullboost": 1.52
 				},
@@ -965,7 +965,7 @@
 					"cost": 688250,
 					"mass": 27,
 					"explres": -0.4,
-					"kinres": 0.2,
+					"kinres": -0.2,
 					"thermres": 0,
 					"hullboost": 2.5
 				},
@@ -1084,7 +1084,7 @@
 					"mass": 0,
 					"explres": -0.4,
 					"kinres": -0.2,
-					"thermres": 0.2,
+					"thermres": 0,
 					"hullboost": 0.8
 				},
 				{
@@ -1095,7 +1095,7 @@
 					"cost": 800000,
 					"mass": 23,
 					"explres": -0.4,
-					"kinres": 0.2,
+					"kinres": -0.2,
 					"thermres": 0,
 					"hullboost": 1.52
 				},
@@ -1107,7 +1107,7 @@
 					"cost": 1800000,
 					"mass": 47,
 					"explres": -0.4,
-					"kinres": 0.2,
+					"kinres": -0.2,
 					"thermres": 0,
 					"hullboost": 2.5
 				},
@@ -1220,7 +1220,7 @@
 					"mass": 0,
 					"explres": -0.4,
 					"kinres": -0.2,
-					"thermres": 0.2,
+					"thermres": 0,
 					"hullboost": 0.8
 				},
 				{
@@ -1231,7 +1231,7 @@
 					"cost": 225700,
 					"mass": 13,
 					"explres": -0.4,
-					"kinres": 0.2,
+					"kinres": -0.2,
 					"thermres": 0,
 					"hullboost": 1.52
 				},
@@ -1243,7 +1243,7 @@
 					"cost": 507900,
 					"mass": 26,
 					"explres": -0.4,
-					"kinres": 0.2,
+					"kinres": -0.2,
 					"thermres": 0,
 					"hullboost": 2.5
 				},
@@ -1356,7 +1356,7 @@
 					"mass": 0,
 					"explres": -0.4,
 					"kinres": -0.2,
-					"thermres": 0.2,
+					"thermres": 0,
 					"hullboost": 0.8
 				},
 				{
@@ -1367,7 +1367,7 @@
 					"cost": 26880,
 					"mass": 4,
 					"explres": -0.4,
-					"kinres": 0.2,
+					"kinres": -0.2,
 					"thermres": 0,
 					"hullboost": 1.52
 				},
@@ -1379,7 +1379,7 @@
 					"cost": 90050,
 					"mass": 8,
 					"explres": -0.4,
-					"kinres": 0.2,
+					"kinres": -0.2,
 					"thermres": 0,
 					"hullboost": 2.5
 				},
@@ -1484,7 +1484,7 @@
 					"mass": 0,
 					"explres": -0.4,
 					"kinres": -0.2,
-					"thermres": 0.2,
+					"thermres": 0,
 					"hullboost": 0.8
 				},
 				{
@@ -1495,7 +1495,7 @@
 					"cost": 7925680,
 					"mass": 44,
 					"explres": -0.4,
-					"kinres": 0.2,
+					"kinres": -0.2,
 					"thermres": 0,
 					"hullboost": 1.52
 				},
@@ -1507,7 +1507,7 @@
 					"cost": 17832780,
 					"mass": 87,
 					"explres": -0.4,
-					"kinres": 0.2,
+					"kinres": -0.2,
 					"thermres": 0,
 					"hullboost": 2.5
 				},
@@ -1608,7 +1608,7 @@
 				"boostEnergy": 27,
 				"agility": 2,
 				"baseShieldStrength": 555,
-				"baseArmour": 666,
+				"baseArmour": 370,
 				"hullMass": 900,
 				"masslock": 24,
 				"pipSpeed": 0.125,
@@ -1625,7 +1625,7 @@
 					"mass": 0,
 					"explres": -0.4,
 					"kinres": -0.2,
-					"thermres": 0.2,
+					"thermres": 0,
 					"hullboost": 0.8
 				},
 				{
@@ -1636,7 +1636,7 @@
 					"cost": 75187790,
 					"mass": 30,
 					"explres": -0.4,
-					"kinres": 0.2,
+					"kinres": -0.2,
 					"thermres": 0,
 					"hullboost": 1.52
 				},
@@ -1648,7 +1648,7 @@
 					"cost": 169172510,
 					"mass": 60,
 					"explres": -0.4,
-					"kinres": 0.2,
+					"kinres": -0.2,
 					"thermres": 0,
 					"hullboost": 2.5
 				},
@@ -1787,7 +1787,7 @@
 					"mass": 0,
 					"explres": -0.4,
 					"kinres": -0.2,
-					"thermres": 0.2,
+					"thermres": 0,
 					"hullboost": 0.8
 				},
 				{
@@ -1798,7 +1798,7 @@
 					"cost": 5725680,
 					"mass": 44,
 					"explres": -0.4,
-					"kinres": 0.2,
+					"kinres": -0.2,
 					"thermres": 0,
 					"hullboost": 1.52
 				},
@@ -1810,7 +1810,7 @@
 					"cost": 12882780,
 					"mass": 87,
 					"explres": -0.4,
-					"kinres": 0.2,
+					"kinres": -0.2,
 					"thermres": 0,
 					"hullboost": 2.5
 				},
@@ -1932,7 +1932,7 @@
 					"mass": 0,
 					"explres": -0.4,
 					"kinres": -0.2,
-					"thermres": 0.2,
+					"thermres": 0,
 					"hullboost": 0.8
 				},
 				{
@@ -1943,7 +1943,7 @@
 					"cost": 14325690,
 					"mass": 44,
 					"explres": -0.4,
-					"kinres": 0.2,
+					"kinres": -0.2,
 					"thermres": 0,
 					"hullboost": 1.52
 				},
@@ -1955,7 +1955,7 @@
 					"cost": 32232790,
 					"mass": 87,
 					"explres": -0.4,
-					"kinres": 0.2,
+					"kinres": -0.2,
 					"thermres": 0,
 					"hullboost": 2.5
 				},
@@ -2076,7 +2076,7 @@
 					"mass": 0,
 					"explres": -0.4,
 					"kinres": -0.2,
-					"thermres": 0.2,
+					"thermres": 0,
 					"hullboost": 0.8
 				},
 				{
@@ -2087,7 +2087,7 @@
 					"cost": 20626820,
 					"mass": 19,
 					"explres": -0.4,
-					"kinres": 0.2,
+					"kinres": -0.2,
 					"thermres": 0,
 					"hullboost": 1.52
 				},
@@ -2099,7 +2099,7 @@
 					"cost": 46410340,
 					"mass": 38,
 					"explres": -0.4,
-					"kinres": 0.2,
+					"kinres": -0.2,
 					"thermres": 0,
 					"hullboost": 2.5
 				},
@@ -2220,7 +2220,7 @@
 					"mass": 0,
 					"explres": -0.4,
 					"kinres": -0.2,
-					"thermres": 0.2,
+					"thermres": 0,
 					"hullboost": 0.8
 				},
 				{
@@ -2231,7 +2231,7 @@
 					"cost": 42180,
 					"mass": 1,
 					"explres": -0.4,
-					"kinres": 0.2,
+					"kinres": -0.2,
 					"thermres": 0,
 					"hullboost": 1.52
 				},
@@ -2243,7 +2243,7 @@
 					"cost": 185050,
 					"mass": 2,
 					"explres": -0.4,
-					"kinres": 0.2,
+					"kinres": -0.2,
 					"thermres": 0,
 					"hullboost": 2.5
 				},
@@ -2346,7 +2346,7 @@
 					"mass": 0,
 					"explres": -0.4,
 					"kinres": -0.2,
-					"thermres": 0.2,
+					"thermres": 0,
 					"hullboost": 0.8
 				},
 				{
@@ -2357,7 +2357,7 @@
 					"cost": 8918340,
 					"mass": 30,
 					"explres": -0.4,
-					"kinres": 0.2,
+					"kinres": -0.2,
 					"thermres": 0,
 					"hullboost": 1.52
 				},
@@ -2369,7 +2369,7 @@
 					"cost": 20066270,
 					"mass": 60,
 					"explres": -0.4,
-					"kinres": 0.2,
+					"kinres": -0.2,
 					"thermres": 0,
 					"hullboost": 2.5
 				},
@@ -2490,7 +2490,7 @@
 					"mass": 0,
 					"explres": -0.4,
 					"kinres": -0.2,
-					"thermres": 0.2,
+					"thermres": 0,
 					"hullboost": 0.8
 				},
 				{
@@ -2501,7 +2501,7 @@
 					"cost": 1017200,
 					"mass": 4,
 					"explres": -0.4,
-					"kinres": 0.2,
+					"kinres": -0.2,
 					"thermres": 0,
 					"hullboost": 1.52
 				},
@@ -2513,7 +2513,7 @@
 					"cost": 2288600,
 					"mass": 8,
 					"explres": -0.4,
-					"kinres": 0.2,
+					"kinres": -0.2,
 					"thermres": 0,
 					"hullboost": 2.5
 				},
@@ -2629,7 +2629,7 @@
 					"mass": 0,
 					"explres": -0.4,
 					"kinres": -0.2,
-					"thermres": 0.2,
+					"thermres": 0,
 					"hullboost": 0.8
 				},
 				{
@@ -2640,7 +2640,7 @@
 					"cost": 83587790,
 					"mass": 30,
 					"explres": -0.4,
-					"kinres": 0.2,
+					"kinres": -0.2,
 					"thermres": 0,
 					"hullboost": 1.52
 				},
@@ -2652,7 +2652,7 @@
 					"cost": 188072510,
 					"mass": 60,
 					"explres": -0.4,
-					"kinres": 0.2,
+					"kinres": -0.2,
 					"thermres": 0,
 					"hullboost": 2.5
 				},
@@ -2789,7 +2789,7 @@
 					"mass": 0,
 					"explres": -0.4,
 					"kinres": -0.2,
-					"thermres": 0.2,
+					"thermres": 0,
 					"hullboost": 0.8
 				},
 				{
@@ -2800,7 +2800,7 @@
 					"cost": 66500,
 					"mass": 4,
 					"explres": -0.4,
-					"kinres": 0.2,
+					"kinres": -0.2,
 					"thermres": 0,
 					"hullboost": 1.52
 				},
@@ -2812,7 +2812,7 @@
 					"cost": 222760,
 					"mass": 8,
 					"explres": -0.4,
-					"kinres": 0.2,
+					"kinres": -0.2,
 					"thermres": 0,
 					"hullboost": 2.5
 				},
@@ -2918,7 +2918,7 @@
 					"mass": 0,
 					"explres": -0.4,
 					"kinres": -0.2,
-					"thermres": 0.2,
+					"thermres": 0,
 					"hullboost": 0.8
 				},
 				{
@@ -2929,7 +2929,7 @@
 					"cost": 1250460,
 					"mass": 12,
 					"explres": -0.4,
-					"kinres": 0.2,
+					"kinres": -0.2,
 					"thermres": 0,
 					"hullboost": 1.52
 				},
@@ -2941,7 +2941,7 @@
 					"cost": 2813540,
 					"mass": 23,
 					"explres": -0.4,
-					"kinres": 0.2,
+					"kinres": -0.2,
 					"thermres": 0,
 					"hullboost": 2.5
 				},
@@ -3057,7 +3057,7 @@
 					"mass": 0,
 					"explres": -0.4,
 					"kinres": -0.2,
-					"thermres": 0.2,
+					"thermres": 0,
 					"hullboost": 0.8
 				},
 				{
@@ -3068,7 +3068,7 @@
 					"cost": 19415950,
 					"mass": 21,
 					"explres": -0.4,
-					"kinres": 0.2,
+					"kinres": -0.2,
 					"thermres": 0,
 					"hullboost": 1.52
 				},
@@ -3080,7 +3080,7 @@
 					"cost": 43685900,
 					"mass": 87,
 					"explres": -0.4,
-					"kinres": 0.2,
+					"kinres": -0.2,
 					"thermres": 0,
 					"hullboost": 2.5
 				},
@@ -3219,7 +3219,7 @@
 					"mass": 0,
 					"explres": -0.4,
 					"kinres": -0.2,
-					"thermres": 0.2,
+					"thermres": 0,
 					"hullboost": 0.8
 				},
 				{
@@ -3230,7 +3230,7 @@
 					"cost": 22791270,
 					"mass": 26,
 					"explres": -0.4,
-					"kinres": 0.2,
+					"kinres": -0.2,
 					"thermres": 0,
 					"hullboost": 1.52
 				},
@@ -3242,7 +3242,7 @@
 					"cost": 51280360,
 					"mass": 53,
 					"explres": -0.4,
-					"kinres": 0.2,
+					"kinres": -0.2,
 					"thermres": 0,
 					"hullboost": 2.5
 				},
@@ -3367,7 +3367,7 @@
 					"mass": 0,
 					"explres": -0.4,
 					"kinres": -0.2,
-					"thermres": 0.2,
+					"thermres": 0,
 					"hullboost": 0.8
 				},
 				{
@@ -3378,7 +3378,7 @@
 					"cost": 25600,
 					"mass": 2,
 					"explres": -0.4,
-					"kinres": 0.2,
+					"kinres": -0.2,
 					"thermres": 0,
 					"hullboost": 1.52
 				},
@@ -3390,7 +3390,7 @@
 					"cost": 80320,
 					"mass": 4,
 					"explres": -0.4,
-					"kinres": 0.2,
+					"kinres": -0.2,
 					"thermres": 0,
 					"hullboost": 2.5
 				},
@@ -3495,7 +3495,7 @@
 					"mass": 0,
 					"explres": -0.4,
 					"kinres": -0.2,
-					"thermres": 0.2,
+					"thermres": 0,
 					"hullboost": 0.8
 				},
 				{
@@ -3506,7 +3506,7 @@
 					"cost": 418380,
 					"mass": 12,
 					"explres": -0.4,
-					"kinres": 0.2,
+					"kinres": -0.2,
 					"thermres": 0,
 					"hullboost": 1.52
 				},
@@ -3518,7 +3518,7 @@
 					"cost": 941350,
 					"mass": 23,
 					"explres": -0.4,
-					"kinres": 0.2,
+					"kinres": -0.2,
 					"thermres": 0,
 					"hullboost": 2.5
 				},
@@ -3631,7 +3631,7 @@
 					"mass": 0,
 					"explres": -0.4,
 					"kinres": -0.2,
-					"thermres": 0.2,
+					"thermres": 0,
 					"hullboost": 0.8
 				},
 				{
@@ -3642,7 +3642,7 @@
 					"cost": 6988900,
 					"mass": 32,
 					"explres": -0.4,
-					"kinres": 0.2,
+					"kinres": -0.2,
 					"thermres": 0,
 					"hullboost": 1.52
 				},
@@ -3654,7 +3654,7 @@
 					"cost": 15725030,
 					"mass": 63,
 					"explres": -0.4,
-					"kinres": 0.2,
+					"kinres": -0.2,
 					"thermres": 0,
 					"hullboost": 2.5
 				},
@@ -3776,7 +3776,7 @@
 					"mass": 0,
 					"explres": -0.4,
 					"kinres": -0.2,
-					"thermres": 0.2,
+					"thermres": 0,
 					"hullboost": 0.8
 				},
 				{
@@ -3787,7 +3787,7 @@
 					"cost": 30622340,
 					"mass": 75,
 					"explres": -0.4,
-					"kinres": 0.2,
+					"kinres": -0.2,
 					"thermres": 0,
 					"hullboost": 1.52
 				},
@@ -3799,7 +3799,7 @@
 					"cost": 68900260,
 					"mass": 150,
 					"explres": -0.4,
-					"kinres": 0.2,
+					"kinres": -0.2,
 					"thermres": 0,
 					"hullboost": 2.5
 				},
@@ -3924,7 +3924,7 @@
 					"mass": 0,
 					"explres": -0.4,
 					"kinres": -0.2,
-					"thermres": 0.2,
+					"thermres": 0,
 					"hullboost": 0.8
 				},
 				{
@@ -3935,7 +3935,7 @@
 					"cost": 57170,
 					"mass": 5,
 					"explres": -0.4,
-					"kinres": 0.2,
+					"kinres": -0.2,
 					"thermres": 0,
 					"hullboost": 1.52
 				},
@@ -3947,7 +3947,7 @@
 					"cost": 128640,
 					"mass": 9,
 					"explres": -0.4,
-					"kinres": 0.2,
+					"kinres": -0.2,
 					"thermres": 0,
 					"hullboost": 2.5
 				},
@@ -4056,7 +4056,7 @@
 					"mass": 0,
 					"explres": -0.4,
 					"kinres": -0.2,
-					"thermres": 0.2,
+					"thermres": 0,
 					"hullboost": 0.8
 				},
 				{
@@ -4067,7 +4067,7 @@
 					"cost": 175180,
 					"mass": 5,
 					"explres": -0.4,
-					"kinres": 0.2,
+					"kinres": -0.2,
 					"thermres": 0,
 					"hullboost": 1.52
 				},
@@ -4079,7 +4079,7 @@
 					"cost": 394140,
 					"mass": 9,
 					"explres": -0.4,
-					"kinres": 0.2,
+					"kinres": -0.2,
 					"thermres": 0,
 					"hullboost": 2.5
 				},
@@ -4192,7 +4192,7 @@
 					"mass": 0,
 					"explres": -0.4,
 					"kinres": -0.2,
-					"thermres": 0.2,
+					"thermres": 0,
 					"hullboost": 0.8
 				},
 				{
@@ -4203,7 +4203,7 @@
 					"cost": 1970250,
 					"mass": 17,
 					"explres": -0.4,
-					"kinres": 0.2,
+					"kinres": -0.2,
 					"thermres": 0,
 					"hullboost": 1.52
 				},
@@ -4215,7 +4215,7 @@
 					"cost": 4433050,
 					"mass": 35,
 					"explres": -0.4,
-					"kinres": 0.2,
+					"kinres": -0.2,
 					"thermres": 0,
 					"hullboost": 2.5
 				},
@@ -4876,7 +4876,7 @@
 					"integrity": 105,
 					"mass": 32,
 					"maxmass": 2430,
-					"maxmul": 1.86,
+					"maxmul": 1.06,
 					"minmass": 810,
 					"minmul": 0.86,
 					"optmass": 1620,
@@ -8247,14 +8247,14 @@
 					"type": "T"
 				},
 				{
-					"breachdmg": 15.25,
+					"breachdmg": 1.5,
 					"breachmax": 0,
 					"breachmin": 0,
-					"burst": 8,
-					"burstrof": 20,
+					"burst": 3,
+					"burstrof": 15,
 					"class": 1,
 					"cost": 8800,
-					"damage": 18,
+					"damage": 2.4,
 					"distdraw": 0.4,
 					"edID": 128671449,
 					"eddbID": 1477,
@@ -10503,6 +10503,7 @@
 			"ch": [
 				{
 					"ammo": 10,
+					"ammocost": 100,
 					"class": 0,
 					"clip": 1,
 					"cost": 8500,
@@ -10547,6 +10548,7 @@
 			"hs": [
 				{
 					"ammo": 2,
+					"ammocost": 25,
 					"class": 0,
 					"clip": 1,
 					"cost": 3500,
@@ -11125,8 +11127,10 @@
 					"cost": 7710,
 					"edID": 128671331,
 					"eddbID": 1530,
+					"explres": 0.5,
 					"grp": "bsg",
 					"id": "B6",
+					"kinres": 0.4,
 					"mass": 1.3,
 					"maxmass": 63,
 					"maxmul": 1.4,
@@ -11136,15 +11140,18 @@
 					"optmul": 0.9,
 					"power": 1.2,
 					"rating": "C",
-					"recover": 2.4
+					"recover": 2.4,
+					"thermres": -0.2
 				},
 				{
 					"class": 2,
 					"cost": 26710,
 					"edID": 128671332,
 					"eddbID": 1531,
+					"explres": 0.5,
 					"grp": "bsg",
 					"id": "B5",
+					"kinres": 0.4,
 					"mass": 2.5,
 					"maxmass": 138,
 					"maxmul": 1.4,
@@ -11154,15 +11161,18 @@
 					"optmul": 0.9,
 					"power": 1.5,
 					"rating": "C",
-					"recover": 2.4
+					"recover": 2.4,
+					"thermres": -0.2
 				},
 				{
 					"class": 3,
 					"cost": 84650,
 					"edID": 128671333,
 					"eddbID": 1532,
+					"explres": 0.5,
 					"grp": "bsg",
 					"id": "B4",
+					"kinres": 0.4,
 					"mass": 5,
 					"maxmass": 413,
 					"maxmul": 1.4,
@@ -11172,15 +11182,18 @@
 					"optmul": 0.9,
 					"power": 1.8,
 					"rating": "C",
-					"recover": 2.4
+					"recover": 2.4,
+					"thermres": -0.2
 				},
 				{
 					"class": 4,
 					"cost": 268350,
 					"edID": 128671334,
 					"eddbID": 1533,
+					"explres": 0.5,
 					"grp": "bsg",
 					"id": "B3",
+					"kinres": 0.4,
 					"mass": 10,
 					"maxmass": 713,
 					"maxmul": 1.4,
@@ -11190,15 +11203,18 @@
 					"optmul": 0.9,
 					"power": 2.2,
 					"rating": "C",
-					"recover": 2.85
+					"recover": 2.85,
+					"thermres": -0.2
 				},
 				{
 					"class": 5,
 					"cost": 850660,
 					"edID": 128671335,
 					"eddbID": 1534,
+					"explres": 0.5,
 					"grp": "bsg",
 					"id": "B2",
+					"kinres": 0.4,
 					"mass": 20,
 					"maxmass": 1013,
 					"maxmul": 1.4,
@@ -11208,15 +11224,18 @@
 					"optmul": 0.9,
 					"power": 2.6,
 					"rating": "C",
-					"recover": 3.75
+					"recover": 3.75,
+					"thermres": -0.2
 				},
 				{
 					"class": 6,
 					"cost": 2696600,
 					"edID": 128671336,
 					"eddbID": 1535,
+					"explres": 0.5,
 					"grp": "bsg",
 					"id": "B1",
+					"kinres": 0.4,
 					"mass": 40,
 					"maxmass": 1350,
 					"maxmul": 1.4,
@@ -11226,15 +11245,18 @@
 					"optmul": 0.9,
 					"power": 3.1,
 					"rating": "C",
-					"recover": 4.8
+					"recover": 4.8,
+					"thermres": -0.2
 				},
 				{
 					"class": 7,
 					"cost": 8548200,
 					"edID": 128671337,
 					"eddbID": 1536,
+					"explres": 0.5,
 					"grp": "bsg",
 					"id": "B0",
+					"kinres": 0.4,
 					"mass": 80,
 					"maxmass": 2650,
 					"maxmul": 1.4,
@@ -11244,15 +11266,18 @@
 					"optmul": 0.9,
 					"power": 3.5,
 					"rating": "C",
-					"recover": 6
+					"recover": 6,
+					"thermres": -0.2
 				},
 				{
 					"class": 8,
 					"cost": 27097750,
 					"edID": 128671338,
 					"eddbID": 1537,
+					"explres": 0.5,
 					"grp": "bsg",
 					"id": "B7",
+					"kinres": 0.4,
 					"mass": 160,
 					"maxmass": 4500,
 					"maxmul": 1.4,
@@ -11262,7 +11287,8 @@
 					"optmul": 0.9,
 					"power": 4,
 					"rating": "C",
-					"recover": 7.2
+					"recover": 7.2,
+					"thermres": -0.2
 				}
 			],
 			"cr": [
@@ -11671,6 +11697,7 @@
 					"cost": 575660,
 					"edID": 128727930,
 					"eddbID": 1560,
+					"fightercost": 1030,
 					"grp": "fh",
 					"id": "fh",
 					"mass": 60,
@@ -11684,6 +11711,7 @@
 					"cost": 1869350,
 					"edID": 128727931,
 					"eddbID": 1561,
+					"fightercost": 1030,
 					"grp": "fh",
 					"id": "fm",
 					"mass": 40,
@@ -11697,6 +11725,7 @@
 					"cost": 2369330,
 					"edID": 128727932,
 					"eddbID": 1562,
+					"fightercost": 1030,
 					"grp": "fh",
 					"id": "fr",
 					"mass": 20,
@@ -13062,13 +13091,13 @@
 					"cost": 150000,
 					"edID": 128668545,
 					"eddbID": 1381,
-					"explres": 2.5,
+					"explres": 0.025,
 					"grp": "hr",
 					"id": "2e",
-					"kinres": 2.5,
+					"kinres": 0.025,
 					"mass": 64,
 					"rating": "E",
-					"thermres": 2.5
+					"thermres": 0.025
 				},
 				{
 					"hullreinforcement": 390,
@@ -13076,13 +13105,13 @@
 					"cost": 450000,
 					"edID": 128668546,
 					"eddbID": 1382,
-					"explres": 2.5,
+					"explres": 0.025,
 					"grp": "hr",
 					"id": "2d",
-					"kinres": 2.5,
+					"kinres": 0.025,
 					"mass": 32,
 					"rating": "D",
-					"thermres": 2.5
+					"thermres": 0.025
 				},
 				{
 					"hullreinforcement": 300,
@@ -13090,13 +13119,13 @@
 					"cost": 65000,
 					"edID": 128668543,
 					"eddbID": 1379,
-					"explres": 2,
+					"explres": 0.2,
 					"grp": "hr",
 					"id": "2c",
-					"kinres": 2,
+					"kinres": 0.2,
 					"mass": 32,
 					"rating": "E",
-					"thermres": 2
+					"thermres": 0.2
 				},
 				{
 					"hullreinforcement": 330,
@@ -13104,13 +13133,13 @@
 					"cost": 195000,
 					"edID": 128668544,
 					"eddbID": 1380,
-					"explres": 2,
+					"explres": 0.2,
 					"grp": "hr",
 					"id": "2b",
-					"kinres": 2,
+					"kinres": 0.2,
 					"mass": 16,
 					"rating": "D",
-					"thermres": 2
+					"thermres": 0.2
 				},
 				{
 					"hullreinforcement": 230,
@@ -13118,13 +13147,13 @@
 					"cost": 28000,
 					"edID": 128668541,
 					"eddbID": 1377,
-					"explres": 1.5,
+					"explres": 0.015,
 					"grp": "hr",
 					"id": "2a",
-					"kinres": 1.5,
+					"kinres": 0.015,
 					"mass": 16,
 					"rating": "E",
-					"thermres": 1.5
+					"thermres": 0.015
 				},
 				{
 					"hullreinforcement": 260,
@@ -13132,13 +13161,13 @@
 					"cost": 84000,
 					"edID": 128668542,
 					"eddbID": 1378,
-					"explres": 1.5,
+					"explres": 0.015,
 					"grp": "hr",
 					"id": "29",
-					"kinres": 1.5,
+					"kinres": 0.015,
 					"mass": 8,
 					"rating": "D",
-					"thermres": 1.5
+					"thermres": 0.015
 				},
 				{
 					"hullreinforcement": 150,
@@ -13146,13 +13175,13 @@
 					"cost": 12000,
 					"edID": 128668539,
 					"eddbID": 1375,
-					"explres": 1,
+					"explres": 0.01,
 					"grp": "hr",
 					"id": "28",
-					"kinres": 1,
+					"kinres": 0.01,
 					"mass": 8,
 					"rating": "E",
-					"thermres": 1
+					"thermres": 0.01
 				},
 				{
 					"hullreinforcement": 190,
@@ -13160,13 +13189,13 @@
 					"cost": 36000,
 					"edID": 128668540,
 					"eddbID": 1376,
-					"explres": 1,
+					"explres": 0.01,
 					"grp": "hr",
 					"id": "27",
-					"kinres": 1,
+					"kinres": 0.01,
 					"mass": 4,
 					"rating": "D",
-					"themres": 1
+					"thermres": 0.01
 				},
 				{
 					"hullreinforcement": 80,
@@ -13174,13 +13203,13 @@
 					"cost": 5000,
 					"edID": 128668537,
 					"eddbID": 1373,
-					"explres": 0.5,
+					"explres": 0.005,
 					"grp": "hr",
 					"id": "26",
-					"kinres": 0.5,
+					"kinres": 0.005,
 					"mass": 4,
 					"rating": "E",
-					"thermres": 0.5
+					"thermres": 0.005
 				},
 				{
 					"hullreinforcement": 110,
@@ -13188,13 +13217,13 @@
 					"cost": 15000,
 					"edID": 128668538,
 					"eddbID": 1374,
-					"explres": 0.5,
+					"explres": 0.005,
 					"grp": "hr",
 					"id": "25",
-					"kinres": 0.5,
+					"kinres": 0.005,
 					"mass": 2,
 					"rating": "D",
-					"thermres": 0.5
+					"thermres": 0.005
 				}
 			],
 			"pv": [
@@ -13277,8 +13306,10 @@
 					"cost": 132200,
 					"edID": 128671323,
 					"eddbID": 1485,
+					"explres": 0.5,
 					"grp": "psg",
 					"id": "p6",
+					"kinres": 0.4,
 					"mass": 2.5,
 					"maxmass": 63,
 					"maxmul": 2,
@@ -13289,15 +13320,18 @@
 					"power": 2.52,
 					"pp": "Aisling Duval",
 					"rating": "A",
-					"recover": 1.2
+					"recover": 1.2,
+					"thermres": -0.2
 				},
 				{
 					"class": 2,
 					"cost": 240340,
 					"edID": 128671324,
 					"eddbID": 1486,
+					"explres": 0.5,
 					"grp": "psg",
 					"id": "p5",
+					"kinres": 0.4,
 					"mass": 5,
 					"maxmass": 138,
 					"maxmul": 2,
@@ -13308,15 +13342,18 @@
 					"power": 3.15,
 					"pp": "Aisling Duval",
 					"rating": "A",
-					"recover": 1.2
+					"recover": 1.2,
+					"thermres": -0.2
 				},
 				{
 					"class": 3,
 					"cost": 761870,
 					"edID": 128671325,
 					"eddbID": 1487,
+					"explres": 0.5,
 					"grp": "psg",
 					"id": "p4",
+					"kinres": 0.4,
 					"mass": 10,
 					"maxmass": 413,
 					"maxmul": 2,
@@ -13327,15 +13364,18 @@
 					"power": 3.78,
 					"pp": "Aisling Duval",
 					"rating": "A",
-					"recover": 1.2
+					"recover": 1.2,
+					"thermres": -0.2
 				},
 				{
 					"class": 4,
 					"cost": 2415120,
 					"edID": 128671326,
 					"eddbID": 1488,
+					"explres": 0.5,
 					"grp": "psg",
 					"id": "p3",
+					"kinres": 0.4,
 					"mass": 20,
 					"maxmass": 713,
 					"maxmul": 2,
@@ -13346,15 +13386,18 @@
 					"power": 4.62,
 					"pp": "Aisling Duval",
 					"rating": "A",
-					"recover": 1.425
+					"recover": 1.425,
+					"thermres": -0.2
 				},
 				{
 					"class": 5,
 					"cost": 7655930,
 					"edID": 128671327,
 					"eddbID": 1489,
+					"explres": 0.5,
 					"grp": "psg",
 					"id": "p2",
+					"kinres": 0.4,
 					"mass": 40,
 					"maxmass": 1013,
 					"maxmul": 2,
@@ -13365,15 +13408,18 @@
 					"power": 5.46,
 					"pp": "Aisling Duval",
 					"rating": "A",
-					"recover": 1.875
+					"recover": 1.875,
+					"thermres": -0.2
 				},
 				{
 					"class": 6,
 					"cost": 24269300,
 					"edID": 128671328,
 					"eddbID": 1490,
+					"explres": 0.5,
 					"grp": "psg",
 					"id": "p1",
+					"kinres": 0.4,
 					"mass": 80,
 					"maxmass": 1350,
 					"maxmul": 2,
@@ -13384,15 +13430,18 @@
 					"power": 6.51,
 					"pp": "Aisling Duval",
 					"rating": "A",
-					"recover": 2.4
+					"recover": 2.4,
+					"thermres": -0.2
 				},
 				{
 					"class": 7,
 					"cost": 76933670,
 					"edID": 128671329,
 					"eddbID": 1491,
+					"explres": 0.5,
 					"grp": "psg",
 					"id": "p0",
+					"kinres": 0.4,
 					"mass": 160,
 					"maxmass": 2650,
 					"maxmul": 2,
@@ -13403,15 +13452,18 @@
 					"power": 7.35,
 					"pp": "Aisling Duval",
 					"rating": "A",
-					"recover": 3
+					"recover": 3,
+					"thermres": -0.2
 				},
 				{
 					"class": 8,
 					"cost": 243879730,
 					"edID": 128671330,
 					"eddbID": 1492,
+					"explres": 0.5,
 					"grp": "psg",
 					"id": "p7",
+					"kinres": 0.4,
 					"mass": 320,
 					"maxmass": 4500,
 					"maxmul": 2,
@@ -13422,7 +13474,8 @@
 					"power": 8.4,
 					"pp": "Aisling Duval",
 					"rating": "A",
-					"recover": 3.6
+					"recover": 3.6,
+					"thermres": -0.2
 				}
 			],
 			"pc": [
@@ -14140,7 +14193,7 @@
 					"mass": 160,
 					"power": 1.44,
 					"rating": "E",
-					"recharge": 476,
+					"shieldreinforcement": 476,
 					"rechargerating": "C",
 					"spinup": 5,
 					"thermload": 800
@@ -14160,7 +14213,7 @@
 					"mass": 64,
 					"power": 1.92,
 					"rating": "D",
-					"recharge": 629,
+					"shieldreinforcement": 629,
 					"rechargerating": "D",
 					"spinup": 5,
 					"thermload": 800
@@ -14180,7 +14233,7 @@
 					"mass": 160,
 					"power": 2.4,
 					"rating": "C",
-					"recharge": 799,
+					"shieldreinforcement": 799,
 					"rechargerating": "C",
 					"spinup": 5,
 					"thermload": 800
@@ -14200,7 +14253,7 @@
 					"mass": 256,
 					"power": 2.88,
 					"rating": "B",
-					"recharge": 952,
+					"shieldreinforcement": 952,
 					"rechargerating": "B",
 					"spinup": 5,
 					"thermload": 800
@@ -14220,7 +14273,7 @@
 					"mass": 160,
 					"power": 3.36,
 					"rating": "A",
-					"recharge": 1105,
+					"shieldreinforcement": 1105,
 					"rechargerating": "A",
 					"spinup": 5,
 					"thermload": 800
@@ -14240,7 +14293,7 @@
 					"mass": 80,
 					"power": 1.24,
 					"rating": "E",
-					"recharge": 264,
+					"shieldreinforcement": 264,
 					"rechargerating": "E",
 					"spinup": 5,
 					"thermload": 720
@@ -14260,7 +14313,7 @@
 					"mass": 32,
 					"power": 1.66,
 					"rating": "D",
-					"recharge": 352,
+					"shieldreinforcement": 352,
 					"rechargerating": "D",
 					"spinup": 5,
 					"thermload": 720
@@ -14280,7 +14333,7 @@
 					"mass": 80,
 					"power": 2.07,
 					"rating": "C",
-					"recharge": 451,
+					"shieldreinforcement": 451,
 					"rechargerating": "C",
 					"spinup": 5,
 					"thermload": 720
@@ -14300,7 +14353,7 @@
 					"mass": 128,
 					"power": 2.48,
 					"rating": "B",
-					"recharge": 539,
+					"shieldreinforcement": 539,
 					"rechargerating": "B",
 					"spinup": 5,
 					"thermload": 720
@@ -14320,7 +14373,7 @@
 					"mass": 80,
 					"power": 2.9,
 					"rating": "A",
-					"recharge": 627,
+					"shieldreinforcement": 627,
 					"rechargerating": "A",
 					"spinup": 5,
 					"thermload": 720
@@ -14340,7 +14393,7 @@
 					"mass": 40,
 					"power": 1.06,
 					"rating": "E",
-					"recharge": 160,
+					"shieldreinforcement": 160,
 					"rechargerating": "E",
 					"spinup": 5,
 					"thermload": 640
@@ -14360,7 +14413,7 @@
 					"mass": 16,
 					"power": 1.42,
 					"rating": "D",
-					"recharge": 208,
+					"shieldreinforcement": 208,
 					"rechargerating": "D",
 					"spinup": 5,
 					"thermload": 640
@@ -14380,7 +14433,7 @@
 					"mass": 40,
 					"power": 1.77,
 					"rating": "C",
-					"recharge": 264,
+					"shieldreinforcement": 264,
 					"rechargerating": "C",
 					"spinup": 5,
 					"thermload": 640
@@ -14400,7 +14453,7 @@
 					"mass": 64,
 					"power": 2.12,
 					"rating": "B",
-					"recharge": 312,
+					"shieldreinforcement": 312,
 					"rechargerating": "B",
 					"spinup": 5,
 					"thermload": 640
@@ -14420,7 +14473,7 @@
 					"mass": 40,
 					"power": 2.48,
 					"rating": "A",
-					"recharge": 368,
+					"shieldreinforcement": 368,
 					"rechargerating": "A",
 					"spinup": 5,
 					"thermload": 640
@@ -14440,7 +14493,7 @@
 					"mass": 20,
 					"power": 0.9,
 					"rating": "E",
-					"recharge": 105,
+					"shieldreinforcement": 105,
 					"rechargerating": "E",
 					"spinup": 5,
 					"thermload": 540
@@ -14460,7 +14513,7 @@
 					"mass": 8,
 					"power": 1.2,
 					"rating": "D",
-					"recharge": 140,
+					"shieldreinforcement": 140,
 					"rechargerating": "D",
 					"spinup": 5,
 					"thermload": 540
@@ -14480,7 +14533,7 @@
 					"mass": 20,
 					"power": 1.5,
 					"rating": "C",
-					"recharge": 175,
+					"shieldreinforcement": 175,
 					"rechargerating": "C",
 					"spinup": 5,
 					"thermload": 540
@@ -14500,7 +14553,7 @@
 					"mass": 32,
 					"power": 1.8,
 					"rating": "B",
-					"recharge": 205,
+					"shieldreinforcement": 205,
 					"rechargerating": "B",
 					"spinup": 5,
 					"thermload": 540
@@ -14520,7 +14573,7 @@
 					"mass": 20,
 					"power": 2.1,
 					"rating": "A",
-					"recharge": 240,
+					"shieldreinforcement": 240,
 					"rechargerating": "A",
 					"spinup": 5,
 					"thermload": 540
@@ -14540,7 +14593,7 @@
 					"mass": 10,
 					"power": 0.74,
 					"rating": "E",
-					"recharge": 60,
+					"shieldreinforcement": 60,
 					"rechargerating": "E",
 					"spinup": 5,
 					"thermload": 410
@@ -14560,7 +14613,7 @@
 					"mass": 4,
 					"power": 0.98,
 					"rating": "D",
-					"recharge": 78,
+					"shieldreinforcement": 78,
 					"rechargerating": "D",
 					"spinup": 5,
 					"thermload": 410
@@ -14580,7 +14633,7 @@
 					"mass": 10,
 					"power": 1.23,
 					"rating": "C",
-					"recharge": 99,
+					"shieldreinforcement": 99,
 					"rechargerating": "C",
 					"spinup": 5,
 					"thermload": 410
@@ -14600,7 +14653,7 @@
 					"mass": 16,
 					"power": 1.48,
 					"rating": "B",
-					"recharge": 117,
+					"shieldreinforcement": 117,
 					"rechargerating": "B",
 					"spinup": 5,
 					"thermload": 410
@@ -14620,7 +14673,7 @@
 					"mass": 10,
 					"power": 1.72,
 					"rating": "A",
-					"recharge": 138,
+					"shieldreinforcement": 138,
 					"rechargerating": "A",
 					"spinup": 5,
 					"thermload": 410
@@ -14640,7 +14693,7 @@
 					"mass": 5,
 					"power": 0.61,
 					"rating": "E",
-					"recharge": 34,
+					"shieldreinforcement": 34,
 					"rechargerating": "E",
 					"spinup": 5,
 					"thermload": 340
@@ -14660,7 +14713,7 @@
 					"mass": 2,
 					"power": 0.82,
 					"rating": "D",
-					"recharge": 46,
+					"shieldreinforcement": 46,
 					"rechargerating": "D",
 					"spinup": 5,
 					"thermload": 340
@@ -14680,7 +14733,7 @@
 					"mass": 5,
 					"power": 1.02,
 					"rating": "C",
-					"recharge": 58,
+					"shieldreinforcement": 58,
 					"rechargerating": "C",
 					"spinup": 5,
 					"thermload": 340
@@ -14700,7 +14753,7 @@
 					"mass": 8,
 					"power": 1.22,
 					"rating": "B",
-					"recharge": 70,
+					"shieldreinforcement": 70,
 					"rechargerating": "B",
 					"spinup": 5,
 					"thermload": 340
@@ -14720,7 +14773,7 @@
 					"mass": 5,
 					"power": 1.43,
 					"rating": "A",
-					"recharge": 82,
+					"shieldreinforcement": 82,
 					"rechargerating": "A",
 					"spinup": 5,
 					"thermload": 340
@@ -14740,7 +14793,7 @@
 					"mass": 2.5,
 					"power": 0.5,
 					"rating": "E",
-					"recharge": 28,
+					"shieldreinforcement": 28,
 					"rechargerating": "E",
 					"spinup": 5,
 					"thermload": 240
@@ -14760,7 +14813,7 @@
 					"mass": 1,
 					"power": 0.67,
 					"rating": "D",
-					"recharge": 36,
+					"shieldreinforcement": 36,
 					"rechargerating": "D",
 					"spinup": 5,
 					"thermload": 240
@@ -14780,7 +14833,7 @@
 					"mass": 2.5,
 					"power": 0.84,
 					"rating": "C",
-					"recharge": 46,
+					"shieldreinforcement": 46,
 					"rechargerating": "C",
 					"spinup": 5,
 					"thermload": 240
@@ -14800,7 +14853,7 @@
 					"mass": 4,
 					"power": 1.01,
 					"rating": "B",
-					"recharge": 56,
+					"shieldreinforcement": 56,
 					"rechargerating": "B",
 					"spinup": 5,
 					"thermload": 240
@@ -14820,7 +14873,7 @@
 					"mass": 2.5,
 					"power": 1.18,
 					"rating": "A",
-					"recharge": 64,
+					"shieldreinforcement": 64,
 					"rechargerating": "A",
 					"spinup": 5,
 					"thermload": 240
@@ -14840,7 +14893,7 @@
 					"mass": 1.3,
 					"power": 0.41,
 					"rating": "E",
-					"recharge": 12,
+					"shieldreinforcement": 12,
 					"rechargerating": "E",
 					"spinup": 5,
 					"thermload": 170
@@ -14860,7 +14913,7 @@
 					"mass": 0.5,
 					"power": 0.55,
 					"rating": "D",
-					"recharge": 12.5,
+					"shieldreinforcement": 12.5,
 					"rechargerating": "D",
 					"spinup": 5,
 					"thermload": 170
@@ -14880,7 +14933,7 @@
 					"mass": 1.3,
 					"power": 0.69,
 					"rating": "C",
-					"recharge": 20,
+					"shieldreinforcement": 20,
 					"rechargerating": "C",
 					"spinup": 5,
 					"thermload": 170
@@ -14900,7 +14953,7 @@
 					"mass": 2,
 					"power": 0.83,
 					"rating": "B",
-					"recharge": 24,
+					"shieldreinforcement": 24,
 					"rechargerating": "B",
 					"spinup": 5,
 					"thermload": 170
@@ -14920,7 +14973,7 @@
 					"mass": 1.3,
 					"power": 0.97,
 					"rating": "A",
-					"recharge": 28,
+					"shieldreinforcement": 28,
 					"rechargerating": "A",
 					"spinup": 5,
 					"thermload": 170
@@ -14932,8 +14985,10 @@
 					"cost": 2007240,
 					"edID": 128064293,
 					"eddbID": 1146,
+					"explres": 0.5,
 					"grp": "sg",
 					"id": "4t",
+					"kinres": 0.4,
 					"mass": 160,
 					"maxmass": 4500,
 					"maxmul": 1.3,
@@ -14943,15 +14998,18 @@
 					"optmul": 0.8,
 					"power": 2.4,
 					"rating": "E",
-					"recover": 4.8
+					"recover": 4.8,
+					"thermres": -0.2
 				},
 				{
 					"class": 8,
 					"cost": 6021720,
 					"edID": 128064294,
 					"eddbID": 1147,
+					"explres": 0.5,
 					"grp": "sg",
 					"id": "4s",
+					"kinres": 0.4,
 					"mass": 64,
 					"maxmass": 4500,
 					"maxmul": 1.4,
@@ -14961,15 +15019,18 @@
 					"optmul": 0.9,
 					"power": 3.2,
 					"rating": "D",
-					"recover": 4.8
+					"recover": 4.8,
+					"thermres": -0.2
 				},
 				{
 					"class": 8,
 					"cost": 18065170,
 					"edID": 128064295,
 					"eddbID": 1148,
+					"explres": 0.5,
 					"grp": "sg",
 					"id": "4r",
+					"kinres": 0.4,
 					"mass": 160,
 					"maxmass": 4500,
 					"maxmul": 1.5,
@@ -14979,15 +15040,18 @@
 					"optmul": 1,
 					"power": 4,
 					"rating": "C",
-					"recover": 4.8
+					"recover": 4.8,
+					"thermres": -0.2
 				},
 				{
 					"class": 8,
 					"cost": 54195500,
 					"edID": 128064296,
 					"eddbID": 1149,
+					"explres": 0.5,
 					"grp": "sg",
 					"id": "4q",
+					"kinres": 0.4,
 					"mass": 256,
 					"maxmass": 4500,
 					"maxmul": 1.6,
@@ -14997,15 +15061,18 @@
 					"optmul": 1.1,
 					"power": 4.8,
 					"rating": "B",
-					"recover": 4.8
+					"recover": 4.8,
+					"thermres": -0.2
 				},
 				{
 					"class": 8,
 					"cost": 162586490,
 					"edID": 128064297,
 					"eddbID": 1150,
+					"explres": 0.5,
 					"grp": "sg",
 					"id": "4p",
+					"kinres": 0.4,
 					"mass": 160,
 					"maxmass": 4500,
 					"maxmul": 1.7,
@@ -15015,15 +15082,18 @@
 					"optmul": 1.2,
 					"power": 5.6,
 					"rating": "A",
-					"recover": 4.8
+					"recover": 4.8,
+					"thermres": -0.2
 				},
 				{
 					"class": 7,
 					"cost": 633200,
 					"edID": 128064288,
 					"eddbID": 1141,
+					"explres": 0.5,
 					"grp": "sg",
 					"id": "4o",
+					"kinres": 0.4,
 					"mass": 80,
 					"maxmass": 2650,
 					"maxmul": 1.3,
@@ -15033,15 +15103,18 @@
 					"optmul": 0.8,
 					"power": 2.1,
 					"rating": "E",
-					"recover": 4
+					"recover": 4,
+					"thermres": -0.2
 				},
 				{
 					"class": 7,
 					"cost": 1899600,
 					"edID": 128064289,
 					"eddbID": 1142,
+					"explres": 0.5,
 					"grp": "sg",
 					"id": "4n",
+					"kinres": 0.4,
 					"mass": 32,
 					"maxmass": 2650,
 					"maxmul": 1.4,
@@ -15051,15 +15124,18 @@
 					"optmul": 0.9,
 					"power": 2.8,
 					"rating": "D",
-					"recover": 4
+					"recover": 4,
+					"thermres": -0.2
 				},
 				{
 					"class": 7,
 					"cost": 5698790,
 					"edID": 128064290,
 					"eddbID": 1143,
+					"explres": 0.5,
 					"grp": "sg",
 					"id": "4m",
+					"kinres": 0.4,
 					"mass": 80,
 					"maxmass": 2650,
 					"maxmul": 1.5,
@@ -15069,15 +15145,18 @@
 					"optmul": 1,
 					"power": 3.5,
 					"rating": "C",
-					"recover": 4
+					"recover": 4,
+					"thermres": -0.2
 				},
 				{
 					"class": 7,
 					"cost": 17096370,
 					"edID": 128064291,
 					"eddbID": 1144,
+					"explres": 0.5,
 					"grp": "sg",
 					"id": "4l",
+					"kinres": 0.4,
 					"mass": 128,
 					"maxmass": 2650,
 					"maxmul": 1.6,
@@ -15087,15 +15166,18 @@
 					"optmul": 1.1,
 					"power": 4.2,
 					"rating": "B",
-					"recover": 4
+					"recover": 4,
+					"thermres": -0.2
 				},
 				{
 					"class": 7,
 					"cost": 51289110,
 					"edID": 128064292,
 					"eddbID": 1145,
+					"explres": 0.5,
 					"grp": "sg",
 					"id": "4k",
+					"kinres": 0.4,
 					"mass": 80,
 					"maxmass": 2650,
 					"maxmul": 1.7,
@@ -15105,15 +15187,18 @@
 					"optmul": 1.2,
 					"power": 4.9,
 					"rating": "A",
-					"recover": 4
+					"recover": 4,
+					"thermres": -0.2
 				},
 				{
 					"class": 6,
 					"cost": 199750,
 					"edID": 128064283,
 					"eddbID": 1136,
+					"explres": 0.5,
 					"grp": "sg",
 					"id": "4j",
+					"kinres": 0.4,
 					"mass": 40,
 					"maxmass": 1350,
 					"maxmul": 1.3,
@@ -15123,15 +15208,18 @@
 					"optmul": 0.8,
 					"power": 1.86,
 					"rating": "E",
-					"recover": 3.2
+					"recover": 3.2,
+					"thermres": -0.2
 				},
 				{
 					"class": 6,
 					"cost": 599240,
 					"edID": 128064284,
 					"eddbID": 1137,
+					"explres": 0.5,
 					"grp": "sg",
 					"id": "4i",
+					"kinres": 0.4,
 					"mass": 16,
 					"maxmass": 1350,
 					"maxmul": 1.4,
@@ -15141,15 +15229,18 @@
 					"optmul": 0.9,
 					"power": 2.48,
 					"rating": "D",
-					"recover": 3.2
+					"recover": 3.2,
+					"thermres": -0.2
 				},
 				{
 					"class": 6,
 					"cost": 1797730,
 					"edID": 128064285,
 					"eddbID": 1138,
+					"explres": 0.5,
 					"grp": "sg",
 					"id": "4h",
+					"kinres": 0.4,
 					"mass": 40,
 					"maxmass": 1350,
 					"maxmul": 1.5,
@@ -15159,15 +15250,18 @@
 					"optmul": 1,
 					"power": 3.1,
 					"rating": "C",
-					"recover": 3.2
+					"recover": 3.2,
+					"thermres": -0.2
 				},
 				{
 					"class": 6,
 					"cost": 5393180,
 					"edID": 128064286,
 					"eddbID": 1139,
+					"explres": 0.5,
 					"grp": "sg",
 					"id": "4g",
+					"kinres": 0.4,
 					"mass": 64,
 					"maxmass": 1350,
 					"maxmul": 1.6,
@@ -15177,15 +15271,18 @@
 					"optmul": 1.1,
 					"power": 3.72,
 					"rating": "B",
-					"recover": 3.2
+					"recover": 3.2,
+					"thermres": -0.2
 				},
 				{
 					"class": 6,
 					"cost": 16179530,
 					"edID": 128064287,
 					"eddbID": 1140,
+					"explres": 0.5,
 					"grp": "sg",
 					"id": "4f",
+					"kinres": 0.4,
 					"mass": 40,
 					"maxmass": 1350,
 					"maxmul": 1.7,
@@ -15195,15 +15292,18 @@
 					"optmul": 1.2,
 					"power": 4.34,
 					"rating": "A",
-					"recover": 3.2
+					"recover": 3.2,
+					"thermres": -0.2
 				},
 				{
 					"class": 5,
 					"cost": 63010,
 					"edID": 128064278,
 					"eddbID": 1131,
+					"explres": 0.5,
 					"grp": "sg",
 					"id": "4e",
+					"kinres": 0.4,
 					"mass": 20,
 					"maxmass": 1013,
 					"maxmul": 1.3,
@@ -15213,15 +15313,18 @@
 					"optmul": 0.8,
 					"power": 1.56,
 					"rating": "E",
-					"recover": 2.5
+					"recover": 2.5,
+					"thermres": -0.2
 				},
 				{
 					"class": 5,
 					"cost": 189040,
 					"edID": 128064279,
 					"eddbID": 1132,
+					"explres": 0.5,
 					"grp": "sg",
 					"id": "4d",
+					"kinres": 0.4,
 					"mass": 8,
 					"maxmass": 1013,
 					"maxmul": 1.4,
@@ -15231,15 +15334,18 @@
 					"optmul": 0.9,
 					"power": 2.08,
 					"rating": "D",
-					"recover": 2.5
+					"recover": 2.5,
+					"thermres": -0.2
 				},
 				{
 					"class": 5,
 					"cost": 567110,
 					"edID": 128064280,
 					"eddbID": 1133,
+					"explres": 0.5,
 					"grp": "sg",
 					"id": "4c",
+					"kinres": 0.4,
 					"mass": 20,
 					"maxmass": 1013,
 					"maxmul": 1.5,
@@ -15249,15 +15355,18 @@
 					"optmul": 1,
 					"power": 2.6,
 					"rating": "C",
-					"recover": 2.5
+					"recover": 2.5,
+					"thermres": -0.2
 				},
 				{
 					"class": 5,
 					"cost": 1701320,
 					"edID": 128064281,
 					"eddbID": 1134,
+					"explres": 0.5,
 					"grp": "sg",
 					"id": "4b",
+					"kinres": 0.4,
 					"mass": 32,
 					"maxmass": 1013,
 					"maxmul": 1.6,
@@ -15267,15 +15376,18 @@
 					"optmul": 1.1,
 					"power": 3.12,
 					"rating": "B",
-					"recover": 2.5
+					"recover": 2.5,
+					"thermres": -0.2
 				},
 				{
 					"class": 5,
 					"cost": 5103950,
 					"edID": 128064282,
 					"eddbID": 1135,
+					"explres": 0.5,
 					"grp": "sg",
 					"id": "4a",
+					"kinres": 0.4,
 					"mass": 20,
 					"maxmass": 1013,
 					"maxmul": 1.7,
@@ -15285,15 +15397,18 @@
 					"optmul": 1.2,
 					"power": 3.64,
 					"rating": "A",
-					"recover": 2.5
+					"recover": 2.5,
+					"thermres": -0.2
 				},
 				{
 					"class": 4,
 					"cost": 19880,
 					"edID": 128064273,
 					"eddbID": 1126,
+					"explres": 0.5,
 					"grp": "sg",
 					"id": "49",
+					"kinres": 0.4,
 					"mass": 10,
 					"maxmass": 713,
 					"maxmul": 1.3,
@@ -15303,15 +15418,18 @@
 					"optmul": 0.8,
 					"power": 1.32,
 					"rating": "E",
-					"recover": 1.9
+					"recover": 1.9,
+					"thermres": -0.2
 				},
 				{
 					"class": 4,
 					"cost": 59630,
 					"edID": 128064274,
 					"eddbID": 1127,
+					"explres": 0.5,
 					"grp": "sg",
 					"id": "48",
+					"kinres": 0.4,
 					"mass": 4,
 					"maxmass": 713,
 					"maxmul": 1.4,
@@ -15321,15 +15439,18 @@
 					"optmul": 0.9,
 					"power": 1.76,
 					"rating": "D",
-					"recover": 1.9
+					"recover": 1.9,
+					"thermres": -0.2
 				},
 				{
 					"class": 4,
 					"cost": 178900,
 					"edID": 128064275,
 					"eddbID": 1128,
+					"explres": 0.5,
 					"grp": "sg",
 					"id": "47",
+					"kinres": 0.4,
 					"mass": 10,
 					"maxmass": 713,
 					"maxmul": 1.5,
@@ -15339,15 +15460,18 @@
 					"optmul": 1,
 					"power": 2.2,
 					"rating": "C",
-					"recover": 1.9
+					"recover": 1.9,
+					"thermres": -0.2
 				},
 				{
 					"class": 4,
 					"cost": 536690,
 					"edID": 128064276,
 					"eddbID": 1129,
+					"explres": 0.5,
 					"grp": "sg",
 					"id": "46",
+					"kinres": 0.4,
 					"mass": 16,
 					"maxmass": 713,
 					"maxmul": 1.6,
@@ -15357,15 +15481,18 @@
 					"optmul": 1.1,
 					"power": 2.64,
 					"rating": "B",
-					"recover": 1.9
+					"recover": 1.9,
+					"thermres": -0.2
 				},
 				{
 					"class": 4,
 					"cost": 1610080,
 					"edID": 128064277,
 					"eddbID": 1130,
+					"explres": 0.5,
 					"grp": "sg",
 					"id": "45",
+					"kinres": 0.4,
 					"mass": 10,
 					"maxmass": 713,
 					"maxmul": 1.7,
@@ -15375,15 +15502,18 @@
 					"optmul": 1.2,
 					"power": 3.08,
 					"rating": "A",
-					"recover": 1.9
+					"recover": 1.9,
+					"thermres": -0.2
 				},
 				{
 					"class": 3,
 					"cost": 6270,
 					"edID": 128064268,
 					"eddbID": 1121,
+					"explres": 0.5,
 					"grp": "sg",
 					"id": "44",
+					"kinres": 0.4,
 					"mass": 5,
 					"maxmass": 413,
 					"maxmul": 1.3,
@@ -15393,15 +15523,18 @@
 					"optmul": 0.8,
 					"power": 1.08,
 					"rating": "E",
-					"recover": 1.6
+					"recover": 1.6,
+					"thermres": -0.2
 				},
 				{
 					"class": 3,
 					"cost": 18810,
 					"edID": 128064269,
 					"eddbID": 1122,
+					"explres": 0.5,
 					"grp": "sg",
 					"id": "43",
+					"kinres": 0.4,
 					"mass": 2,
 					"maxmass": 413,
 					"maxmul": 1.4,
@@ -15411,15 +15544,18 @@
 					"optmul": 0.9,
 					"power": 1.44,
 					"rating": "D",
-					"recover": 1.6
+					"recover": 1.6,
+					"thermres": -0.2
 				},
 				{
 					"class": 3,
 					"cost": 56440,
 					"edID": 128064270,
 					"eddbID": 1123,
+					"explres": 0.5,
 					"grp": "sg",
 					"id": "42",
+					"kinres": 0.4,
 					"mass": 5,
 					"maxmass": 413,
 					"maxmul": 1.5,
@@ -15429,15 +15565,18 @@
 					"optmul": 1,
 					"power": 1.8,
 					"rating": "C",
-					"recover": 1.6
+					"recover": 1.6,
+					"thermres": -0.2
 				},
 				{
 					"class": 3,
 					"cost": 169300,
 					"edID": 128064271,
 					"eddbID": 1124,
+					"explres": 0.5,
 					"grp": "sg",
 					"id": "41",
+					"kinres": 0.4,
 					"mass": 8,
 					"maxmass": 413,
 					"maxmul": 1.6,
@@ -15447,15 +15586,18 @@
 					"optmul": 1.1,
 					"power": 2.16,
 					"rating": "B",
-					"recover": 1.6
+					"recover": 1.6,
+					"thermres": -0.2
 				},
 				{
 					"class": 3,
 					"cost": 507910,
 					"edID": 128064272,
 					"eddbID": 1125,
+					"explres": 0.5,
 					"grp": "sg",
 					"id": "40",
+					"kinres": 0.4,
 					"mass": 5,
 					"maxmass": 413,
 					"maxmul": 1.7,
@@ -15465,15 +15607,18 @@
 					"optmul": 1.2,
 					"power": 2.52,
 					"rating": "A",
-					"recover": 1.6
+					"recover": 1.6,
+					"thermres": -0.2
 				},
 				{
 					"class": 2,
 					"cost": 1980,
 					"edID": 128064263,
 					"eddbID": 1116,
+					"explres": 0.5,
 					"grp": "sg",
 					"id": "3v",
+					"kinres": 0.4,
 					"mass": 2.5,
 					"maxmass": 138,
 					"maxmul": 1.3,
@@ -15483,15 +15628,18 @@
 					"optmul": 0.8,
 					"power": 0.9,
 					"rating": "E",
-					"recover": 1.6
+					"recover": 1.6,
+					"thermres": -0.2
 				},
 				{
 					"class": 2,
 					"cost": 5930,
 					"edID": 128064264,
 					"eddbID": 1117,
+					"explres": 0.5,
 					"grp": "sg",
 					"id": "3u",
+					"kinres": 0.4,
 					"mass": 1,
 					"maxmass": 138,
 					"maxmul": 1.4,
@@ -15501,15 +15649,18 @@
 					"optmul": 0.9,
 					"power": 1.2,
 					"rating": "D",
-					"recover": 1.6
+					"recover": 1.6,
+					"thermres": -0.2
 				},
 				{
 					"class": 2,
 					"cost": 17800,
 					"edID": 128064265,
 					"eddbID": 1118,
+					"explres": 0.5,
 					"grp": "sg",
 					"id": "3t",
+					"kinres": 0.4,
 					"mass": 2.5,
 					"maxmass": 138,
 					"maxmul": 1.5,
@@ -15519,15 +15670,18 @@
 					"optmul": 1,
 					"power": 1.5,
 					"rating": "C",
-					"recover": 1.6
+					"recover": 1.6,
+					"thermres": -0.2
 				},
 				{
 					"class": 2,
 					"cost": 53410,
 					"edID": 128064266,
 					"eddbID": 1119,
+					"explres": 0.5,
 					"grp": "sg",
 					"id": "3s",
+					"kinres": 0.4,
 					"mass": 4,
 					"maxmass": 138,
 					"maxmul": 1.6,
@@ -15537,15 +15691,18 @@
 					"optmul": 1.1,
 					"power": 1.8,
 					"rating": "B",
-					"recover": 1.6
+					"recover": 1.6,
+					"thermres": -0.2
 				},
 				{
 					"class": 2,
 					"cost": 160220,
 					"edID": 128064267,
 					"eddbID": 1120,
+					"explres": 0.5,
 					"grp": "sg",
 					"id": "3r",
+					"kinres": 0.4,
 					"mass": 2.5,
 					"maxmass": 138,
 					"maxmul": 1.7,
@@ -15555,15 +15712,18 @@
 					"optmul": 1.2,
 					"power": 2.1,
 					"rating": "A",
-					"recover": 1.6
+					"recover": 1.6,
+					"thermres": -0.2
 				},
 				{
 					"class": 1,
 					"cost": 88075,
 					"edID": 128064262,
 					"eddbID": 1551,
+					"explres": 0.5,
 					"grp": "sg",
 					"id": "1x",
+					"kinres": 0.4,
 					"mass": 1.3,
 					"maxmass": 63,
 					"maxmul": 1.7,
@@ -15573,13 +15733,14 @@
 					"optmul": 1.2,
 					"power": 1.68,
 					"rating": "A",
-					"recover": 1
+					"recover": 1,
+					"thermres": -0.2
 				}
 			]
 		}
 	},
 	"Modifications": {
-		"modifiers": [
+		"modifications": [
 			"ammo",
 			"boot",
 			"brokenregen",
@@ -15618,8 +15779,318 @@
 			"thermload",
 			"thermres",
 			"wepcap",
-			"weprate"
+			"weprate",
+			"shieldreinforcement"
 		],
+		"modifierActions": {
+			"mod_boot_time": {
+				"boot": 1
+			},
+			"mod_defencemodifier_explosive_mult": {
+				"explres": 1
+			},
+			"mod_defencemodifier_global_hull_mult": {
+				"explres": 1,
+				"kinres": 1,
+				"thermres": 1
+			},
+			"mod_defencemodifier_global_shield_mult": {
+				"explres": 1,
+				"kinres": 1,
+				"thermres": 1
+			},
+			"mod_defencemodifier_health_add": {
+				"hullreinforcement": 1
+			},
+			"mod_defencemodifier_health_mult": {
+				"hullboost": 1
+			},
+			"mod_defencemodifier_kinetic_mult": {
+				"kinres": 1
+			},
+			"mod_defencemodifier_shield_explosive_mult": {
+				"explres": 1
+			},
+			"mod_defencemodifier_shield_kinetic_mult": {
+				"kinres": 1
+			},
+			"mod_defencemodifier_shield_mult": {
+				"shieldboost": 1
+			},
+			"mod_defencemodifier_shield_thermic_mult": {
+				"thermres": 1
+			},
+			"mod_defencemodifier_thermic_mult": {
+				"thermres": 1
+			},
+			"mod_engine_heat": {
+				"thermload": 1
+			},
+			"mod_engine_mass_curve": {
+				"optmass": 1
+			},
+			"mod_engine_mass_curve_multiplier": {
+				"optmul": 1
+			},
+			"mod_fsd_heat_rate": {
+				"thermload": 1
+			},
+			"mod_fsd_max_fuel_per_jump": {
+				"maxfuel": 1
+			},
+			"mod_fsd_optimised_mass": {
+				"optmass": 1
+			},
+			"mod_fsdinterdictor_facing_limit": {
+				"facinglimit": 1
+			},
+			"mod_fsdinterdictor_range": {
+				"ranget": 1
+			},
+			"mod_health": {
+				"integrity": 1
+			},
+			"mod_mass": {
+				"mass": 1
+			},
+			"mod_passive_power": {
+				"power": 1
+			},
+			"mod_powerdistributor_engine_charge": {
+				"engcap": 1
+			},
+			"mod_powerdistributor_engine_rate": {
+				"engrate": 1
+			},
+			"mod_powerdistributor_global_charge": {
+				"engcap": 1,
+				"syscap": 1,
+				"wepcap": 1
+			},
+			"mod_powerdistributor_global_rate": {
+				"engrate": 1,
+				"sysrate": 1,
+				"weprate": 1
+			},
+			"mod_powerdistributor_system_charge": {
+				"syscap": 1
+			},
+			"mod_powerdistributor_system_rate": {
+				"sysrate": 1
+			},
+			"mod_powerdistributor_weapon_charge": {
+				"wepcap": 1
+			},
+			"mod_powerdistributor_weapon_rate": {
+				"weprate": 1
+			},
+			"mod_powerplant_heat": {
+				"eff": 1
+			},
+			"mod_powerplant_power": {
+				"pgen": 1
+			},
+			"mod_shield_broken_regen": {
+				"brokenregen": 1
+			},
+			"mod_shield_energy_per_regen": {
+				"distdraw": 1
+			},
+			"mod_shield_explosive_mult": {
+				"explres": 1
+			},
+			"mod_shield_global_mult": {
+				"explres": 1,
+				"kinres": 1,
+				"thermres": 1
+			},
+			"mod_shield_kinetic_mult": {
+				"kinres": 1
+			},
+			"mod_shield_mass_curve": {
+				"optmass": 1
+			},
+			"mod_shield_mass_curve_multiplier": {
+				"optmul": 1
+			},
+			"mod_shield_normal_regen": {
+				"regen": 1
+			},
+			"mod_shield_thermal_mult": {
+				"thermres": 1
+			},
+			"mod_shieldcell_charge_heat": {
+				"thermload": 1
+			},
+			"mod_shieldcell_duration": {
+				"duration": 1
+			},
+			"mod_shieldcell_shield_units": {
+				"shieldreinforcement": 1
+			},
+			"mod_shieldcell_spin_up": {
+				"spinup": 1
+			},
+			"mod_weapon_active_heat": {
+				"thermload": 1
+			},
+			"mod_weapon_active_power": {
+				"distdraw": 1
+			},
+			"mod_weapon_ammo_capacity": {
+				"ammo": 1
+			},
+			"mod_weapon_burst_interval": {
+				"rof": 1
+			},
+			"mod_weapon_burst_rof": {},
+			"mod_weapon_burst_size": {},
+			"mod_weapon_clip_size": {
+				"clip": 1
+			},
+			"mod_weapon_damage": {
+				"damage": 1
+			},
+			"mod_weapon_hardness_piercing": {
+				"piercing": 1
+			},
+			"mod_weapon_jitter_radius": {
+				"jitter": 1
+			},
+			"mod_weapon_range": {
+				"range": 1
+			},
+			"mod_weapon_reload_time": {
+				"reload": 1
+			},
+			"special_auto_loader": {},
+			"special_choke_canister": {},
+			"special_corrosive_shell": {
+				"ammo": -0.2
+			},
+			"special_dispersal_field": {
+				"damage": -0.1
+			},
+			"special_distortion_field": {},
+			"special_drag_munitions": {},
+			"special_emissive_munitions": {
+				"thermload": 1
+			},
+			"special_feedback_cascade": {},
+			"special_high_yield_shell": {},
+			"special_incendiary_rounds": {
+				"rof": 0.05263157894736842,
+				"thermload": 2
+			},
+			"special_overload_munitions": {
+				"ammo": -0.2
+			},
+			"special_phasing_sequence": {},
+			"special_radiant_canister": {
+				"ammo": -0.25
+			},
+			"special_regeneration_sequence": {},
+			"special_scramble_spectrum": {
+				"rof": 0.1111111111111111
+			},
+			"special_shiftlock_canister": {
+				"damage": -0.2
+			},
+			"special_thermal_cascade": {},
+			"special_thermal_conduit": {},
+			"special_thermal_vent": {
+				"thermload": 0.25
+			},
+			"special_thermalshock": {
+				"damage": -0.25
+			},
+			"trade_cell_heat_cell_units": {},
+			"trade_defence_health_add_defence_global_mult": {},
+			"trade_distributor_engine_charge_system_charge": {
+				"engcap": 1,
+				"syscap": -1
+			},
+			"trade_distributor_global_charge_mass": {
+				"engcap": 0.75,
+				"mass": 1,
+				"syscap": 0.75,
+				"wepcap": 0.75
+			},
+			"trade_engine_curve_mult_engine_heat": {
+				"optmul": 0.4,
+				"thermload": 1
+			},
+			"trade_fsd_fuel_per_jump_fsd_heat": {
+				"maxfuel": 0.5,
+				"thermload": 1
+			},
+			"trade_interdictor_range_facing_limit": {},
+			"trade_mass_defence_health_add": {
+				"hullreinforcement": -0.75,
+				"mass": -1
+			},
+			"trade_mass_health": {
+				"integrity": 1,
+				"mass": 0.4
+			},
+			"trade_passive_power_booster_global_mult": {
+				"explres": 0.4,
+				"kinres": 0.4,
+				"power": -1,
+				"thermres": 0.4
+			},
+			"trade_passive_power_boot_time": {
+				"boot": 1,
+				"power": -0.5
+			},
+			"trade_passive_power_cell_spin_up": {},
+			"trade_passive_power_distributor_global_rate": {
+				"engrate": -1,
+				"power": -1,
+				"sysrate": -1,
+				"weprate": -1
+			},
+			"trade_passive_power_engine_curve": {
+				"optmass": -0.66,
+				"power": -1
+			},
+			"trade_passive_power_shield_global_mult": {
+				"explres": 0.5,
+				"kinres": 0.5,
+				"power": -1,
+				"thermres": 0.5
+			},
+			"trade_passive_power_weapon_active": {
+				"distdraw": -0.6,
+				"power": 1
+			},
+			"trade_shield_curve_shield_curve_mult": {
+				"optmass": -1,
+				"optmul": -0.8
+			},
+			"trade_shield_global_mult_shield_broken_regen": {
+				"brokenregen": -1,
+				"explres": -0.5,
+				"kinres": -0.5,
+				"thermres": -0.5
+			},
+			"trade_shield_kinetic_shield_thermic": {
+				"kinres": 1,
+				"thermres": -1
+			},
+			"trade_weapon_active_passive_power": {
+				"distdraw": -0.67,
+				"power": 1
+			},
+			"trade_weapon_damage_weapon_active_power": {
+				"damage": 0.5,
+				"distdraw": 1
+			},
+			"trade_weapon_hardness_weapon_heat": {
+				"piercing": 0.4,
+				"thermload": 1
+			}
+		},
 		"validity": {
 			"am": [
 				"integrity",
@@ -15917,7 +16388,7 @@
 				"duration",
 				"integrity",
 				"power",
-				"shield",
+				"shieldreinforcement",
 				"spinup",
 				"thermload"
 			],
diff --git a/modifications/index.js b/modifications/index.js
index cd3513d..bd9305c 100644
--- a/modifications/index.js
+++ b/modifications/index.js
@@ -1,4 +1,5 @@
 module.exports = {
-  modifiers: require('./modifiers'),
+  modifications: require('./modifications'),
+  modifierActions: require('./modifierActions'),
   validity: require('./validity')
 };
diff --git a/modifications/modifiers.json b/modifications/modifications.json
similarity index 93%
rename from modifications/modifiers.json
rename to modifications/modifications.json
index 6e22069..df78561 100644
--- a/modifications/modifiers.json
+++ b/modifications/modifications.json
@@ -37,5 +37,6 @@
     "thermload",
     "thermres",
     "wepcap",
-    "weprate"
+    "weprate",
+    "shieldreinforcement"
 ]
diff --git a/modifications/modifierActions.json b/modifications/modifierActions.json
new file mode 100644
index 0000000..9f08225
--- /dev/null
+++ b/modifications/modifierActions.json
@@ -0,0 +1,309 @@
+{
+  "mod_boot_time": {
+    "boot": 1
+  },
+  "mod_defencemodifier_explosive_mult": {
+    "explres": 1
+  },
+  "mod_defencemodifier_global_hull_mult": {
+    "explres": 1,
+    "kinres": 1,
+    "thermres": 1
+  },
+  "mod_defencemodifier_global_shield_mult": {
+    "explres": 1,
+    "kinres": 1,
+    "thermres": 1
+  },
+  "mod_defencemodifier_health_add": {
+    "hullreinforcement": 1
+  },
+  "mod_defencemodifier_health_mult": {
+    "hullboost": 1
+  },
+  "mod_defencemodifier_kinetic_mult": {
+    "kinres": 1
+  },
+  "mod_defencemodifier_shield_explosive_mult": {
+    "explres": 1
+  },
+  "mod_defencemodifier_shield_kinetic_mult": {
+    "kinres": 1
+  },
+  "mod_defencemodifier_shield_mult": {
+    "shieldboost": 1
+  },
+  "mod_defencemodifier_shield_thermic_mult": {
+    "thermres": 1
+  },
+  "mod_defencemodifier_thermic_mult": {
+    "thermres": 1
+  },
+  "mod_engine_heat": {
+    "thermload": 1
+  },
+  "mod_engine_mass_curve": {
+    "optmass": 1
+  },
+  "mod_engine_mass_curve_multiplier": {
+    "optmul": 1
+  },
+  "mod_fsd_heat_rate": {
+    "thermload": 1
+  },
+  "mod_fsd_max_fuel_per_jump": {
+    "maxfuel": 1
+  },
+  "mod_fsd_optimised_mass": {
+    "optmass": 1
+  },
+  "mod_fsdinterdictor_facing_limit": {
+    "facinglimit": 1
+  },
+  "mod_fsdinterdictor_range": {
+    "ranget": 1
+  },
+  "mod_health": {
+    "integrity": 1
+  },
+  "mod_mass": {
+    "mass": 1
+  },
+  "mod_passive_power": {
+    "power": 1
+  },
+  "mod_powerdistributor_engine_charge": {
+    "engcap": 1
+  },
+  "mod_powerdistributor_engine_rate": {
+    "engrate": 1
+  },
+  "mod_powerdistributor_global_charge": {
+    "engcap": 1,
+    "syscap": 1,
+    "wepcap": 1
+  },
+  "mod_powerdistributor_global_rate": {
+    "engrate": 1,
+    "sysrate": 1,
+    "weprate": 1
+  },
+  "mod_powerdistributor_system_charge": {
+    "syscap": 1
+  },
+  "mod_powerdistributor_system_rate": {
+    "sysrate": 1
+  },
+  "mod_powerdistributor_weapon_charge": {
+    "wepcap": 1
+  },
+  "mod_powerdistributor_weapon_rate": {
+    "weprate": 1
+  },
+  "mod_powerplant_heat": {
+    "eff": 1
+  },
+  "mod_powerplant_power": {
+    "pgen": 1
+  },
+  "mod_shield_broken_regen": {
+    "brokenregen": 1
+  },
+  "mod_shield_energy_per_regen": {
+    "distdraw": 1
+  },
+  "mod_shield_explosive_mult": {
+    "explres": 1
+  },
+  "mod_shield_global_mult": {
+    "explres": 1,
+    "kinres": 1,
+    "thermres": 1
+  },
+  "mod_shield_kinetic_mult": {
+    "kinres": 1
+  },
+  "mod_shield_mass_curve": {
+    "optmass": 1
+  },
+  "mod_shield_mass_curve_multiplier": {
+    "optmul": 1
+  },
+  "mod_shield_normal_regen": {
+    "regen": 1
+  },
+  "mod_shield_thermal_mult": {
+    "thermres": 1
+  },
+  "mod_shieldcell_charge_heat": {
+    "thermload": 1
+  },
+  "mod_shieldcell_duration": {
+    "duration": 1
+  },
+  "mod_shieldcell_shield_units": {
+    "shieldreinforcement": 1
+  },
+  "mod_shieldcell_spin_up": {
+    "spinup": 1
+  },
+  "mod_weapon_active_heat": {
+    "thermload": 1
+  },
+  "mod_weapon_active_power": {
+    "distdraw": 1
+  },
+  "mod_weapon_ammo_capacity": {
+    "ammo": 1
+  },
+  "mod_weapon_burst_interval": {
+    "rof": 1
+  },
+  "mod_weapon_burst_rof": {},
+  "mod_weapon_burst_size": {},
+  "mod_weapon_clip_size": {
+    "clip": 1
+  },
+  "mod_weapon_damage": {
+    "damage": 1
+  },
+  "mod_weapon_hardness_piercing": {
+    "piercing": 1
+  },
+  "mod_weapon_jitter_radius": {
+    "jitter": 1
+  },
+  "mod_weapon_range": {
+    "range": 1
+  },
+  "mod_weapon_reload_time": {
+    "reload": 1
+  },
+  "special_auto_loader": {},
+  "special_choke_canister": {},
+  "special_corrosive_shell": {
+    "ammo": -0.2
+  },
+  "special_dispersal_field": {
+    "damage": -0.1
+  },
+  "special_distortion_field": {},
+  "special_drag_munitions": {},
+  "special_emissive_munitions": {
+    "thermload": 1
+  },
+  "special_feedback_cascade": {},
+  "special_high_yield_shell": {},
+  "special_incendiary_rounds": {
+    "rof": 0.05263157894736842,
+    "thermload": 2
+  },
+  "special_overload_munitions": {
+    "ammo": -0.2
+  },
+  "special_phasing_sequence": {},
+  "special_radiant_canister": {
+    "ammo": -0.25
+  },
+  "special_regeneration_sequence": {},
+  "special_scramble_spectrum": {
+    "rof": 0.1111111111111111
+  },
+  "special_shiftlock_canister": {
+    "damage": -0.2
+  },
+  "special_thermal_cascade": {},
+  "special_thermal_conduit": {},
+  "special_thermal_vent": {
+    "thermload": 0.25
+  },
+  "special_thermalshock": {
+    "damage": -0.25
+  },
+  "trade_cell_heat_cell_units": {},
+  "trade_defence_health_add_defence_global_mult": {},
+  "trade_distributor_engine_charge_system_charge": {
+    "engcap": 1,
+    "syscap": -1
+  },
+  "trade_distributor_global_charge_mass": {
+    "engcap": 0.75,
+    "mass": 1,
+    "syscap": 0.75,
+    "wepcap": 0.75
+  },
+  "trade_engine_curve_mult_engine_heat": {
+    "optmul": 0.4,
+    "thermload": 1
+  },
+  "trade_fsd_fuel_per_jump_fsd_heat": {
+    "maxfuel": 0.5,
+    "thermload": 1
+  },
+  "trade_interdictor_range_facing_limit": {},
+  "trade_mass_defence_health_add": {
+    "hullreinforcement": -0.75,
+    "mass": -1
+  },
+  "trade_mass_health": {
+    "integrity": 1,
+    "mass": 0.4
+  },
+  "trade_passive_power_booster_global_mult": {
+    "explres": 0.4,
+    "kinres": 0.4,
+    "power": -1,
+    "thermres": 0.4
+  },
+  "trade_passive_power_boot_time": {
+    "boot": 1,
+    "power": -0.5
+  },
+  "trade_passive_power_cell_spin_up": {},
+  "trade_passive_power_distributor_global_rate": {
+    "engrate": -1,
+    "power": -1,
+    "sysrate": -1,
+    "weprate": -1
+  },
+  "trade_passive_power_engine_curve": {
+    "optmass": -0.66,
+    "power": -1
+  },
+  "trade_passive_power_shield_global_mult": {
+    "explres": 0.5,
+    "kinres": 0.5,
+    "power": -1,
+    "thermres": 0.5
+  },
+  "trade_passive_power_weapon_active": {
+    "distdraw": -0.6,
+    "power": 1
+  },
+  "trade_shield_curve_shield_curve_mult": {
+    "optmass": -1,
+    "optmul": -0.8
+  },
+  "trade_shield_global_mult_shield_broken_regen": {
+    "brokenregen": -1,
+    "explres": -0.5,
+    "kinres": -0.5,
+    "thermres": -0.5
+  },
+  "trade_shield_kinetic_shield_thermic": {
+    "kinres": 1,
+    "thermres": -1
+  },
+  "trade_weapon_active_passive_power": {
+    "distdraw": -0.67,
+    "power": 1
+  },
+  "trade_weapon_damage_weapon_active_power": {
+    "damage": 0.5,
+    "distdraw": 1
+  },
+  "trade_weapon_hardness_weapon_heat": {
+    "piercing": 0.4,
+    "thermload": 1
+  }
+}
diff --git a/modifications/validity.json b/modifications/validity.json
index 6ba9eee..13920bd 100644
--- a/modifications/validity.json
+++ b/modifications/validity.json
@@ -295,7 +295,7 @@
     "duration",
     "integrity",
     "power",
-    "shield",
+    "shieldreinforcement",
     "spinup",
     "thermload"
   ],
diff --git a/modules/hardpoints/burst_laser.json b/modules/hardpoints/burst_laser.json
index b8e78e5..d696595 100644
--- a/modules/hardpoints/burst_laser.json
+++ b/modules/hardpoints/burst_laser.json
@@ -76,14 +76,14 @@
       "type": "T"
     },
     {
-      "breachdmg": 15.25,
+      "breachdmg": 1.5,
       "breachmax": 0,
       "breachmin": 0,
-      "burst": 8,
-      "burstrof": 20,
+      "burst": 3,
+      "burstrof": 15,
       "class": 1,
       "cost": 8800,
-      "damage": 18,
+      "damage": 2.4,
       "distdraw": 0.4,
       "edID": 128671449,
       "eddbID": 1477,
diff --git a/modules/hardpoints/chaff_launcher.json b/modules/hardpoints/chaff_launcher.json
index 4cef54a..4f0606f 100644
--- a/modules/hardpoints/chaff_launcher.json
+++ b/modules/hardpoints/chaff_launcher.json
@@ -2,6 +2,7 @@
   "ch": [
     {
       "ammo": 10,
+      "ammocost": 100,
       "class": 0,
       "clip": 1,
       "cost": 8500,
diff --git a/modules/hardpoints/heat_sink_launcher.json b/modules/hardpoints/heat_sink_launcher.json
index 14a6790..e49ad02 100644
--- a/modules/hardpoints/heat_sink_launcher.json
+++ b/modules/hardpoints/heat_sink_launcher.json
@@ -2,6 +2,7 @@
   "hs": [
     {
       "ammo": 2,
+      "ammocost": 25,
       "class": 0,
       "clip": 1,
       "cost": 3500,
diff --git a/modules/internal/bi_weave_shield_generator.json b/modules/internal/bi_weave_shield_generator.json
index 3533f68..eb6662f 100644
--- a/modules/internal/bi_weave_shield_generator.json
+++ b/modules/internal/bi_weave_shield_generator.json
@@ -5,8 +5,10 @@
       "cost": 7710,
       "edID": 128671331,
       "eddbID": 1530,
+      "explres": 0.5,
       "grp": "bsg",
       "id": "B6",
+      "kinres": 0.4,
       "mass": 1.3,
       "maxmass": 63,
       "maxmul": 1.4,
@@ -16,15 +18,18 @@
       "optmul": 0.9,
       "power": 1.2,
       "rating": "C",
-      "recover": 2.4
+      "recover": 2.4,
+      "thermres": -0.2
     },
     {
       "class": 2,
       "cost": 26710,
       "edID": 128671332,
       "eddbID": 1531,
+      "explres": 0.5,
       "grp": "bsg",
       "id": "B5",
+      "kinres": 0.4,
       "mass": 2.5,
       "maxmass": 138,
       "maxmul": 1.4,
@@ -34,15 +39,18 @@
       "optmul": 0.9,
       "power": 1.5,
       "rating": "C",
-      "recover": 2.4
+      "recover": 2.4,
+      "thermres": -0.2
     },
     {
       "class": 3,
       "cost": 84650,
       "edID": 128671333,
       "eddbID": 1532,
+      "explres": 0.5,
       "grp": "bsg",
       "id": "B4",
+      "kinres": 0.4,
       "mass": 5,
       "maxmass": 413,
       "maxmul": 1.4,
@@ -52,15 +60,18 @@
       "optmul": 0.9,
       "power": 1.8,
       "rating": "C",
-      "recover": 2.4
+      "recover": 2.4,
+      "thermres": -0.2
     },
     {
       "class": 4,
       "cost": 268350,
       "edID": 128671334,
       "eddbID": 1533,
+      "explres": 0.5,
       "grp": "bsg",
       "id": "B3",
+      "kinres": 0.4,
       "mass": 10,
       "maxmass": 713,
       "maxmul": 1.4,
@@ -70,15 +81,18 @@
       "optmul": 0.9,
       "power": 2.2,
       "rating": "C",
-      "recover": 2.85
+      "recover": 2.85,
+      "thermres": -0.2
     },
     {
       "class": 5,
       "cost": 850660,
       "edID": 128671335,
       "eddbID": 1534,
+      "explres": 0.5,
       "grp": "bsg",
       "id": "B2",
+      "kinres": 0.4,
       "mass": 20,
       "maxmass": 1013,
       "maxmul": 1.4,
@@ -88,15 +102,18 @@
       "optmul": 0.9,
       "power": 2.6,
       "rating": "C",
-      "recover": 3.75
+      "recover": 3.75,
+      "thermres": -0.2
     },
     {
       "class": 6,
       "cost": 2696600,
       "edID": 128671336,
       "eddbID": 1535,
+      "explres": 0.5,
       "grp": "bsg",
       "id": "B1",
+      "kinres": 0.4,
       "mass": 40,
       "maxmass": 1350,
       "maxmul": 1.4,
@@ -106,15 +123,18 @@
       "optmul": 0.9,
       "power": 3.1,
       "rating": "C",
-      "recover": 4.8
+      "recover": 4.8,
+      "thermres": -0.2
     },
     {
       "class": 7,
       "cost": 8548200,
       "edID": 128671337,
       "eddbID": 1536,
+      "explres": 0.5,
       "grp": "bsg",
       "id": "B0",
+      "kinres": 0.4,
       "mass": 80,
       "maxmass": 2650,
       "maxmul": 1.4,
@@ -124,15 +144,18 @@
       "optmul": 0.9,
       "power": 3.5,
       "rating": "C",
-      "recover": 6
+      "recover": 6,
+      "thermres": -0.2
     },
     {
       "class": 8,
       "cost": 27097750,
       "edID": 128671338,
       "eddbID": 1537,
+      "explres": 0.5,
       "grp": "bsg",
       "id": "B7",
+      "kinres": 0.4,
       "mass": 160,
       "maxmass": 4500,
       "maxmul": 1.4,
@@ -142,7 +165,8 @@
       "optmul": 0.9,
       "power": 4,
       "rating": "C",
-      "recover": 7.2
+      "recover": 7.2,
+      "thermres": -0.2
     }
   ]
 }
diff --git a/modules/internal/fighter_hangar.json b/modules/internal/fighter_hangar.json
index 4f12734..7b9edc5 100644
--- a/modules/internal/fighter_hangar.json
+++ b/modules/internal/fighter_hangar.json
@@ -6,6 +6,7 @@
       "cost": 575660,
       "edID": 128727930,
       "eddbID": 1560,
+      "fightercost": 1030,
       "grp": "fh",
       "id": "fh",
       "mass": 60,
@@ -19,6 +20,7 @@
       "cost": 1869350,
       "edID": 128727931,
       "eddbID": 1561,
+      "fightercost": 1030,
       "grp": "fh",
       "id": "fm",
       "mass": 40,
@@ -32,6 +34,7 @@
       "cost": 2369330,
       "edID": 128727932,
       "eddbID": 1562,
+      "fightercost": 1030,
       "grp": "fh",
       "id": "fr",
       "mass": 20,
diff --git a/modules/internal/hull_reinforcement_package.json b/modules/internal/hull_reinforcement_package.json
index 7cd9d9d..a7dc3c4 100644
--- a/modules/internal/hull_reinforcement_package.json
+++ b/modules/internal/hull_reinforcement_package.json
@@ -6,13 +6,13 @@
       "cost": 150000,
       "edID": 128668545,
       "eddbID": 1381,
-      "explres": 2.5,
+      "explres": 0.025,
       "grp": "hr",
       "id": "2e",
-      "kinres": 2.5,
+      "kinres": 0.025,
       "mass": 64,
       "rating": "E",
-      "thermres": 2.5
+      "thermres": 0.025
     },
     {
       "hullreinforcement": 390,
@@ -20,13 +20,13 @@
       "cost": 450000,
       "edID": 128668546,
       "eddbID": 1382,
-      "explres": 2.5,
+      "explres": 0.025,
       "grp": "hr",
       "id": "2d",
-      "kinres": 2.5,
+      "kinres": 0.025,
       "mass": 32,
       "rating": "D",
-      "thermres": 2.5
+      "thermres": 0.025
     },
     {
       "hullreinforcement": 300,
@@ -34,13 +34,13 @@
       "cost": 65000,
       "edID": 128668543,
       "eddbID": 1379,
-      "explres": 2,
+      "explres": 0.2,
       "grp": "hr",
       "id": "2c",
-      "kinres": 2,
+      "kinres": 0.2,
       "mass": 32,
       "rating": "E",
-      "thermres": 2
+      "thermres": 0.2
     },
     {
       "hullreinforcement": 330,
@@ -48,13 +48,13 @@
       "cost": 195000,
       "edID": 128668544,
       "eddbID": 1380,
-      "explres": 2,
+      "explres": 0.2,
       "grp": "hr",
       "id": "2b",
-      "kinres": 2,
+      "kinres": 0.2,
       "mass": 16,
       "rating": "D",
-      "thermres": 2
+      "thermres": 0.2
     },
     {
       "hullreinforcement": 230,
@@ -62,13 +62,13 @@
       "cost": 28000,
       "edID": 128668541,
       "eddbID": 1377,
-      "explres": 1.5,
+      "explres": 0.015,
       "grp": "hr",
       "id": "2a",
-      "kinres": 1.5,
+      "kinres": 0.015,
       "mass": 16,
       "rating": "E",
-      "thermres": 1.5
+      "thermres": 0.015
     },
     {
       "hullreinforcement": 260,
@@ -76,13 +76,13 @@
       "cost": 84000,
       "edID": 128668542,
       "eddbID": 1378,
-      "explres": 1.5,
+      "explres": 0.015,
       "grp": "hr",
       "id": "29",
-      "kinres": 1.5,
+      "kinres": 0.015,
       "mass": 8,
       "rating": "D",
-      "thermres": 1.5
+      "thermres": 0.015
     },
     {
       "hullreinforcement": 150,
@@ -90,13 +90,13 @@
       "cost": 12000,
       "edID": 128668539,
       "eddbID": 1375,
-      "explres": 1,
+      "explres": 0.01,
       "grp": "hr",
       "id": "28",
-      "kinres": 1,
+      "kinres": 0.01,
       "mass": 8,
       "rating": "E",
-      "thermres": 1
+      "thermres": 0.01
     },
     {
       "hullreinforcement": 190,
@@ -104,13 +104,13 @@
       "cost": 36000,
       "edID": 128668540,
       "eddbID": 1376,
-      "explres": 1,
+      "explres": 0.01,
       "grp": "hr",
       "id": "27",
-      "kinres": 1,
+      "kinres": 0.01,
       "mass": 4,
       "rating": "D",
-      "themres": 1
+      "thermres": 0.01
     },
     {
       "hullreinforcement": 80,
@@ -118,13 +118,13 @@
       "cost": 5000,
       "edID": 128668537,
       "eddbID": 1373,
-      "explres": 0.5,
+      "explres": 0.005,
       "grp": "hr",
       "id": "26",
-      "kinres": 0.5,
+      "kinres": 0.005,
       "mass": 4,
       "rating": "E",
-      "thermres": 0.5
+      "thermres": 0.005
     },
     {
       "hullreinforcement": 110,
@@ -132,13 +132,13 @@
       "cost": 15000,
       "edID": 128668538,
       "eddbID": 1374,
-      "explres": 0.5,
+      "explres": 0.005,
       "grp": "hr",
       "id": "25",
-      "kinres": 0.5,
+      "kinres": 0.005,
       "mass": 2,
       "rating": "D",
-      "thermres": 0.5
+      "thermres": 0.005
     }
   ]
 }
diff --git a/modules/internal/pristmatic_shield_generator.json b/modules/internal/pristmatic_shield_generator.json
index 2e0b2b7..8785a12 100644
--- a/modules/internal/pristmatic_shield_generator.json
+++ b/modules/internal/pristmatic_shield_generator.json
@@ -5,8 +5,10 @@
       "cost": 132200,
       "edID": 128671323,
       "eddbID": 1485,
+      "explres": 0.5,
       "grp": "psg",
       "id": "p6",
+      "kinres": 0.4,
       "mass": 2.5,
       "maxmass": 63,
       "maxmul": 2,
@@ -17,15 +19,18 @@
       "power": 2.52,
       "pp": "Aisling Duval",
       "rating": "A",
-      "recover": 1.2
+      "recover": 1.2,
+      "thermres": -0.2
     },
     {
       "class": 2,
       "cost": 240340,
       "edID": 128671324,
       "eddbID": 1486,
+      "explres": 0.5,
       "grp": "psg",
       "id": "p5",
+      "kinres": 0.4,
       "mass": 5,
       "maxmass": 138,
       "maxmul": 2,
@@ -36,15 +41,18 @@
       "power": 3.15,
       "pp": "Aisling Duval",
       "rating": "A",
-      "recover": 1.2
+      "recover": 1.2,
+      "thermres": -0.2
     },
     {
       "class": 3,
       "cost": 761870,
       "edID": 128671325,
       "eddbID": 1487,
+      "explres": 0.5,
       "grp": "psg",
       "id": "p4",
+      "kinres": 0.4,
       "mass": 10,
       "maxmass": 413,
       "maxmul": 2,
@@ -55,15 +63,18 @@
       "power": 3.78,
       "pp": "Aisling Duval",
       "rating": "A",
-      "recover": 1.2
+      "recover": 1.2,
+      "thermres": -0.2
     },
     {
       "class": 4,
       "cost": 2415120,
       "edID": 128671326,
       "eddbID": 1488,
+      "explres": 0.5,
       "grp": "psg",
       "id": "p3",
+      "kinres": 0.4,
       "mass": 20,
       "maxmass": 713,
       "maxmul": 2,
@@ -74,15 +85,18 @@
       "power": 4.62,
       "pp": "Aisling Duval",
       "rating": "A",
-      "recover": 1.425
+      "recover": 1.425,
+      "thermres": -0.2
     },
     {
       "class": 5,
       "cost": 7655930,
       "edID": 128671327,
       "eddbID": 1489,
+      "explres": 0.5,
       "grp": "psg",
       "id": "p2",
+      "kinres": 0.4,
       "mass": 40,
       "maxmass": 1013,
       "maxmul": 2,
@@ -93,15 +107,18 @@
       "power": 5.46,
       "pp": "Aisling Duval",
       "rating": "A",
-      "recover": 1.875
+      "recover": 1.875,
+      "thermres": -0.2
     },
     {
       "class": 6,
       "cost": 24269300,
       "edID": 128671328,
       "eddbID": 1490,
+      "explres": 0.5,
       "grp": "psg",
       "id": "p1",
+      "kinres": 0.4,
       "mass": 80,
       "maxmass": 1350,
       "maxmul": 2,
@@ -112,15 +129,18 @@
       "power": 6.51,
       "pp": "Aisling Duval",
       "rating": "A",
-      "recover": 2.4
+      "recover": 2.4,
+      "thermres": -0.2
     },
     {
       "class": 7,
       "cost": 76933670,
       "edID": 128671329,
       "eddbID": 1491,
+      "explres": 0.5,
       "grp": "psg",
       "id": "p0",
+      "kinres": 0.4,
       "mass": 160,
       "maxmass": 2650,
       "maxmul": 2,
@@ -131,15 +151,18 @@
       "power": 7.35,
       "pp": "Aisling Duval",
       "rating": "A",
-      "recover": 3
+      "recover": 3,
+      "thermres": -0.2
     },
     {
       "class": 8,
       "cost": 243879730,
       "edID": 128671330,
       "eddbID": 1492,
+      "explres": 0.5,
       "grp": "psg",
       "id": "p7",
+      "kinres": 0.4,
       "mass": 320,
       "maxmass": 4500,
       "maxmul": 2,
@@ -150,7 +173,8 @@
       "power": 8.4,
       "pp": "Aisling Duval",
       "rating": "A",
-      "recover": 3.6
+      "recover": 3.6,
+      "thermres": -0.2
     }
   ]
 }
diff --git a/modules/internal/shield_cell_bank.json b/modules/internal/shield_cell_bank.json
index e7e5f7a..a866bae 100644
--- a/modules/internal/shield_cell_bank.json
+++ b/modules/internal/shield_cell_bank.json
@@ -15,7 +15,7 @@
       "mass": 160,
       "power": 1.44,
       "rating": "E",
-      "recharge": 476,
+      "shieldreinforcement": 476,
       "rechargerating": "C",
       "spinup": 5,
       "thermload": 800
@@ -35,7 +35,7 @@
       "mass": 64,
       "power": 1.92,
       "rating": "D",
-      "recharge": 629,
+      "shieldreinforcement": 629,
       "rechargerating": "D",
       "spinup": 5,
       "thermload": 800
@@ -55,7 +55,7 @@
       "mass": 160,
       "power": 2.4,
       "rating": "C",
-      "recharge": 799,
+      "shieldreinforcement": 799,
       "rechargerating": "C",
       "spinup": 5,
       "thermload": 800
@@ -75,7 +75,7 @@
       "mass": 256,
       "power": 2.88,
       "rating": "B",
-      "recharge": 952,
+      "shieldreinforcement": 952,
       "rechargerating": "B",
       "spinup": 5,
       "thermload": 800
@@ -95,7 +95,7 @@
       "mass": 160,
       "power": 3.36,
       "rating": "A",
-      "recharge": 1105,
+      "shieldreinforcement": 1105,
       "rechargerating": "A",
       "spinup": 5,
       "thermload": 800
@@ -115,7 +115,7 @@
       "mass": 80,
       "power": 1.24,
       "rating": "E",
-      "recharge": 264,
+      "shieldreinforcement": 264,
       "rechargerating": "E",
       "spinup": 5,
       "thermload": 720
@@ -135,7 +135,7 @@
       "mass": 32,
       "power": 1.66,
       "rating": "D",
-      "recharge": 352,
+      "shieldreinforcement": 352,
       "rechargerating": "D",
       "spinup": 5,
       "thermload": 720
@@ -155,7 +155,7 @@
       "mass": 80,
       "power": 2.07,
       "rating": "C",
-      "recharge": 451,
+      "shieldreinforcement": 451,
       "rechargerating": "C",
       "spinup": 5,
       "thermload": 720
@@ -175,7 +175,7 @@
       "mass": 128,
       "power": 2.48,
       "rating": "B",
-      "recharge": 539,
+      "shieldreinforcement": 539,
       "rechargerating": "B",
       "spinup": 5,
       "thermload": 720
@@ -195,7 +195,7 @@
       "mass": 80,
       "power": 2.9,
       "rating": "A",
-      "recharge": 627,
+      "shieldreinforcement": 627,
       "rechargerating": "A",
       "spinup": 5,
       "thermload": 720
@@ -215,7 +215,7 @@
       "mass": 40,
       "power": 1.06,
       "rating": "E",
-      "recharge": 160,
+      "shieldreinforcement": 160,
       "rechargerating": "E",
       "spinup": 5,
       "thermload": 640
@@ -235,7 +235,7 @@
       "mass": 16,
       "power": 1.42,
       "rating": "D",
-      "recharge": 208,
+      "shieldreinforcement": 208,
       "rechargerating": "D",
       "spinup": 5,
       "thermload": 640
@@ -255,7 +255,7 @@
       "mass": 40,
       "power": 1.77,
       "rating": "C",
-      "recharge": 264,
+      "shieldreinforcement": 264,
       "rechargerating": "C",
       "spinup": 5,
       "thermload": 640
@@ -275,7 +275,7 @@
       "mass": 64,
       "power": 2.12,
       "rating": "B",
-      "recharge": 312,
+      "shieldreinforcement": 312,
       "rechargerating": "B",
       "spinup": 5,
       "thermload": 640
@@ -295,7 +295,7 @@
       "mass": 40,
       "power": 2.48,
       "rating": "A",
-      "recharge": 368,
+      "shieldreinforcement": 368,
       "rechargerating": "A",
       "spinup": 5,
       "thermload": 640
@@ -315,7 +315,7 @@
       "mass": 20,
       "power": 0.9,
       "rating": "E",
-      "recharge": 105,
+      "shieldreinforcement": 105,
       "rechargerating": "E",
       "spinup": 5,
       "thermload": 540
@@ -335,7 +335,7 @@
       "mass": 8,
       "power": 1.2,
       "rating": "D",
-      "recharge": 140,
+      "shieldreinforcement": 140,
       "rechargerating": "D",
       "spinup": 5,
       "thermload": 540
@@ -355,7 +355,7 @@
       "mass": 20,
       "power": 1.5,
       "rating": "C",
-      "recharge": 175,
+      "shieldreinforcement": 175,
       "rechargerating": "C",
       "spinup": 5,
       "thermload": 540
@@ -375,7 +375,7 @@
       "mass": 32,
       "power": 1.8,
       "rating": "B",
-      "recharge": 205,
+      "shieldreinforcement": 205,
       "rechargerating": "B",
       "spinup": 5,
       "thermload": 540
@@ -395,7 +395,7 @@
       "mass": 20,
       "power": 2.1,
       "rating": "A",
-      "recharge": 240,
+      "shieldreinforcement": 240,
       "rechargerating": "A",
       "spinup": 5,
       "thermload": 540
@@ -415,7 +415,7 @@
       "mass": 10,
       "power": 0.74,
       "rating": "E",
-      "recharge": 60,
+      "shieldreinforcement": 60,
       "rechargerating": "E",
       "spinup": 5,
       "thermload": 410
@@ -435,7 +435,7 @@
       "mass": 4,
       "power": 0.98,
       "rating": "D",
-      "recharge": 78,
+      "shieldreinforcement": 78,
       "rechargerating": "D",
       "spinup": 5,
       "thermload": 410
@@ -455,7 +455,7 @@
       "mass": 10,
       "power": 1.23,
       "rating": "C",
-      "recharge": 99,
+      "shieldreinforcement": 99,
       "rechargerating": "C",
       "spinup": 5,
       "thermload": 410
@@ -475,7 +475,7 @@
       "mass": 16,
       "power": 1.48,
       "rating": "B",
-      "recharge": 117,
+      "shieldreinforcement": 117,
       "rechargerating": "B",
       "spinup": 5,
       "thermload": 410
@@ -495,7 +495,7 @@
       "mass": 10,
       "power": 1.72,
       "rating": "A",
-      "recharge": 138,
+      "shieldreinforcement": 138,
       "rechargerating": "A",
       "spinup": 5,
       "thermload": 410
@@ -515,7 +515,7 @@
       "mass": 5,
       "power": 0.61,
       "rating": "E",
-      "recharge": 34,
+      "shieldreinforcement": 34,
       "rechargerating": "E",
       "spinup": 5,
       "thermload": 340
@@ -535,7 +535,7 @@
       "mass": 2,
       "power": 0.82,
       "rating": "D",
-      "recharge": 46,
+      "shieldreinforcement": 46,
       "rechargerating": "D",
       "spinup": 5,
       "thermload": 340
@@ -555,7 +555,7 @@
       "mass": 5,
       "power": 1.02,
       "rating": "C",
-      "recharge": 58,
+      "shieldreinforcement": 58,
       "rechargerating": "C",
       "spinup": 5,
       "thermload": 340
@@ -575,7 +575,7 @@
       "mass": 8,
       "power": 1.22,
       "rating": "B",
-      "recharge": 70,
+      "shieldreinforcement": 70,
       "rechargerating": "B",
       "spinup": 5,
       "thermload": 340
@@ -595,7 +595,7 @@
       "mass": 5,
       "power": 1.43,
       "rating": "A",
-      "recharge": 82,
+      "shieldreinforcement": 82,
       "rechargerating": "A",
       "spinup": 5,
       "thermload": 340
@@ -615,7 +615,7 @@
       "mass": 2.5,
       "power": 0.5,
       "rating": "E",
-      "recharge": 28,
+      "shieldreinforcement": 28,
       "rechargerating": "E",
       "spinup": 5,
       "thermload": 240
@@ -635,7 +635,7 @@
       "mass": 1,
       "power": 0.67,
       "rating": "D",
-      "recharge": 36,
+      "shieldreinforcement": 36,
       "rechargerating": "D",
       "spinup": 5,
       "thermload": 240
@@ -655,7 +655,7 @@
       "mass": 2.5,
       "power": 0.84,
       "rating": "C",
-      "recharge": 46,
+      "shieldreinforcement": 46,
       "rechargerating": "C",
       "spinup": 5,
       "thermload": 240
@@ -675,7 +675,7 @@
       "mass": 4,
       "power": 1.01,
       "rating": "B",
-      "recharge": 56,
+      "shieldreinforcement": 56,
       "rechargerating": "B",
       "spinup": 5,
       "thermload": 240
@@ -695,7 +695,7 @@
       "mass": 2.5,
       "power": 1.18,
       "rating": "A",
-      "recharge": 64,
+      "shieldreinforcement": 64,
       "rechargerating": "A",
       "spinup": 5,
       "thermload": 240
@@ -715,7 +715,7 @@
       "mass": 1.3,
       "power": 0.41,
       "rating": "E",
-      "recharge": 12,
+      "shieldreinforcement": 12,
       "rechargerating": "E",
       "spinup": 5,
       "thermload": 170
@@ -735,7 +735,7 @@
       "mass": 0.5,
       "power": 0.55,
       "rating": "D",
-      "recharge": 12.5,
+      "shieldreinforcement": 12.5,
       "rechargerating": "D",
       "spinup": 5,
       "thermload": 170
@@ -755,7 +755,7 @@
       "mass": 1.3,
       "power": 0.69,
       "rating": "C",
-      "recharge": 20,
+      "shieldreinforcement": 20,
       "rechargerating": "C",
       "spinup": 5,
       "thermload": 170
@@ -775,7 +775,7 @@
       "mass": 2,
       "power": 0.83,
       "rating": "B",
-      "recharge": 24,
+      "shieldreinforcement": 24,
       "rechargerating": "B",
       "spinup": 5,
       "thermload": 170
@@ -795,7 +795,7 @@
       "mass": 1.3,
       "power": 0.97,
       "rating": "A",
-      "recharge": 28,
+      "shieldreinforcement": 28,
       "rechargerating": "A",
       "spinup": 5,
       "thermload": 170
diff --git a/modules/internal/shield_generator.json b/modules/internal/shield_generator.json
index 8386291..3888fa8 100644
--- a/modules/internal/shield_generator.json
+++ b/modules/internal/shield_generator.json
@@ -5,8 +5,10 @@
       "cost": 2007240,
       "edID": 128064293,
       "eddbID": 1146,
+      "explres": 0.5,
       "grp": "sg",
       "id": "4t",
+      "kinres": 0.4,
       "mass": 160,
       "maxmass": 4500,
       "maxmul": 1.3,
@@ -16,15 +18,18 @@
       "optmul": 0.8,
       "power": 2.4,
       "rating": "E",
-      "recover": 4.8
+      "recover": 4.8,
+      "thermres": -0.2
     },
     {
       "class": 8,
       "cost": 6021720,
       "edID": 128064294,
       "eddbID": 1147,
+      "explres": 0.5,
       "grp": "sg",
       "id": "4s",
+      "kinres": 0.4,
       "mass": 64,
       "maxmass": 4500,
       "maxmul": 1.4,
@@ -34,15 +39,18 @@
       "optmul": 0.9,
       "power": 3.2,
       "rating": "D",
-      "recover": 4.8
+      "recover": 4.8,
+      "thermres": -0.2
     },
     {
       "class": 8,
       "cost": 18065170,
       "edID": 128064295,
       "eddbID": 1148,
+      "explres": 0.5,
       "grp": "sg",
       "id": "4r",
+      "kinres": 0.4,
       "mass": 160,
       "maxmass": 4500,
       "maxmul": 1.5,
@@ -52,15 +60,18 @@
       "optmul": 1,
       "power": 4,
       "rating": "C",
-      "recover": 4.8
+      "recover": 4.8,
+      "thermres": -0.2
     },
     {
       "class": 8,
       "cost": 54195500,
       "edID": 128064296,
       "eddbID": 1149,
+      "explres": 0.5,
       "grp": "sg",
       "id": "4q",
+      "kinres": 0.4,
       "mass": 256,
       "maxmass": 4500,
       "maxmul": 1.6,
@@ -70,15 +81,18 @@
       "optmul": 1.1,
       "power": 4.8,
       "rating": "B",
-      "recover": 4.8
+      "recover": 4.8,
+      "thermres": -0.2
     },
     {
       "class": 8,
       "cost": 162586490,
       "edID": 128064297,
       "eddbID": 1150,
+      "explres": 0.5,
       "grp": "sg",
       "id": "4p",
+      "kinres": 0.4,
       "mass": 160,
       "maxmass": 4500,
       "maxmul": 1.7,
@@ -88,15 +102,18 @@
       "optmul": 1.2,
       "power": 5.6,
       "rating": "A",
-      "recover": 4.8
+      "recover": 4.8,
+      "thermres": -0.2
     },
     {
       "class": 7,
       "cost": 633200,
       "edID": 128064288,
       "eddbID": 1141,
+      "explres": 0.5,
       "grp": "sg",
       "id": "4o",
+      "kinres": 0.4,
       "mass": 80,
       "maxmass": 2650,
       "maxmul": 1.3,
@@ -106,15 +123,18 @@
       "optmul": 0.8,
       "power": 2.1,
       "rating": "E",
-      "recover": 4
+      "recover": 4,
+      "thermres": -0.2
     },
     {
       "class": 7,
       "cost": 1899600,
       "edID": 128064289,
       "eddbID": 1142,
+      "explres": 0.5,
       "grp": "sg",
       "id": "4n",
+      "kinres": 0.4,
       "mass": 32,
       "maxmass": 2650,
       "maxmul": 1.4,
@@ -124,15 +144,18 @@
       "optmul": 0.9,
       "power": 2.8,
       "rating": "D",
-      "recover": 4
+      "recover": 4,
+      "thermres": -0.2
     },
     {
       "class": 7,
       "cost": 5698790,
       "edID": 128064290,
       "eddbID": 1143,
+      "explres": 0.5,
       "grp": "sg",
       "id": "4m",
+      "kinres": 0.4,
       "mass": 80,
       "maxmass": 2650,
       "maxmul": 1.5,
@@ -142,15 +165,18 @@
       "optmul": 1,
       "power": 3.5,
       "rating": "C",
-      "recover": 4
+      "recover": 4,
+      "thermres": -0.2
     },
     {
       "class": 7,
       "cost": 17096370,
       "edID": 128064291,
       "eddbID": 1144,
+      "explres": 0.5,
       "grp": "sg",
       "id": "4l",
+      "kinres": 0.4,
       "mass": 128,
       "maxmass": 2650,
       "maxmul": 1.6,
@@ -160,15 +186,18 @@
       "optmul": 1.1,
       "power": 4.2,
       "rating": "B",
-      "recover": 4
+      "recover": 4,
+      "thermres": -0.2
     },
     {
       "class": 7,
       "cost": 51289110,
       "edID": 128064292,
       "eddbID": 1145,
+      "explres": 0.5,
       "grp": "sg",
       "id": "4k",
+      "kinres": 0.4,
       "mass": 80,
       "maxmass": 2650,
       "maxmul": 1.7,
@@ -178,15 +207,18 @@
       "optmul": 1.2,
       "power": 4.9,
       "rating": "A",
-      "recover": 4
+      "recover": 4,
+      "thermres": -0.2
     },
     {
       "class": 6,
       "cost": 199750,
       "edID": 128064283,
       "eddbID": 1136,
+      "explres": 0.5,
       "grp": "sg",
       "id": "4j",
+      "kinres": 0.4,
       "mass": 40,
       "maxmass": 1350,
       "maxmul": 1.3,
@@ -196,15 +228,18 @@
       "optmul": 0.8,
       "power": 1.86,
       "rating": "E",
-      "recover": 3.2
+      "recover": 3.2,
+      "thermres": -0.2
     },
     {
       "class": 6,
       "cost": 599240,
       "edID": 128064284,
       "eddbID": 1137,
+      "explres": 0.5,
       "grp": "sg",
       "id": "4i",
+      "kinres": 0.4,
       "mass": 16,
       "maxmass": 1350,
       "maxmul": 1.4,
@@ -214,15 +249,18 @@
       "optmul": 0.9,
       "power": 2.48,
       "rating": "D",
-      "recover": 3.2
+      "recover": 3.2,
+      "thermres": -0.2
     },
     {
       "class": 6,
       "cost": 1797730,
       "edID": 128064285,
       "eddbID": 1138,
+      "explres": 0.5,
       "grp": "sg",
       "id": "4h",
+      "kinres": 0.4,
       "mass": 40,
       "maxmass": 1350,
       "maxmul": 1.5,
@@ -232,15 +270,18 @@
       "optmul": 1,
       "power": 3.1,
       "rating": "C",
-      "recover": 3.2
+      "recover": 3.2,
+      "thermres": -0.2
     },
     {
       "class": 6,
       "cost": 5393180,
       "edID": 128064286,
       "eddbID": 1139,
+      "explres": 0.5,
       "grp": "sg",
       "id": "4g",
+      "kinres": 0.4,
       "mass": 64,
       "maxmass": 1350,
       "maxmul": 1.6,
@@ -250,15 +291,18 @@
       "optmul": 1.1,
       "power": 3.72,
       "rating": "B",
-      "recover": 3.2
+      "recover": 3.2,
+      "thermres": -0.2
     },
     {
       "class": 6,
       "cost": 16179530,
       "edID": 128064287,
       "eddbID": 1140,
+      "explres": 0.5,
       "grp": "sg",
       "id": "4f",
+      "kinres": 0.4,
       "mass": 40,
       "maxmass": 1350,
       "maxmul": 1.7,
@@ -268,15 +312,18 @@
       "optmul": 1.2,
       "power": 4.34,
       "rating": "A",
-      "recover": 3.2
+      "recover": 3.2,
+      "thermres": -0.2
     },
     {
       "class": 5,
       "cost": 63010,
       "edID": 128064278,
       "eddbID": 1131,
+      "explres": 0.5,
       "grp": "sg",
       "id": "4e",
+      "kinres": 0.4,
       "mass": 20,
       "maxmass": 1013,
       "maxmul": 1.3,
@@ -286,15 +333,18 @@
       "optmul": 0.8,
       "power": 1.56,
       "rating": "E",
-      "recover": 2.5
+      "recover": 2.5,
+      "thermres": -0.2
     },
     {
       "class": 5,
       "cost": 189040,
       "edID": 128064279,
       "eddbID": 1132,
+      "explres": 0.5,
       "grp": "sg",
       "id": "4d",
+      "kinres": 0.4,
       "mass": 8,
       "maxmass": 1013,
       "maxmul": 1.4,
@@ -304,15 +354,18 @@
       "optmul": 0.9,
       "power": 2.08,
       "rating": "D",
-      "recover": 2.5
+      "recover": 2.5,
+      "thermres": -0.2
     },
     {
       "class": 5,
       "cost": 567110,
       "edID": 128064280,
       "eddbID": 1133,
+      "explres": 0.5,
       "grp": "sg",
       "id": "4c",
+      "kinres": 0.4,
       "mass": 20,
       "maxmass": 1013,
       "maxmul": 1.5,
@@ -322,15 +375,18 @@
       "optmul": 1,
       "power": 2.6,
       "rating": "C",
-      "recover": 2.5
+      "recover": 2.5,
+      "thermres": -0.2
     },
     {
       "class": 5,
       "cost": 1701320,
       "edID": 128064281,
       "eddbID": 1134,
+      "explres": 0.5,
       "grp": "sg",
       "id": "4b",
+      "kinres": 0.4,
       "mass": 32,
       "maxmass": 1013,
       "maxmul": 1.6,
@@ -340,15 +396,18 @@
       "optmul": 1.1,
       "power": 3.12,
       "rating": "B",
-      "recover": 2.5
+      "recover": 2.5,
+      "thermres": -0.2
     },
     {
       "class": 5,
       "cost": 5103950,
       "edID": 128064282,
       "eddbID": 1135,
+      "explres": 0.5,
       "grp": "sg",
       "id": "4a",
+      "kinres": 0.4,
       "mass": 20,
       "maxmass": 1013,
       "maxmul": 1.7,
@@ -358,15 +417,18 @@
       "optmul": 1.2,
       "power": 3.64,
       "rating": "A",
-      "recover": 2.5
+      "recover": 2.5,
+      "thermres": -0.2
     },
     {
       "class": 4,
       "cost": 19880,
       "edID": 128064273,
       "eddbID": 1126,
+      "explres": 0.5,
       "grp": "sg",
       "id": "49",
+      "kinres": 0.4,
       "mass": 10,
       "maxmass": 713,
       "maxmul": 1.3,
@@ -376,15 +438,18 @@
       "optmul": 0.8,
       "power": 1.32,
       "rating": "E",
-      "recover": 1.9
+      "recover": 1.9,
+      "thermres": -0.2
     },
     {
       "class": 4,
       "cost": 59630,
       "edID": 128064274,
       "eddbID": 1127,
+      "explres": 0.5,
       "grp": "sg",
       "id": "48",
+      "kinres": 0.4,
       "mass": 4,
       "maxmass": 713,
       "maxmul": 1.4,
@@ -394,15 +459,18 @@
       "optmul": 0.9,
       "power": 1.76,
       "rating": "D",
-      "recover": 1.9
+      "recover": 1.9,
+      "thermres": -0.2
     },
     {
       "class": 4,
       "cost": 178900,
       "edID": 128064275,
       "eddbID": 1128,
+      "explres": 0.5,
       "grp": "sg",
       "id": "47",
+      "kinres": 0.4,
       "mass": 10,
       "maxmass": 713,
       "maxmul": 1.5,
@@ -412,15 +480,18 @@
       "optmul": 1,
       "power": 2.2,
       "rating": "C",
-      "recover": 1.9
+      "recover": 1.9,
+      "thermres": -0.2
     },
     {
       "class": 4,
       "cost": 536690,
       "edID": 128064276,
       "eddbID": 1129,
+      "explres": 0.5,
       "grp": "sg",
       "id": "46",
+      "kinres": 0.4,
       "mass": 16,
       "maxmass": 713,
       "maxmul": 1.6,
@@ -430,15 +501,18 @@
       "optmul": 1.1,
       "power": 2.64,
       "rating": "B",
-      "recover": 1.9
+      "recover": 1.9,
+      "thermres": -0.2
     },
     {
       "class": 4,
       "cost": 1610080,
       "edID": 128064277,
       "eddbID": 1130,
+      "explres": 0.5,
       "grp": "sg",
       "id": "45",
+      "kinres": 0.4,
       "mass": 10,
       "maxmass": 713,
       "maxmul": 1.7,
@@ -448,15 +522,18 @@
       "optmul": 1.2,
       "power": 3.08,
       "rating": "A",
-      "recover": 1.9
+      "recover": 1.9,
+      "thermres": -0.2
     },
     {
       "class": 3,
       "cost": 6270,
       "edID": 128064268,
       "eddbID": 1121,
+      "explres": 0.5,
       "grp": "sg",
       "id": "44",
+      "kinres": 0.4,
       "mass": 5,
       "maxmass": 413,
       "maxmul": 1.3,
@@ -466,15 +543,18 @@
       "optmul": 0.8,
       "power": 1.08,
       "rating": "E",
-      "recover": 1.6
+      "recover": 1.6,
+      "thermres": -0.2
     },
     {
       "class": 3,
       "cost": 18810,
       "edID": 128064269,
       "eddbID": 1122,
+      "explres": 0.5,
       "grp": "sg",
       "id": "43",
+      "kinres": 0.4,
       "mass": 2,
       "maxmass": 413,
       "maxmul": 1.4,
@@ -484,15 +564,18 @@
       "optmul": 0.9,
       "power": 1.44,
       "rating": "D",
-      "recover": 1.6
+      "recover": 1.6,
+      "thermres": -0.2
     },
     {
       "class": 3,
       "cost": 56440,
       "edID": 128064270,
       "eddbID": 1123,
+      "explres": 0.5,
       "grp": "sg",
       "id": "42",
+      "kinres": 0.4,
       "mass": 5,
       "maxmass": 413,
       "maxmul": 1.5,
@@ -502,15 +585,18 @@
       "optmul": 1,
       "power": 1.8,
       "rating": "C",
-      "recover": 1.6
+      "recover": 1.6,
+      "thermres": -0.2
     },
     {
       "class": 3,
       "cost": 169300,
       "edID": 128064271,
       "eddbID": 1124,
+      "explres": 0.5,
       "grp": "sg",
       "id": "41",
+      "kinres": 0.4,
       "mass": 8,
       "maxmass": 413,
       "maxmul": 1.6,
@@ -520,15 +606,18 @@
       "optmul": 1.1,
       "power": 2.16,
       "rating": "B",
-      "recover": 1.6
+      "recover": 1.6,
+      "thermres": -0.2
     },
     {
       "class": 3,
       "cost": 507910,
       "edID": 128064272,
       "eddbID": 1125,
+      "explres": 0.5,
       "grp": "sg",
       "id": "40",
+      "kinres": 0.4,
       "mass": 5,
       "maxmass": 413,
       "maxmul": 1.7,
@@ -538,15 +627,18 @@
       "optmul": 1.2,
       "power": 2.52,
       "rating": "A",
-      "recover": 1.6
+      "recover": 1.6,
+      "thermres": -0.2
     },
     {
       "class": 2,
       "cost": 1980,
       "edID": 128064263,
       "eddbID": 1116,
+      "explres": 0.5,
       "grp": "sg",
       "id": "3v",
+      "kinres": 0.4,
       "mass": 2.5,
       "maxmass": 138,
       "maxmul": 1.3,
@@ -556,15 +648,18 @@
       "optmul": 0.8,
       "power": 0.9,
       "rating": "E",
-      "recover": 1.6
+      "recover": 1.6,
+      "thermres": -0.2
     },
     {
       "class": 2,
       "cost": 5930,
       "edID": 128064264,
       "eddbID": 1117,
+      "explres": 0.5,
       "grp": "sg",
       "id": "3u",
+      "kinres": 0.4,
       "mass": 1,
       "maxmass": 138,
       "maxmul": 1.4,
@@ -574,15 +669,18 @@
       "optmul": 0.9,
       "power": 1.2,
       "rating": "D",
-      "recover": 1.6
+      "recover": 1.6,
+      "thermres": -0.2
     },
     {
       "class": 2,
       "cost": 17800,
       "edID": 128064265,
       "eddbID": 1118,
+      "explres": 0.5,
       "grp": "sg",
       "id": "3t",
+      "kinres": 0.4,
       "mass": 2.5,
       "maxmass": 138,
       "maxmul": 1.5,
@@ -592,15 +690,18 @@
       "optmul": 1,
       "power": 1.5,
       "rating": "C",
-      "recover": 1.6
+      "recover": 1.6,
+      "thermres": -0.2
     },
     {
       "class": 2,
       "cost": 53410,
       "edID": 128064266,
       "eddbID": 1119,
+      "explres": 0.5,
       "grp": "sg",
       "id": "3s",
+      "kinres": 0.4,
       "mass": 4,
       "maxmass": 138,
       "maxmul": 1.6,
@@ -610,15 +711,18 @@
       "optmul": 1.1,
       "power": 1.8,
       "rating": "B",
-      "recover": 1.6
+      "recover": 1.6,
+      "thermres": -0.2
     },
     {
       "class": 2,
       "cost": 160220,
       "edID": 128064267,
       "eddbID": 1120,
+      "explres": 0.5,
       "grp": "sg",
       "id": "3r",
+      "kinres": 0.4,
       "mass": 2.5,
       "maxmass": 138,
       "maxmul": 1.7,
@@ -628,15 +732,18 @@
       "optmul": 1.2,
       "power": 2.1,
       "rating": "A",
-      "recover": 1.6
+      "recover": 1.6,
+      "thermres": -0.2
     },
     {
       "class": 1,
       "cost": 88075,
       "edID": 128064262,
       "eddbID": 1551,
+      "explres": 0.5,
       "grp": "sg",
       "id": "1x",
+      "kinres": 0.4,
       "mass": 1.3,
       "maxmass": 63,
       "maxmul": 1.7,
@@ -646,7 +753,8 @@
       "optmul": 1.2,
       "power": 1.68,
       "rating": "A",
-      "recover": 1
+      "recover": 1,
+      "thermres": -0.2
     }
   ]
 }
diff --git a/modules/standard/thrusters.json b/modules/standard/thrusters.json
index 2e09108..84f071c 100644
--- a/modules/standard/thrusters.json
+++ b/modules/standard/thrusters.json
@@ -118,7 +118,7 @@
       "integrity": 105,
       "mass": 32,
       "maxmass": 2430,
-      "maxmul": 1.86,
+      "maxmul": 1.06,
       "minmass": 810,
       "minmul": 0.86,
       "optmass": 1620,
diff --git a/ships/adder.json b/ships/adder.json
index d1528a8..5642773 100755
--- a/ships/adder.json
+++ b/ships/adder.json
@@ -19,9 +19,9 @@
     },
     "retailCost": 87810,
     "bulkheads": [
-      { "id": "BC", "edID": 128049268, "eddbID": 753, "grp": "bh", "cost": 0, "mass": 0, "explres": -0.4, "kinres": -0.2, "thermres": 0.2, "hullboost": 0.8 },
-      { "id": "BD", "edID": 128049269, "eddbID": 754, "grp": "bh", "cost": 35120, "mass": 3, "explres": -0.4, "kinres": 0.2, "thermres": 0, "hullboost": 1.52 },
-      { "id": "BE", "edID": 128049270, "eddbID": 755, "grp": "bh", "cost": 79030, "mass": 5, "explres": -0.4, "kinres": 0.2, "thermres": 0, "hullboost": 2.5 },
+      { "id": "BC", "edID": 128049268, "eddbID": 753, "grp": "bh", "cost": 0, "mass": 0, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 0.8 },
+      { "id": "BD", "edID": 128049269, "eddbID": 754, "grp": "bh", "cost": 35120, "mass": 3, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 1.52 },
+      { "id": "BE", "edID": 128049270, "eddbID": 755, "grp": "bh", "cost": 79030, "mass": 5, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 2.5 },
       { "id": "BF", "edID": 128049271, "eddbID": 756, "grp": "bh", "cost": 186770, "mass": 5, "explres": -0.5, "kinres": -0.75, "thermres": 0.5, "hullboost": 2.5 },
       { "id": "BG", "edID": 128049272, "eddbID": 757, "grp": "bh", "cost": 206960, "mass": 5, "explres": 0.2, "kinres": 0.25, "thermres": -0.4, "hullboost": 2.5  }
     ],
diff --git a/ships/anaconda.json b/ships/anaconda.json
index 49c8480..2d1599e 100755
--- a/ships/anaconda.json
+++ b/ships/anaconda.json
@@ -20,9 +20,9 @@
     },
     "retailCost": 146969450,
     "bulkheads": [
-      { "id": "bT", "edID": 128049364, "eddbID": 818, "grp": "bh", "cost": 0, "mass": 0, "explres": -0.4, "kinres": -0.2, "thermres": 0.2, "hullboost": 0.8 },
-      { "id": "bU", "edID": 128049365, "eddbID": 819, "grp": "bh", "cost": 58787780, "mass": 30, "explres": -0.4, "kinres": 0.2, "thermres": 0, "hullboost": 1.52 },
-      { "id": "bV", "edID": 128049366, "eddbID": 820, "grp": "bh", "cost": 132272510, "mass": 60, "explres": -0.4, "kinres": 0.2, "thermres": 0, "hullboost": 2.5 },
+      { "id": "bT", "edID": 128049364, "eddbID": 818, "grp": "bh", "cost": 0, "mass": 0, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 0.8 },
+      { "id": "bU", "edID": 128049365, "eddbID": 819, "grp": "bh", "cost": 58787780, "mass": 30, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 1.52 },
+      { "id": "bV", "edID": 128049366, "eddbID": 820, "grp": "bh", "cost": 132272510, "mass": 60, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 2.5 },
       { "id": "bW", "edID": 128049367, "eddbID": 821, "grp": "bh", "cost": 312604020, "mass": 60, "explres": -0.5, "kinres": -0.75, "thermres": 0.5, "hullboost": 2.5  },
       { "id": "bX", "edID": 128049368, "eddbID": 822, "grp": "bh", "cost": 346407000, "mass": 60, "explres": 0.2, "kinres": 0.25, "thermres": -0.4, "hullboost": 2.5 }
     ],
diff --git a/ships/asp.json b/ships/asp.json
index 316468d..f6f19ab 100755
--- a/ships/asp.json
+++ b/ships/asp.json
@@ -19,9 +19,9 @@
     },
     "retailCost": 6661150,
     "bulkheads": [
-      { "id": "BH", "edID": 128049304, "eddbID": 778, "grp": "bh", "cost": 0, "mass": 0, "explres": -0.4, "kinres": -0.2, "thermres": 0.2, "hullboost": 0.8 },
-      { "id": "BI", "edID": 128049305, "eddbID": 779, "grp": "bh", "cost": 2664460, "mass": 21, "explres": -0.4, "kinres": 0.2, "thermres": 0, "hullboost": 1.52 },
-      { "id": "BJ", "edID": 128049306, "eddbID": 780, "grp": "bh", "cost": 5995040, "mass": 42, "explres": -0.4, "kinres": 0.2, "thermres": 0, "hullboost": 2.5 },
+      { "id": "BH", "edID": 128049304, "eddbID": 778, "grp": "bh", "cost": 0, "mass": 0, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 0.8 },
+      { "id": "BI", "edID": 128049305, "eddbID": 779, "grp": "bh", "cost": 2664460, "mass": 21, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 1.52 },
+      { "id": "BJ", "edID": 128049306, "eddbID": 780, "grp": "bh", "cost": 5995040, "mass": 42, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 2.5 },
       { "id": "BK", "edID": 128049307, "eddbID": 781, "grp": "bh", "cost": 14168270, "mass": 42, "explres": -0.5, "kinres": -0.75, "thermres": 0.5, "hullboost": 2.5  },
       { "id": "BL", "edID": 128049308, "eddbID": 782, "grp": "bh", "cost": 15700340, "mass": 42, "explres": 0.2, "kinres": 0.25, "thermres": -0.4, "hullboost": 2.5 }
     ],
diff --git a/ships/asp_scout.json b/ships/asp_scout.json
index c3b8dec..ae58c7c 100644
--- a/ships/asp_scout.json
+++ b/ships/asp_scout.json
@@ -1,6 +1,7 @@
 {
   "asp_scout": {
-    "edID": 128672276, "eddbID": 24,
+    "edID": 128672276,
+    "eddbID": 24,
     "properties": {
       "name": "Asp Scout",
       "manufacturer": "Lakon",
@@ -18,9 +19,9 @@
     },
     "retailCost": 3961150,
     "bulkheads": [
-      { "id": "c1", "edID": 128672278, "eddbID": 1503, "grp": "bh", "cost": 0, "mass": 0, "explres": -0.4, "kinres": -0.2, "thermres": 0.2, "hullboost": 0.8 },
-      { "id": "c2", "edID": 128672279, "eddbID": 1504, "grp": "bh", "cost": 1584460, "mass": 21, "explres": -0.4, "kinres": 0.2, "thermres": 0, "hullboost": 1.52 },
-      { "id": "c3", "edID": 128672280, "eddbID": 1505, "grp": "bh", "cost": 3565040, "mass": 42, "explres": -0.4, "kinres": 0.2, "thermres": 0, "hullboost": 2.5 },
+      { "id": "c1", "edID": 128672278, "eddbID": 1503, "grp": "bh", "cost": 0, "mass": 0, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 0.8 },
+      { "id": "c2", "edID": 128672279, "eddbID": 1504, "grp": "bh", "cost": 1584460, "mass": 21, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 1.52 },
+      { "id": "c3", "edID": 128672280, "eddbID": 1505, "grp": "bh", "cost": 3565040, "mass": 42, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 2.5 },
       { "id": "c4", "edID": 128672281, "eddbID": 1506, "grp": "bh", "cost": 8425380, "mass": 42, "explres": -0.5, "kinres": -0.75, "thermres": 0.5, "hullboost": 2.5  },
       { "id": "c5", "edID": 128672282, "eddbID": 1507, "grp": "bh", "cost": 9336440, "mass": 42, "explres": 0.2, "kinres": 0.25, "thermres": -0.4, "hullboost": 2.5 }
     ],
diff --git a/ships/beluga.json b/ships/beluga.json
index 1e2a2e9..6335210 100755
--- a/ships/beluga.json
+++ b/ships/beluga.json
@@ -21,9 +21,9 @@
     },
     "retailCost": 84532770,
     "bulkheads": [
-      { "id": "cl", "edID": 128049346, "eddbID": 1554,"grp": "bh", "cost": 0, "mass": 0, "explres": -0.4, "kinres": -0.2, "thermres": 0.2, "hullboost": 0.8 },
-      { "id": "cm", "edID": 128049347, "eddbID": 1555,"grp": "bh", "cost": 33813120, "mass": 83, "explres": -0.4, "kinres": 0.2, "thermres": 0, "hullboost": 1.52 },
-      { "id": "cn", "edID": 128049348, "eddbID": 1556,"grp": "bh", "cost": 76079500, "mass": 165, "explres": -0.4, "kinres": 0.2, "thermres": 0, "hullboost": 2.5 },
+      { "id": "cl", "edID": 128049346, "eddbID": 1554,"grp": "bh", "cost": 0, "mass": 0, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 0.8 },
+      { "id": "cm", "edID": 128049347, "eddbID": 1555,"grp": "bh", "cost": 33813120, "mass": 83, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 1.52 },
+      { "id": "cn", "edID": 128049348, "eddbID": 1556,"grp": "bh", "cost": 76079500, "mass": 165, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 2.5 },
       { "id": "co", "edID": 128049349, "eddbID": 1557,"grp": "bh", "cost": 179801200, "mass": 165, "explres": -0.5, "kinres": -0.75, "thermres": 0.5, "hullboost": 2.5  },
       { "id": "cp", "edID": 128049350, "eddbID": 1558,"grp": "bh", "cost": 199243730, "mass": 165, "explres": 0.2, "kinres": 0.25, "thermres": -0.4, "hullboost": 2.5 }
     ],
diff --git a/ships/cobra_mk_iii.json b/ships/cobra_mk_iii.json
index 99c65b5..68d30d6 100755
--- a/ships/cobra_mk_iii.json
+++ b/ships/cobra_mk_iii.json
@@ -19,9 +19,9 @@
     },
     "retailCost": 349720,
     "bulkheads": [
-      { "id": "bk", "edID": 128049280, "eddbID": 763, "grp": "bh", "cost": 0, "mass": 0, "explres": -0.4, "kinres": -0.2, "thermres": 0.2, "hullboost": 0.8 },
-      { "id": "bl", "edID": 128049281, "eddbID": 764, "grp": "bh", "cost": 151890, "mass": 14, "explres": -0.4, "kinres": 0.2, "thermres": 0, "hullboost": 1.52 },
-      { "id": "bm", "edID": 128049282, "eddbID": 765, "grp": "bh", "cost": 341750, "mass": 27, "explres": -0.4, "kinres": 0.2, "thermres": 0, "hullboost": 2.5 },
+      { "id": "bk", "edID": 128049280, "eddbID": 763, "grp": "bh", "cost": 0, "mass": 0, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 0.8 },
+      { "id": "bl", "edID": 128049281, "eddbID": 764, "grp": "bh", "cost": 151890, "mass": 14, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 1.52 },
+      { "id": "bm", "edID": 128049282, "eddbID": 765, "grp": "bh", "cost": 341750, "mass": 27, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 2.5 },
       { "id": "bn", "edID": 128049283, "eddbID": 766, "grp": "bh", "cost": 797410, "mass": 27, "explres": -0.5, "kinres": -0.75, "thermres": 0.5, "hullboost": 2.5  },
       { "id": "bo", "edID": 128049284, "eddbID": 767, "grp": "bh", "cost": 895000, "mass": 27, "explres": 0.2, "kinres": 0.25, "thermres": -0.4, "hullboost": 2.5 }
     ],
diff --git a/ships/cobra_mk_iv.json b/ships/cobra_mk_iv.json
index cc1d770..82aca1b 100644
--- a/ships/cobra_mk_iv.json
+++ b/ships/cobra_mk_iv.json
@@ -19,9 +19,9 @@
     },
     "retailCost": 747660,
     "bulkheads": [
-      { "id": "cg", "edID": 128672264, "eddbID": 1518, "grp": "bh", "cost": 0, "mass": 0, "explres": -0.4, "kinres": -0.2, "thermres": 0.2, "hullboost": 0.8 },
-      { "id": "ch", "edID": 128672265, "eddbID": 1519, "grp": "bh", "cost": 305890, "mass": 14, "explres": -0.4, "kinres": 0.2, "thermres": 0, "hullboost": 1.52 },
-      { "id": "ci", "edID": 128672266, "eddbID": 1520, "grp": "bh", "cost": 688250, "mass": 27, "explres": -0.4, "kinres": 0.2, "thermres": 0, "hullboost": 2.5 },
+      { "id": "cg", "edID": 128672264, "eddbID": 1518, "grp": "bh", "cost": 0, "mass": 0, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 0.8 },
+      { "id": "ch", "edID": 128672265, "eddbID": 1519, "grp": "bh", "cost": 305890, "mass": 14, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 1.52 },
+      { "id": "ci", "edID": 128672266, "eddbID": 1520, "grp": "bh", "cost": 688250, "mass": 27, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 2.5 },
       { "id": "cj", "edID": 128672267, "eddbID": 1521, "grp": "bh", "cost": 1605910, "mass": 27, "explres": -0.5, "kinres": -0.75, "thermres": 0.5, "hullboost": 2.5  },
       { "id": "ck", "edID": 128672268, "eddbID": 1522, "grp": "bh", "cost": 1802440, "mass": 27, "explres": 0.2, "kinres": 0.25, "thermres": -0.4, "hullboost": 2.5 }
     ],
diff --git a/ships/diamondback_explorer.json b/ships/diamondback_explorer.json
index 973b650..6e12b77 100644
--- a/ships/diamondback_explorer.json
+++ b/ships/diamondback_explorer.json
@@ -18,9 +18,9 @@
     },
     "retailCost": 1894760,
     "bulkheads": [
-      { "id": "ba", "edID": 128671832, "eddbID": 1456, "grp": "bh", "cost": 0, "mass": 0, "explres": -0.4, "kinres": -0.2, "thermres": 0.2, "hullboost": 0.8 },
-      { "id": "bb", "edID": 128671833, "eddbID": 1457, "grp": "bh", "cost": 800000, "mass": 23, "explres": -0.4, "kinres": 0.2, "thermres": 0, "hullboost": 1.52 },
-      { "id": "bc", "edID": 128671834, "eddbID": 1458, "grp": "bh", "cost": 1800000, "mass": 47, "explres": -0.4, "kinres": 0.2, "thermres": 0, "hullboost": 2.5 },
+      { "id": "ba", "edID": 128671832, "eddbID": 1456, "grp": "bh", "cost": 0, "mass": 0, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 0.8 },
+      { "id": "bb", "edID": 128671833, "eddbID": 1457, "grp": "bh", "cost": 800000, "mass": 23, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 1.52 },
+      { "id": "bc", "edID": 128671834, "eddbID": 1458, "grp": "bh", "cost": 1800000, "mass": 47, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 2.5 },
       { "id": "bd", "edID": 128671835, "eddbID": 1459, "grp": "bh", "cost": 4200000, "mass": 26, "explres": -0.5, "kinres": -0.75, "thermres": 0.5, "hullboost": 2.5  },
       { "id": "be", "edID": 128671836, "eddbID": 1460, "grp": "bh", "cost": 4714000, "mass": 47, "explres": 0.2, "kinres": 0.25, "thermres": -0.4, "hullboost": 2.5 }
     ],
diff --git a/ships/diamondback_scout.json b/ships/diamondback_scout.json
index a625e4e..c30c44d 100644
--- a/ships/diamondback_scout.json
+++ b/ships/diamondback_scout.json
@@ -19,9 +19,9 @@
     },
     "retailCost": 564330,
     "bulkheads": [
-      { "id": "b5", "edID": 128671218, "eddbID": 1384, "grp": "bh", "cost": 0, "mass": 0, "explres": -0.4, "kinres": -0.2, "thermres": 0.2, "hullboost": 0.8 },
-      { "id": "b6", "edID": 128671219, "eddbID": 1385, "grp": "bh", "cost": 225700, "mass": 13, "explres": -0.4, "kinres": 0.2, "thermres": 0, "hullboost": 1.52 },
-      { "id": "b7", "edID": 128671220, "eddbID": 1386, "grp": "bh", "cost": 507900, "mass": 26, "explres": -0.4, "kinres": 0.2, "thermres": 0, "hullboost": 2.5 },
+      { "id": "b5", "edID": 128671218, "eddbID": 1384, "grp": "bh", "cost": 0, "mass": 0, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 0.8 },
+      { "id": "b6", "edID": 128671219, "eddbID": 1385, "grp": "bh", "cost": 225700, "mass": 13, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 1.52 },
+      { "id": "b7", "edID": 128671220, "eddbID": 1386, "grp": "bh", "cost": 507900, "mass": 26, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 2.5 },
       { "id": "b8", "edID": 128671221, "eddbID": 1387, "grp": "bh", "cost": 1185100, "mass": 26, "explres": -0.5, "kinres": -0.75, "thermres": 0.5, "hullboost": 2.5  },
       { "id": "b9", "edID": 128671222, "eddbID": 1388, "grp": "bh", "cost": 1330100, "mass": 26, "explres": 0.2, "kinres": 0.25, "thermres": -0.4, "hullboost": 2.5 }
     ],
diff --git a/ships/eagle.json b/ships/eagle.json
index 4945318..ce3639e 100755
--- a/ships/eagle.json
+++ b/ships/eagle.json
@@ -19,9 +19,9 @@
     },
     "retailCost": 44800,
     "bulkheads": [
-      { "id": "bY", "edID": 128049256, "eddbID": 743, "grp": "bh", "cost": 0, "mass": 0, "explres": -0.4, "kinres": -0.2, "thermres": 0.2, "hullboost": 0.8 },
-      { "id": "bZ", "edID": 128049257, "eddbID": 744, "grp": "bh", "cost": 26880, "mass": 4, "explres": -0.4, "kinres": 0.2, "thermres": 0, "hullboost": 1.52 },
-      { "id": "B0", "edID": 128049258, "eddbID": 745, "grp": "bh", "cost": 90050, "mass": 8, "explres": -0.4, "kinres": 0.2, "thermres": 0, "hullboost": 2.5 },
+      { "id": "bY", "edID": 128049256, "eddbID": 743, "grp": "bh", "cost": 0, "mass": 0, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 0.8 },
+      { "id": "bZ", "edID": 128049257, "eddbID": 744, "grp": "bh", "cost": 26880, "mass": 4, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 1.52 },
+      { "id": "B0", "edID": 128049258, "eddbID": 745, "grp": "bh", "cost": 90050, "mass": 8, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 2.5 },
       { "id": "B1", "edID": 128049259, "eddbID": 746, "grp": "bh", "cost": 140090, "mass": 8, "explres": -0.5, "kinres": -0.75, "thermres": 0.5, "hullboost": 2.5  },
       { "id": "B2", "edID": 128049260, "eddbID": 747, "grp": "bh", "cost": 150390, "mass": 8, "explres": 0.2, "kinres": 0.25, "thermres": -0.4, "hullboost": 2.5 }
     ],
diff --git a/ships/federal_assault_ship.json b/ships/federal_assault_ship.json
index 19dc3ed..bdc7019 100644
--- a/ships/federal_assault_ship.json
+++ b/ships/federal_assault_ship.json
@@ -18,9 +18,9 @@
     },
     "retailCost": 19814210,
     "bulkheads": [
-      { "id": "bz", "edID": 128672147, "eddbID": 1466, "grp": "bh", "cost": 0, "mass": 0, "explres": -0.4, "kinres": -0.2, "thermres": 0.2, "hullboost": 0.8 },
-      { "id": "bA", "edID": 128672148, "eddbID": 1467, "grp": "bh", "cost": 7925680, "mass": 44, "explres": -0.4, "kinres": 0.2, "thermres": 0, "hullboost": 1.52 },
-      { "id": "bB", "edID": 128672149, "eddbID": 1468, "grp": "bh", "cost": 17832780, "mass": 87, "explres": -0.4, "kinres": 0.2, "thermres": 0, "hullboost": 2.5 },
+      { "id": "bz", "edID": 128672147, "eddbID": 1466, "grp": "bh", "cost": 0, "mass": 0, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 0.8 },
+      { "id": "bA", "edID": 128672148, "eddbID": 1467, "grp": "bh", "cost": 7925680, "mass": 44, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 1.52 },
+      { "id": "bB", "edID": 128672149, "eddbID": 1468, "grp": "bh", "cost": 17832780, "mass": 87, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 2.5 },
       { "id": "bC", "edID": 128672150, "eddbID": 1469, "grp": "bh", "cost": 42144810, "mass": 87, "explres": -0.5, "kinres": -0.75, "thermres": 0.5, "hullboost": 2.5  },
       { "id": "bD", "edID": 128672151, "eddbID": 1470, "grp": "bh", "cost": 46702080, "mass": 87, "explres": 0.2, "kinres": 0.25, "thermres": -0.4, "hullboost": 2.5 }
     ],
diff --git a/ships/federal_corvette.json b/ships/federal_corvette.json
index 9bf0712..1a2c60d 100644
--- a/ships/federal_corvette.json
+++ b/ships/federal_corvette.json
@@ -12,7 +12,7 @@
       "boostEnergy": 27,
       "agility": 2,
       "baseShieldStrength": 555,
-      "baseArmour": 666,
+      "baseArmour": 370,
       "hullMass": 900,
       "masslock": 24,
       "pipSpeed": 0.125,
@@ -20,9 +20,9 @@
     },
     "retailCost": 187969450,
     "bulkheads": [
-      { "id": "BW", "edID": 128049370, "eddbID": 1498, "grp": "bh", "cost": 0, "mass": 0, "explres": -0.4, "kinres": -0.2, "thermres": 0.2, "hullboost": 0.8 },
-      { "id": "BX", "edID": 128049371, "eddbID": 1499, "grp": "bh", "cost": 75187790, "mass": 30, "explres": -0.4, "kinres": 0.2, "thermres": 0, "hullboost": 1.52 },
-      { "id": "BY", "edID": 128049372, "eddbID": 1500, "grp": "bh", "cost": 169172510, "mass": 60, "explres": -0.4, "kinres": 0.2, "thermres": 0, "hullboost": 2.5 },
+      { "id": "BW", "edID": 128049370, "eddbID": 1498, "grp": "bh", "cost": 0, "mass": 0, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 0.8 },
+      { "id": "BX", "edID": 128049371, "eddbID": 1499, "grp": "bh", "cost": 75187790, "mass": 30, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 1.52 },
+      { "id": "BY", "edID": 128049372, "eddbID": 1500, "grp": "bh", "cost": 169172510, "mass": 60, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 2.5 },
       { "id": "BZ", "edID": 128049373, "eddbID": 1501, "grp": "bh", "cost": 399811020, "mass": 60, "explres": -0.5, "kinres": -0.75, "thermres": 0.5, "hullboost": 2.5  },
       { "id": "c0", "edID": 128049374, "eddbID": 1502, "grp": "bh", "cost": 443044000, "mass": 60, "explres": 0.2, "kinres": 0.25, "thermres": -0.4, "hullboost": 2.5 }
     ],
diff --git a/ships/federal_dropship.json b/ships/federal_dropship.json
index f095c0e..524301c 100755
--- a/ships/federal_dropship.json
+++ b/ships/federal_dropship.json
@@ -19,9 +19,9 @@
     },
     "retailCost": 14314210,
     "bulkheads": [
-      { "id": "bE", "edID": 128049322, "eddbID": 793, "grp": "bh", "cost": 0, "mass": 0, "explres": -0.4, "kinres": -0.2, "thermres": 0.2, "hullboost": 0.8 },
-      { "id": "bF", "edID": 128049323, "eddbID": 794, "grp": "bh", "cost": 5725680, "mass": 44, "explres": -0.4, "kinres": 0.2, "thermres": 0, "hullboost": 1.52 },
-      { "id": "bG", "edID": 128049324, "eddbID": 795, "grp": "bh", "cost": 12882780, "mass": 87, "explres": -0.4, "kinres": 0.2, "thermres": 0, "hullboost": 2.5 },
+      { "id": "bE", "edID": 128049322, "eddbID": 793, "grp": "bh", "cost": 0, "mass": 0, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 0.8 },
+      { "id": "bF", "edID": 128049323, "eddbID": 794, "grp": "bh", "cost": 5725680, "mass": 44, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 1.52 },
+      { "id": "bG", "edID": 128049324, "eddbID": 795, "grp": "bh", "cost": 12882780, "mass": 87, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 2.5 },
       { "id": "bH", "edID": 128049325, "eddbID": 796, "grp": "bh", "cost": 30446310, "mass": 87, "explres": -0.5, "kinres": -0.75, "thermres": 0.5, "hullboost": 2.5  },
       { "id": "bI", "edID": 128049326, "eddbID": 797, "grp": "bh", "cost": 33738580, "mass": 87, "explres": 0.2, "kinres": 0.25, "thermres": -0.4, "hullboost": 2.5 }
     ],
diff --git a/ships/federal_gunship.json b/ships/federal_gunship.json
index b0bbfca..50b8e12 100644
--- a/ships/federal_gunship.json
+++ b/ships/federal_gunship.json
@@ -20,9 +20,9 @@
     },
     "retailCost": 35814210,
     "bulkheads": [
-      { "id": "bJ", "edID": 128672154, "eddbID": 1471, "grp": "bh", "cost": 0, "mass": 0, "explres": -0.4, "kinres": -0.2, "thermres": 0.2, "hullboost": 0.8 },
-      { "id": "bK", "edID": 128672155, "eddbID": 1472, "grp": "bh", "cost": 14325690, "mass": 44, "explres": -0.4, "kinres": 0.2, "thermres": 0, "hullboost": 1.52 },
-      { "id": "bL", "edID": 128672156, "eddbID": 1473, "grp": "bh", "cost": 32232790, "mass": 87, "explres": -0.4, "kinres": 0.2, "thermres": 0, "hullboost": 2.5 },
+      { "id": "bJ", "edID": 128672154, "eddbID": 1471, "grp": "bh", "cost": 0, "mass": 0, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 0.8 },
+      { "id": "bK", "edID": 128672155, "eddbID": 1472, "grp": "bh", "cost": 14325690, "mass": 44, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 1.52 },
+      { "id": "bL", "edID": 128672156, "eddbID": 1473, "grp": "bh", "cost": 32232790, "mass": 87, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 2.5 },
       { "id": "bM", "edID": 128672157, "eddbID": 1474, "grp": "bh", "cost": 76176810, "mass": 87, "explres": -0.5, "kinres": -0.75, "thermres": 0.5, "hullboost": 2.5  },
       { "id": "bN", "edID": 128672158, "eddbID": 1475, "grp": "bh", "cost": 84414090, "mass": 87, "explres": 0.2, "kinres": 0.25, "thermres": -0.4, "hullboost": 2.5 }
     ],
diff --git a/ships/fer_de_lance.json b/ships/fer_de_lance.json
index e385cff..6b26248 100755
--- a/ships/fer_de_lance.json
+++ b/ships/fer_de_lance.json
@@ -19,9 +19,9 @@
     },
     "retailCost": 51567040,
     "bulkheads": [
-      { "id": "Bd", "edID": 128049352, "eddbID": 813, "grp": "bh", "cost": 0, "mass": 0, "explres": -0.4, "kinres": -0.2, "thermres": 0.2, "hullboost": 0.8 },
-      { "id": "Be", "edID": 128049353, "eddbID": 814, "grp": "bh", "cost": 20626820, "mass": 19, "explres": -0.4, "kinres": 0.2, "thermres": 0, "hullboost": 1.52 },
-      { "id": "Bf", "edID": 128049354, "eddbID": 815, "grp": "bh", "cost": 46410340, "mass": 38, "explres": -0.4, "kinres": 0.2, "thermres": 0, "hullboost": 2.5 },
+      { "id": "Bd", "edID": 128049352, "eddbID": 813, "grp": "bh", "cost": 0, "mass": 0, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 0.8 },
+      { "id": "Be", "edID": 128049353, "eddbID": 814, "grp": "bh", "cost": 20626820, "mass": 19, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 1.52 },
+      { "id": "Bf", "edID": 128049354, "eddbID": 815, "grp": "bh", "cost": 46410340, "mass": 38, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 2.5 },
       { "id": "Bg", "edID": 128049355, "eddbID": 816, "grp": "bh", "cost": 109683090, "mass": 38, "explres": -0.5, "kinres": -0.75, "thermres": 0.5, "hullboost": 2.5  },
       { "id": "Bh", "edID": 128049356, "eddbID": 817, "grp": "bh", "cost": 121543510, "mass": 38, "explres": 0.2, "kinres": 0.25, "thermres": -0.4, "hullboost": 2.5 }
     ],
diff --git a/ships/hauler.json b/ships/hauler.json
index 4505e79..d1f00ca 100755
--- a/ships/hauler.json
+++ b/ships/hauler.json
@@ -19,9 +19,9 @@
     },
     "retailCost": 52720,
     "bulkheads": [
-      { "id": "Bi", "edID": 128049262, "eddbID": 748, "grp": "bh", "cost": 0, "mass": 0, "explres": -0.4, "kinres": -0.2, "thermres": 0.2, "hullboost": 0.8 },
-      { "id": "Bj", "edID": 128049263, "eddbID": 749, "grp": "bh", "cost": 42180, "mass": 1, "explres": -0.4, "kinres": 0.2, "thermres": 0, "hullboost": 1.52 },
-      { "id": "Bk", "edID": 128049264, "eddbID": 750, "grp": "bh", "cost": 185050, "mass": 2, "explres": -0.4, "kinres": 0.2, "thermres": 0, "hullboost": 2.5 },
+      { "id": "Bi", "edID": 128049262, "eddbID": 748, "grp": "bh", "cost": 0, "mass": 0, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 0.8 },
+      { "id": "Bj", "edID": 128049263, "eddbID": 749, "grp": "bh", "cost": 42180, "mass": 1, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 1.52 },
+      { "id": "Bk", "edID": 128049264, "eddbID": 750, "grp": "bh", "cost": 185050, "mass": 2, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 2.5 },
       { "id": "Bl", "edID": 128049265, "eddbID": 751, "grp": "bh", "cost": 270300, "mass": 2, "explres": -0.5, "kinres": -0.75, "thermres": 0.5, "hullboost": 2.5  },
       { "id": "Bm", "edID": 128049266, "eddbID": 752, "grp": "bh", "cost": 282420, "mass": 2, "explres": 0.2, "kinres": 0.25, "thermres": -0.4, "hullboost": 2.5 }
     ],
diff --git a/ships/imperial_clipper.json b/ships/imperial_clipper.json
index 39e6e94..9f5d108 100755
--- a/ships/imperial_clipper.json
+++ b/ships/imperial_clipper.json
@@ -19,9 +19,9 @@
     },
     "retailCost": 22296860,
       "bulkheads": [
-      { "id": "bp", "edID": 128049316, "eddbID": 788, "grp": "bh", "cost": 0, "mass": 0, "explres": -0.4, "kinres": -0.2, "thermres": 0.2, "hullboost": 0.8 },
-      { "id": "bq", "edID": 128049317, "eddbID": 789, "grp": "bh", "cost": 8918340, "mass": 30, "explres": -0.4, "kinres": 0.2, "thermres": 0, "hullboost": 1.52 },
-      { "id": "br", "edID": 128049318, "eddbID": 790, "grp": "bh", "cost": 20066270, "mass": 60, "explres": -0.4, "kinres": 0.2, "thermres": 0, "hullboost": 2.5 },
+      { "id": "bp", "edID": 128049316, "eddbID": 788, "grp": "bh", "cost": 0, "mass": 0, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 0.8 },
+      { "id": "bq", "edID": 128049317, "eddbID": 789, "grp": "bh", "cost": 8918340, "mass": 30, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 1.52 },
+      { "id": "br", "edID": 128049318, "eddbID": 790, "grp": "bh", "cost": 20066270, "mass": 60, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 2.5 },
       { "id": "bs", "edID": 128049319, "eddbID": 791, "grp": "bh", "cost": 47423290, "mass": 60, "explres": -0.5, "kinres": -0.75, "thermres": 0.5, "hullboost": 2.5  },
       { "id": "bt", "edID": 128049320, "eddbID": 792, "grp": "bh", "cost": 52551340, "mass": 60, "explres": 0.2, "kinres": 0.25, "thermres": -0.4, "hullboost": 2.5 }
     ],
diff --git a/ships/imperial_courier.json b/ships/imperial_courier.json
index d107787..33ac090 100644
--- a/ships/imperial_courier.json
+++ b/ships/imperial_courier.json
@@ -18,9 +18,9 @@
     },
     "retailCost": 2542930,
     "bulkheads": [
-      { "id": "bf", "edID": 128671224, "eddbID": 1389, "grp": "bh", "cost": 0, "mass": 0, "explres": -0.4, "kinres": -0.2, "thermres": 0.2, "hullboost": 0.8 },
-      { "id": "bg", "edID": 128671225, "eddbID": 1390, "grp": "bh", "cost": 1017200, "mass": 4, "explres": -0.4, "kinres": 0.2, "thermres": 0, "hullboost": 1.52 },
-      { "id": "bh", "edID": 128671226, "eddbID": 1391, "grp": "bh", "cost": 2288600, "mass": 8, "explres": -0.4, "kinres": 0.2, "thermres": 0, "hullboost": 2.5 },
+      { "id": "bf", "edID": 128671224, "eddbID": 1389, "grp": "bh", "cost": 0, "mass": 0, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 0.8 },
+      { "id": "bg", "edID": 128671225, "eddbID": 1390, "grp": "bh", "cost": 1017200, "mass": 4, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 1.52 },
+      { "id": "bh", "edID": 128671226, "eddbID": 1391, "grp": "bh", "cost": 2288600, "mass": 8, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 2.5 },
       { "id": "bi", "edID": 128671227, "eddbID": 1392, "grp": "bh", "cost": 5408800, "mass": 8, "explres": -0.5, "kinres": -0.75, "thermres": 0.5, "hullboost": 2.5  },
       { "id": "bj", "edID": 128671228, "eddbID": 1393, "grp": "bh", "cost": 5993700, "mass": 8, "explres": 0.2, "kinres": 0.25, "thermres": -0.4, "hullboost": 2.5 }
     ],
diff --git a/ships/imperial_cutter.json b/ships/imperial_cutter.json
index f0e2797..449f01f 100644
--- a/ships/imperial_cutter.json
+++ b/ships/imperial_cutter.json
@@ -19,9 +19,9 @@
     },
     "retailCost": 208969450,
     "bulkheads": [
-      { "id": "BR", "edID": 128049376, "eddbID": 1493, "grp": "bh", "cost": 0, "mass": 0, "explres": -0.4, "kinres": -0.2, "thermres": 0.2, "hullboost": 0.8 },
-      { "id": "BS", "edID": 128049377, "eddbID": 1494, "grp": "bh", "cost": 83587790, "mass": 30, "explres": -0.4, "kinres": 0.2, "thermres": 0, "hullboost": 1.52 },
-      { "id": "BT", "edID": 128049378, "eddbID": 1495, "grp": "bh", "cost": 188072510, "mass": 60, "explres": -0.4, "kinres": 0.2, "thermres": 0, "hullboost": 2.5 },
+      { "id": "BR", "edID": 128049376, "eddbID": 1493, "grp": "bh", "cost": 0, "mass": 0, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 0.8 },
+      { "id": "BS", "edID": 128049377, "eddbID": 1494, "grp": "bh", "cost": 83587790, "mass": 30, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 1.52 },
+      { "id": "BT", "edID": 128049378, "eddbID": 1495, "grp": "bh", "cost": 188072510, "mass": 60, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 2.5 },
       { "id": "BU", "edID": 128049379, "eddbID": 1496, "grp": "bh", "cost": 444478020, "mass": 60, "explres": -0.5, "kinres": -0.75, "thermres": 0.5, "hullboost": 2.5  },
       { "id": "BV", "edID": 128049380, "eddbID": 1497, "grp": "bh", "cost": 492541000, "mass": 60, "explres": 0.2, "kinres": 0.25, "thermres": -0.4, "hullboost": 2.5 }
     ],
diff --git a/ships/imperial_eagle.json b/ships/imperial_eagle.json
index d2e668c..e22b413 100644
--- a/ships/imperial_eagle.json
+++ b/ships/imperial_eagle.json
@@ -19,9 +19,9 @@
     },
     "retailCost": 110830,
     "bulkheads": [
-      { "id": "bu", "edID": 128672140, "eddbID": 1461, "grp": "bh", "cost": 0, "mass": 0, "explres": -0.4, "kinres": -0.2, "thermres": 0.2, "hullboost": 0.8 },
-      { "id": "bv", "edID": 128672141, "eddbID": 1462, "grp": "bh", "cost": 66500, "mass": 4, "explres": -0.4, "kinres": 0.2, "thermres": 0, "hullboost": 1.52 },
-      { "id": "bw", "edID": 128672142, "eddbID": 1463, "grp": "bh", "cost": 222760, "mass": 8, "explres": -0.4, "kinres": 0.2, "thermres": 0, "hullboost": 2.5 },
+      { "id": "bu", "edID": 128672140, "eddbID": 1461, "grp": "bh", "cost": 0, "mass": 0, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 0.8 },
+      { "id": "bv", "edID": 128672141, "eddbID": 1462, "grp": "bh", "cost": 66500, "mass": 4, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 1.52 },
+      { "id": "bw", "edID": 128672142, "eddbID": 1463, "grp": "bh", "cost": 222760, "mass": 8, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 2.5 },
       { "id": "bx", "edID": 128672143, "eddbID": 1464, "grp": "bh", "cost": 346550, "mass": 8, "explres": -0.5, "kinres": -0.75, "thermres": 0.5, "hullboost": 2.5  },
       { "id": "by", "edID": 128672144, "eddbID": 1465, "grp": "bh", "cost": 372040, "mass": 8, "explres": 0.2, "kinres": 0.25, "thermres": -0.4, "hullboost": 2.5 }
     ],
diff --git a/ships/keelback.json b/ships/keelback.json
index 8a17ac3..691b747 100644
--- a/ships/keelback.json
+++ b/ships/keelback.json
@@ -20,9 +20,9 @@
     },
     "retailCost": 3126160,
     "bulkheads": [
-      { "id": "cb", "edID": 128672271, "eddbID": 1513, "grp": "bh", "cost": 0, "mass": 0, "explres": -0.4, "kinres": -0.2, "thermres": 0.2, "hullboost": 0.8 },
-      { "id": "cc", "edID": 128672272, "eddbID": 1514, "grp": "bh", "cost": 1250460, "mass": 12, "explres": -0.4, "kinres": 0.2, "thermres": 0, "hullboost": 1.52 },
-      { "id": "cd", "edID": 128672273, "eddbID": 1515, "grp": "bh", "cost": 2813540, "mass": 23, "explres": -0.4, "kinres": 0.2, "thermres": 0, "hullboost": 2.5 },
+      { "id": "cb", "edID": 128672271, "eddbID": 1513, "grp": "bh", "cost": 0, "mass": 0, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 0.8 },
+      { "id": "cc", "edID": 128672272, "eddbID": 1514, "grp": "bh", "cost": 1250460, "mass": 12, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 1.52 },
+      { "id": "cd", "edID": 128672273, "eddbID": 1515, "grp": "bh", "cost": 2813540, "mass": 23, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 2.5 },
       { "id": "ce", "edID": 128672274, "eddbID": 1516, "grp": "bh", "cost": 6649330, "mass": 23, "explres": -0.5, "kinres": -0.75, "thermres": 0.5, "hullboost": 2.5  },
       { "id": "cf", "edID": 128672275, "eddbID": 1517, "grp": "bh", "cost": 7368340, "mass": 23, "explres": 0.2, "kinres": 0.25, "thermres": -0.4, "hullboost": 2.5 }
     ],
diff --git a/ships/orca.json b/ships/orca.json
index a1c1a1e..84cd29d 100755
--- a/ships/orca.json
+++ b/ships/orca.json
@@ -20,9 +20,9 @@
     },
     "retailCost": 48539900,
     "bulkheads": [
-      { "id": "BM", "edID": 128049328, "eddbID": 798, "grp": "bh", "cost": 0, "mass": 0, "explres": -0.4, "kinres": -0.2, "thermres": 0.2, "hullboost": 0.8 },
-      { "id": "BN", "edID": 128049329, "eddbID": 799, "grp": "bh", "cost": 19415950, "mass": 21, "explres": -0.4, "kinres": 0.2, "thermres": 0, "hullboost": 1.52 },
-      { "id": "BO", "edID": 128049330, "eddbID": 800, "grp": "bh", "cost": 43685900, "mass": 87, "explres": -0.4, "kinres": 0.2, "thermres": 0, "hullboost": 2.5 },
+      { "id": "BM", "edID": 128049328, "eddbID": 798, "grp": "bh", "cost": 0, "mass": 0, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 0.8 },
+      { "id": "BN", "edID": 128049329, "eddbID": 799, "grp": "bh", "cost": 19415950, "mass": 21, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 1.52 },
+      { "id": "BO", "edID": 128049330, "eddbID": 800, "grp": "bh", "cost": 43685900, "mass": 87, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 2.5 },
       { "id": "BP", "edID": 128049331, "eddbID": 801, "grp": "bh", "cost": 103244340, "mass": 87, "explres": -0.5, "kinres": -0.75, "thermres": 0.5, "hullboost": 2.5  },
       { "id": "BQ", "edID": 128049332, "eddbID": 802, "grp": "bh", "cost": 114408510, "mass": 87, "explres": 0.2, "kinres": 0.25, "thermres": -0.4, "hullboost": 2.5 }
     ],
diff --git a/ships/python.json b/ships/python.json
index e308ef1..15a88fa 100755
--- a/ships/python.json
+++ b/ships/python.json
@@ -19,9 +19,9 @@
     },
     "retailCost": 56978180,
     "bulkheads": [
-      { "id": "bO", "edID": 128049340, "eddbID": 808, "grp": "bh", "cost": 0, "mass": 0, "explres": -0.4, "kinres": -0.2, "thermres": 0.2, "hullboost": 0.8 },
-      { "id": "bP", "edID": 128049341, "eddbID": 809, "grp": "bh", "cost": 22791270, "mass": 26, "explres": -0.4, "kinres": 0.2, "thermres": 0, "hullboost": 1.52 },
-      { "id": "bQ", "edID": 128049342, "eddbID": 810, "grp": "bh", "cost": 51280360, "mass": 53, "explres": -0.4, "kinres": 0.2, "thermres": 0, "hullboost": 2.5 },
+      { "id": "bO", "edID": 128049340, "eddbID": 808, "grp": "bh", "cost": 0, "mass": 0, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 0.8 },
+      { "id": "bP", "edID": 128049341, "eddbID": 809, "grp": "bh", "cost": 22791270, "mass": 26, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 1.52 },
+      { "id": "bQ", "edID": 128049342, "eddbID": 810, "grp": "bh", "cost": 51280360, "mass": 53, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 2.5 },
       { "id": "bR", "edID": 128049343, "eddbID": 811, "grp": "bh", "cost": 121192590, "mass": 53, "explres": -0.5, "kinres": -0.75, "thermres": 0.5, "hullboost": 2.5  },
       { "id": "bS", "edID": 128049344, "eddbID": 812, "grp": "bh", "cost": 134297570, "mass": 53, "explres": 0.2, "kinres": 0.25, "thermres": -0.4, "hullboost": 2.5 }
     ],
diff --git a/ships/sidewinder.json b/ships/sidewinder.json
index dc6611d..8b94253 100755
--- a/ships/sidewinder.json
+++ b/ships/sidewinder.json
@@ -19,9 +19,9 @@
     },
     "retailCost": 40800,
     "bulkheads": [
-      { "id": "b0", "edID": 128049250, "eddbID": 738, "grp": "bh", "cost": 0, "mass": 0, "explres": -0.4, "kinres": -0.2, "thermres": 0.2, "hullboost": 0.8 },
-      { "id": "b1", "edID": 128049251, "eddbID": 739, "grp": "bh", "cost": 25600, "mass": 2, "explres": -0.4, "kinres": 0.2, "thermres": 0, "hullboost": 1.52 },
-      { "id": "b2", "edID": 128049252, "eddbID": 740, "grp": "bh", "cost": 80320, "mass": 4, "explres": -0.4, "kinres": 0.2, "thermres": 0, "hullboost": 2.5 },
+      { "id": "b0", "edID": 128049250, "eddbID": 738, "grp": "bh", "cost": 0, "mass": 0, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 0.8 },
+      { "id": "b1", "edID": 128049251, "eddbID": 739, "grp": "bh", "cost": 25600, "mass": 2, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 1.52 },
+      { "id": "b2", "edID": 128049252, "eddbID": 740, "grp": "bh", "cost": 80320, "mass": 4, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 2.5 },
       { "id": "b3", "edID": 128049253, "eddbID": 741, "grp": "bh", "cost": 132060, "mass": 4, "explres": -0.5, "kinres": -0.75, "thermres": 0.5, "hullboost": 2.5  },
       { "id": "b4", "edID": 128049254, "eddbID": 742, "grp": "bh", "cost": 139420, "mass": 4, "explres": 0.2, "kinres": 0.25, "thermres": -0.4, "hullboost": 2.5 }
     ],
diff --git a/ships/type_6_transporter.json b/ships/type_6_transporter.json
index 3764a5f..c1f23f2 100755
--- a/ships/type_6_transporter.json
+++ b/ships/type_6_transporter.json
@@ -19,9 +19,9 @@
     },
     "retailCost": 1045950,
     "bulkheads": [
-      { "id": "Bn", "edID": 128049286, "eddbID": 768, "grp": "bh", "cost": 0, "mass": 0, "explres": -0.4, "kinres": -0.2, "thermres": 0.2, "hullboost": 0.8 },
-      { "id": "Bo", "edID": 128049287, "eddbID": 769, "grp": "bh", "cost": 418380, "mass": 12, "explres": -0.4, "kinres": 0.2, "thermres": 0, "hullboost": 1.52 },
-      { "id": "Bp", "edID": 128049288, "eddbID": 770, "grp": "bh", "cost": 941350, "mass": 23, "explres": -0.4, "kinres": 0.2, "thermres": 0, "hullboost": 2.5 },
+      { "id": "Bn", "edID": 128049286, "eddbID": 768, "grp": "bh", "cost": 0, "mass": 0, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 0.8 },
+      { "id": "Bo", "edID": 128049287, "eddbID": 769, "grp": "bh", "cost": 418380, "mass": 12, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 1.52 },
+      { "id": "Bp", "edID": 128049288, "eddbID": 770, "grp": "bh", "cost": 941350, "mass": 23, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 2.5 },
       { "id": "Bq", "edID": 128049289, "eddbID": 771, "grp": "bh", "cost": 2224730, "mass": 23, "explres": -0.5, "kinres": -0.75, "thermres": 0.5, "hullboost": 2.5  },
       { "id": "Br", "edID": 128049290, "eddbID": 772, "grp": "bh", "cost": 2465290, "mass": 23, "explres": 0.2, "kinres": 0.25, "thermres": -0.4, "hullboost": 2.5 }
     ],
diff --git a/ships/type_7_transport.json b/ships/type_7_transport.json
index f9ae3a0..7ea27b0 100755
--- a/ships/type_7_transport.json
+++ b/ships/type_7_transport.json
@@ -19,9 +19,9 @@
     },
     "retailCost": 17472260,
     "bulkheads": [
-      { "id": "Bs", "edID": 128049298, "eddbID": 773, "grp": "bh", "cost": 0, "mass": 0, "explres": -0.4, "kinres": -0.2, "thermres": 0.2, "hullboost": 0.8 },
-      { "id": "Bt", "edID": 128049299, "eddbID": 774, "grp": "bh", "cost": 6988900, "mass": 32, "explres": -0.4, "kinres": 0.2, "thermres": 0, "hullboost": 1.52 },
-      { "id": "Bu", "edID": 128049300, "eddbID": 775, "grp": "bh", "cost": 15725030, "mass": 63, "explres": -0.4, "kinres": 0.2, "thermres": 0, "hullboost": 2.5 },
+      { "id": "Bs", "edID": 128049298, "eddbID": 773, "grp": "bh", "cost": 0, "mass": 0, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 0.8 },
+      { "id": "Bt", "edID": 128049299, "eddbID": 774, "grp": "bh", "cost": 6988900, "mass": 32, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 1.52 },
+      { "id": "Bu", "edID": 128049300, "eddbID": 775, "grp": "bh", "cost": 15725030, "mass": 63, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 2.5 },
       { "id": "Bv", "edID": 128049301, "eddbID": 776, "grp": "bh", "cost": 37163480, "mass": 63, "explres": -0.5, "kinres": -0.75, "thermres": 0.5, "hullboost": 2.5  },
       { "id": "Bw", "edID": 128049302, "eddbID": 777, "grp": "bh", "cost": 41182100, "mass": 63, "explres": 0.2, "kinres": 0.25, "thermres": -0.4, "hullboost": 2.5 }
     ],
diff --git a/ships/type_9_heavy.json b/ships/type_9_heavy.json
index e87df9b..97dd917 100755
--- a/ships/type_9_heavy.json
+++ b/ships/type_9_heavy.json
@@ -20,9 +20,9 @@
     },
     "retailCost": 76555840,
     "bulkheads": [
-      { "id": "Bx", "edID": 128049334, "eddbID": 803, "grp": "bh", "cost": 0, "mass": 0, "explres": -0.4, "kinres": -0.2, "thermres": 0.2, "hullboost": 0.8 },
-      { "id": "By", "edID": 128049335, "eddbID": 804, "grp": "bh", "cost": 30622340, "mass": 75, "explres": -0.4, "kinres": 0.2, "thermres": 0, "hullboost": 1.52 },
-      { "id": "Bz", "edID": 128049336, "eddbID": 805, "grp": "bh", "cost": 68900260, "mass": 150, "explres": -0.4, "kinres": 0.2, "thermres": 0, "hullboost": 2.5 },
+      { "id": "Bx", "edID": 128049334, "eddbID": 803, "grp": "bh", "cost": 0, "mass": 0, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 0.8 },
+      { "id": "By", "edID": 128049335, "eddbID": 804, "grp": "bh", "cost": 30622340, "mass": 75, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 1.52 },
+      { "id": "Bz", "edID": 128049336, "eddbID": 805, "grp": "bh", "cost": 68900260, "mass": 150, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 2.5 },
       { "id": "BA", "edID": 128049337, "eddbID": 806, "grp": "bh", "cost": 162834280, "mass": 150, "explres": -0.5, "kinres": -0.75, "thermres": 0.5, "hullboost": 2.5  },
       { "id": "BB", "edID": 128049338, "eddbID": 807, "grp": "bh", "cost": 180442120, "mass": 150, "explres": 0.2, "kinres": 0.25, "thermres": -0.4, "hullboost": 2.5 }
     ],
diff --git a/ships/viper.json b/ships/viper.json
index f800e57..ef3d00c 100755
--- a/ships/viper.json
+++ b/ships/viper.json
@@ -19,9 +19,9 @@
     },
     "retailCost": 142930,
     "bulkheads": [
-      { "id": "B3", "edID": 128049274, "eddbID": 758, "grp": "bh", "cost": 0, "mass": 0, "explres": -0.4, "kinres": -0.2, "thermres": 0.2, "hullboost": 0.8 },
-      { "id": "B4", "edID": 128049275, "eddbID": 759, "grp": "bh", "cost": 57170, "mass": 5, "explres": -0.4, "kinres": 0.2, "thermres": 0, "hullboost": 1.52 },
-      { "id": "B5", "edID": 128049276, "eddbID": 760, "grp": "bh", "cost": 128640, "mass": 9, "explres": -0.4, "kinres": 0.2, "thermres": 0, "hullboost": 2.5 },
+      { "id": "B3", "edID": 128049274, "eddbID": 758, "grp": "bh", "cost": 0, "mass": 0, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 0.8 },
+      { "id": "B4", "edID": 128049275, "eddbID": 759, "grp": "bh", "cost": 57170, "mass": 5, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 1.52 },
+      { "id": "B5", "edID": 128049276, "eddbID": 760, "grp": "bh", "cost": 128640, "mass": 9, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 2.5 },
       { "id": "B6", "edID": 128049277, "eddbID": 761, "grp": "bh", "cost": 304010, "mass": 9, "explres": -0.5, "kinres": -0.75, "thermres": 0.5, "hullboost": 2.5  },
       { "id": "B7", "edID": 128049278, "eddbID": 762, "grp": "bh", "cost": 336890, "mass": 9, "explres": 0.2, "kinres": 0.25, "thermres": -0.4, "hullboost": 2.5 }
     ],
diff --git a/ships/viper_mk_iv.json b/ships/viper_mk_iv.json
index 42b8bb5..c2c5bcd 100644
--- a/ships/viper_mk_iv.json
+++ b/ships/viper_mk_iv.json
@@ -19,9 +19,9 @@
     },
     "retailCost": 437930,
     "bulkheads": [
-      { "id": "c6", "edID": 128672257, "eddbID": 1508, "grp": "bh", "cost": 0, "mass": 0, "explres": -0.4, "kinres": -0.2, "thermres": 0.2, "hullboost": 0.8 },
-      { "id": "c7", "edID": 128672258, "eddbID": 1509, "grp": "bh", "cost": 175180, "mass": 5, "explres": -0.4, "kinres": 0.2, "thermres": 0, "hullboost": 1.52 },
-      { "id": "c8", "edID": 128672259, "eddbID": 1510, "grp": "bh", "cost": 394140, "mass": 9, "explres": -0.4, "kinres": 0.2, "thermres": 0, "hullboost": 2.5 },
+      { "id": "c6", "edID": 128672257, "eddbID": 1508, "grp": "bh", "cost": 0, "mass": 0, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 0.8 },
+      { "id": "c7", "edID": 128672258, "eddbID": 1509, "grp": "bh", "cost": 175180, "mass": 5, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 1.52 },
+      { "id": "c8", "edID": 128672259, "eddbID": 1510, "grp": "bh", "cost": 394140, "mass": 9, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 2.5 },
       { "id": "c9", "edID": 128672260, "eddbID": 1511, "grp": "bh", "cost": 931490, "mass": 9, "explres": -0.5, "kinres": -0.75, "thermres": 0.5, "hullboost": 2.5  },
       { "id": "ca", "edID": 128672261, "eddbID": 1512, "grp": "bh", "cost": 1033210, "mass": 9, "explres": 0.2, "kinres": 0.25, "thermres": -0.4, "hullboost": 2.5 }
     ],
diff --git a/ships/vulture.json b/ships/vulture.json
index 380881b..079fca6 100755
--- a/ships/vulture.json
+++ b/ships/vulture.json
@@ -19,9 +19,9 @@
     },
     "retailCost": 4925620,
     "bulkheads": [
-      { "id": "B8", "edID": 128049310, "eddbID": 783, "grp": "bh", "cost": 0, "mass": 0, "explres": -0.4, "kinres": -0.2, "thermres": 0.2, "hullboost": 0.8 },
-      { "id": "B9", "edID": 128049311, "eddbID": 784, "grp": "bh", "cost": 1970250, "mass": 17, "explres": -0.4, "kinres": 0.2, "thermres": 0, "hullboost": 1.52 },
-      { "id": "Ba", "edID": 128049312, "eddbID": 785, "grp": "bh", "cost": 4433050, "mass": 35, "explres": -0.4, "kinres": 0.2, "thermres": 0, "hullboost": 2.5 },
+      { "id": "B8", "edID": 128049310, "eddbID": 783, "grp": "bh", "cost": 0, "mass": 0, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 0.8 },
+      { "id": "B9", "edID": 128049311, "eddbID": 784, "grp": "bh", "cost": 1970250, "mass": 17, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 1.52 },
+      { "id": "Ba", "edID": 128049312, "eddbID": 785, "grp": "bh", "cost": 4433050, "mass": 35, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 2.5 },
       { "id": "Bb", "edID": 128049313, "eddbID": 786, "grp": "bh", "cost": 10476780, "mass": 35, "explres": -0.5, "kinres": -0.75, "thermres": 0.5, "hullboost": 2.5  },
       { "id": "Bc", "edID": 128049314, "eddbID": 787, "grp": "bh", "cost": 11609670, "mass": 35, "explres": 0.2, "kinres": 0.25, "thermres": -0.4, "hullboost": 2.5 }
     ],