diff --git a/dist/index.js b/dist/index.js
index 77135c8..2b4223d 100644
--- a/dist/index.js
+++ b/dist/index.js
@@ -395,7 +395,7 @@ module.exports = {
         horizons: true
       },
       bulkheads: [ {
-        id: "CI",
+        id: "3U",
         edID: 128816583,
         eddbID: 1659,
         grp: "bh",
@@ -407,7 +407,7 @@ module.exports = {
         thermres: 0,
         hullboost: .8
       }, {
-        id: "CJ",
+        id: "3V",
         edID: 128816584,
         eddbID: 1660,
         grp: "bh",
@@ -419,7 +419,7 @@ module.exports = {
         thermres: 0,
         hullboost: 1.52
       }, {
-        id: "CK",
+        id: "3W",
         edID: 128816585,
         eddbID: 1661,
         grp: "bh",
@@ -431,7 +431,7 @@ module.exports = {
         thermres: 0,
         hullboost: 2.5
       }, {
-        id: "CL",
+        id: "3X",
         edID: 128816586,
         eddbID: 1662,
         grp: "bh",
@@ -443,7 +443,7 @@ module.exports = {
         thermres: .5,
         hullboost: 2.5
       }, {
-        id: "CM",
+        id: "3Z",
         edID: 128816587,
         eddbID: 1663,
         grp: "bh",
@@ -498,7 +498,7 @@ module.exports = {
       },
       defaults: {
         standard: [ "6E", "6E", "5E", "5E", "6E", "4E", "4C" ],
-        hardpoints: [ 17, 0, 17, 0, 0, 0, 0, 0, 0, 0 ],
+        hardpoints: [ 17, 0, 17, 0, 0, 0, 0, 0, 0 ],
         internal: [ "04", "4e", "02", "", "", "", "", "" ]
       }
     },
@@ -2846,9 +2846,9 @@ module.exports = {
       },
       retailCost: 37472254,
       bulkheads: [ {
-        id: "2T",
+        id: "3B",
         edID: 128839283,
-        eddbID: 1645,
+        eddbID: 1768,
         grp: "bh",
         cost: 0,
         mass: 0,
@@ -2858,9 +2858,9 @@ module.exports = {
         thermres: 0,
         hullboost: .8
       }, {
-        id: "2U",
+        id: "3C",
         edID: 128839284,
-        eddbID: 1646,
+        eddbID: 1769,
         grp: "bh",
         cost: 22791270,
         mass: 36,
@@ -2870,9 +2870,9 @@ module.exports = {
         thermres: 0,
         hullboost: 1.52
       }, {
-        id: "2V",
+        id: "3D",
         edID: 128839285,
-        eddbID: 1647,
+        eddbID: 1770,
         grp: "bh",
         cost: 51280360,
         mass: 67,
@@ -2882,9 +2882,9 @@ module.exports = {
         thermres: 0,
         hullboost: 2.5
       }, {
-        id: "2W",
+        id: "3E",
         edID: 128839286,
-        eddbID: 1648,
+        eddbID: 1771,
         grp: "bh",
         cost: 121192590,
         mass: 67,
@@ -2894,9 +2894,9 @@ module.exports = {
         thermres: .5,
         hullboost: 2.5
       }, {
-        id: "2X",
+        id: "3F",
         edID: 128839287,
-        eddbID: 1649,
+        eddbID: 1772,
         grp: "bh",
         cost: 134297570,
         mass: 67,
@@ -2913,7 +2913,7 @@ module.exports = {
       },
       defaults: {
         standard: [ "7E", "6E", "5E", "4E", "7E", "6E", "5C" ],
-        hardpoints: [ 0, 0, "17", "17", 0, 0, 0, 0, 0 ],
+        hardpoints: [ 0, 0, "17", "17", 0, 0, 0, 0 ],
         internal: [ "4j", "04", "04", "04", 0, "", 0, "00" ]
       }
     },
@@ -3039,9 +3039,9 @@ module.exports = {
       },
       retailCost: 55867041,
       bulkheads: [ {
-        id: "2T",
+        id: "1A",
         edID: 128915981,
-        eddbID: 813,
+        eddbID: 1798,
         grp: "bh",
         cost: 0,
         mass: 0,
@@ -3051,9 +3051,9 @@ module.exports = {
         thermres: 0,
         hullboost: .8
       }, {
-        id: "2U",
+        id: "1B",
         edID: 128915982,
-        eddbID: 814,
+        eddbID: 1799,
         grp: "bh",
         cost: 20626820,
         mass: 19,
@@ -3063,9 +3063,9 @@ module.exports = {
         thermres: 0,
         hullboost: 1.52
       }, {
-        id: "2V",
+        id: "1C",
         edID: 128915983,
-        eddbID: 815,
+        eddbID: 1800,
         grp: "bh",
         cost: 46410340,
         mass: 38,
@@ -3075,9 +3075,9 @@ module.exports = {
         thermres: 0,
         hullboost: 2.5
       }, {
-        id: "2W",
+        id: "1D",
         edID: 128915984,
-        eddbID: 816,
+        eddbID: 1801,
         grp: "bh",
         cost: 109683090,
         mass: 38,
@@ -3087,9 +3087,9 @@ module.exports = {
         thermres: .5,
         hullboost: 2.5
       }, {
-        id: "2X",
+        id: "3A",
         edID: 128915985,
-        eddbID: 817,
+        eddbID: 1802,
         grp: "bh",
         cost: 121543510,
         mass: 38,
@@ -13414,7 +13414,7 @@ module.exports = {
         class: 4,
         cost: 94330,
         edID: 128833944,
-        eddbID: 1552,
+        eddbID: 1699,
         grp: "cr",
         id: "0W",
         name: "Corrosion Resistant",
@@ -18587,7 +18587,7 @@ module.exports = {
         cost: 1e4,
         edID: 128833965,
         power: .35,
-        eddbID: 1373,
+        eddbID: 1720,
         grp: "gsrp",
         id: "0Z",
         mass: 2,
@@ -18600,7 +18600,7 @@ module.exports = {
         cost: 3e4,
         edID: 128833966,
         power: .46,
-        eddbID: 1373,
+        eddbID: 1721,
         grp: "gsrp",
         id: "0y",
         mass: 1,
@@ -18613,7 +18613,7 @@ module.exports = {
         cost: 24e3,
         edID: 128833967,
         power: .56,
-        eddbID: 1373,
+        eddbID: 1722,
         grp: "gsrp",
         id: "0z",
         mass: 4,
@@ -18626,7 +18626,7 @@ module.exports = {
         cost: 72e3,
         edID: 128833968,
         power: .67,
-        eddbID: 1373,
+        eddbID: 1723,
         grp: "gsrp",
         id: "1E",
         mass: 2,
@@ -18639,7 +18639,7 @@ module.exports = {
         cost: 172800,
         edID: 128833970,
         power: .84,
-        eddbID: 1373,
+        eddbID: 1725,
         grp: "gsrp",
         id: "1F",
         mass: 4,
@@ -18652,7 +18652,7 @@ module.exports = {
         cost: 57600,
         edID: 128833969,
         power: .74,
-        eddbID: 1373,
+        eddbID: 1724,
         grp: "gsrp",
         id: "1G",
         mass: 8,
@@ -18665,7 +18665,7 @@ module.exports = {
         cost: 138240,
         edID: 128833971,
         power: .95,
-        eddbID: 1373,
+        eddbID: 1726,
         grp: "gsrp",
         id: "1I",
         mass: 16,
@@ -18678,7 +18678,7 @@ module.exports = {
         cost: 414720,
         edID: 128833972,
         power: 1.05,
-        eddbID: 1373,
+        eddbID: 1727,
         grp: "gsrp",
         id: "1J",
         mass: 8,
@@ -18691,7 +18691,7 @@ module.exports = {
         cost: 995330,
         edID: 128833974,
         power: 1.26,
-        eddbID: 1373,
+        eddbID: 1729,
         grp: "gsrp",
         id: "1K",
         mass: 16,
@@ -18704,7 +18704,7 @@ module.exports = {
         cost: 331778,
         edID: 128833973,
         power: 1.16,
-        eddbID: 1373,
+        eddbID: 1728,
         grp: "gsrp",
         id: "1L",
         mass: 32,
@@ -18718,7 +18718,7 @@ module.exports = {
         cost: 405022,
         edID: 128833975,
         power: .75,
-        eddbID: 1373,
+        eddbID: 1730,
         grp: "gfsb",
         id: "1H",
         mass: 1.3,
@@ -18731,7 +18731,7 @@ module.exports = {
         cost: 810521,
         edID: 128833976,
         power: .98,
-        eddbID: 1373,
+        eddbID: 1731,
         grp: "gfsb",
         id: "1M",
         mass: 1.3,
@@ -18744,7 +18744,7 @@ module.exports = {
         cost: 1620431,
         edID: 128833977,
         power: 1.27,
-        eddbID: 1373,
+        eddbID: 1732,
         grp: "gfsb",
         id: "1N",
         mass: 1.3,
@@ -18757,7 +18757,7 @@ module.exports = {
         cost: 3245013,
         edID: 128833978,
         power: 1.65,
-        eddbID: 1373,
+        eddbID: 1733,
         grp: "gfsb",
         id: "1P",
         mass: 1.3,
@@ -18770,7 +18770,7 @@ module.exports = {
         cost: 6483101,
         edID: 128833979,
         power: 2.14,
-        eddbID: 1373,
+        eddbID: 1734,
         grp: "gfsb",
         id: "1O",
         mass: 1.3,
@@ -18783,7 +18783,7 @@ module.exports = {
         mass: 1,
         id: "1V",
         edID: 128833946,
-        eddbID: 0,
+        eddbID: 1701,
         power: .56,
         hullreinforcement: 138,
         causres: .05,
@@ -18799,7 +18799,7 @@ module.exports = {
         mass: 2,
         id: "1W",
         edID: 128833945,
-        eddbID: 0,
+        eddbID: 1700,
         power: .45,
         hullreinforcement: 100,
         causres: .05,
@@ -18815,7 +18815,7 @@ module.exports = {
         mass: 2,
         id: "1X",
         edID: 128833948,
-        eddbID: 0,
+        eddbID: 1703,
         power: .79,
         hullreinforcement: 238,
         causres: .05,
@@ -18831,7 +18831,7 @@ module.exports = {
         mass: 4,
         id: "1Y",
         edID: 128833947,
-        eddbID: 0,
+        eddbID: 1702,
         power: .68,
         hullreinforcement: 188,
         causres: .05,
@@ -18847,7 +18847,7 @@ module.exports = {
         mass: 4,
         id: "1Z",
         edID: 128833950,
-        eddbID: 0,
+        eddbID: 1705,
         power: 1.01,
         hullreinforcement: 325,
         causres: .05,
@@ -18863,7 +18863,7 @@ module.exports = {
         mass: 8,
         id: "2A",
         edID: 128833949,
-        eddbID: 0,
+        eddbID: 1704,
         power: .9,
         hullreinforcement: 288,
         causres: .05,
@@ -18878,7 +18878,7 @@ module.exports = {
         class: "4",
         mass: 8,
         edID: 128833952,
-        eddbID: 0,
+        eddbID: 1707,
         power: 1.24,
         hullreinforcement: 413,
         causres: .05,
@@ -18894,7 +18894,7 @@ module.exports = {
         class: "4",
         mass: 16,
         edID: 128833951,
-        eddbID: 0,
+        eddbID: 1706,
         power: 1.13,
         hullreinforcement: 375,
         causres: .05,
@@ -18910,7 +18910,7 @@ module.exports = {
         class: "5",
         mass: 16,
         edID: 128833954,
-        eddbID: 0,
+        eddbID: 1709,
         power: 1.46,
         hullreinforcement: 488,
         causres: .05,
@@ -18926,7 +18926,7 @@ module.exports = {
         class: "5",
         mass: 32,
         edID: 128833953,
-        eddbID: 0,
+        eddbID: 1708,
         power: 1.35,
         hullreinforcement: 450,
         causres: .05,
@@ -18942,7 +18942,7 @@ module.exports = {
         rating: "D",
         class: "1",
         mass: 1,
-        eddbID: 0,
+        eddbID: 1711,
         power: .34,
         protection: .6,
         integrity: 77,
@@ -18955,7 +18955,7 @@ module.exports = {
         rating: "E",
         class: "1",
         mass: 2,
-        eddbID: 0,
+        eddbID: 1710,
         power: .27,
         protection: .3,
         integrity: 85,
@@ -18968,7 +18968,7 @@ module.exports = {
         rating: "D",
         class: "2",
         mass: 2,
-        eddbID: 0,
+        eddbID: 1713,
         power: .47,
         protection: .6,
         integrity: 116,
@@ -18981,7 +18981,7 @@ module.exports = {
         rating: "E",
         class: "2",
         mass: 4,
-        eddbID: 0,
+        eddbID: 1712,
         power: .41,
         protection: .3,
         integrity: 127,
@@ -18994,7 +18994,7 @@ module.exports = {
         rating: "D",
         class: "3",
         mass: 4,
-        eddbID: 0,
+        eddbID: 1715,
         power: .61,
         protection: .6,
         integrity: 171,
@@ -19007,7 +19007,7 @@ module.exports = {
         rating: "E",
         class: "3",
         mass: 8,
-        eddbID: 0,
+        eddbID: 1714,
         power: .54,
         protection: .3,
         integrity: 187,
@@ -19020,7 +19020,7 @@ module.exports = {
         rating: "D",
         class: "4",
         mass: 8,
-        eddbID: 0,
+        eddbID: 1717,
         power: .74,
         protection: .6,
         integrity: 259,
@@ -19033,7 +19033,7 @@ module.exports = {
         rating: "E",
         class: "4",
         mass: 16,
-        eddbID: 0,
+        eddbID: 1716,
         power: .68,
         protection: .3,
         integrity: 286,
@@ -19046,7 +19046,7 @@ module.exports = {
         rating: "D",
         class: "5",
         mass: 16,
-        eddbID: 0,
+        eddbID: 1719,
         power: .88,
         protection: .6,
         integrity: 385,
@@ -19059,7 +19059,7 @@ module.exports = {
         rating: "E",
         class: "5",
         mass: 32,
-        eddbID: 0,
+        eddbID: 1718,
         power: .81,
         protection: .3,
         integrity: 424,
@@ -26503,20 +26503,6 @@ module.exports = {
         method: "additive",
         higherbetter: true
       },
-      scanrange: {
-        id: 51,
-        name: "scanrange",
-        type: "numeric",
-        method: "additive",
-        higherbetter: true
-      },
-      maxangle: {
-        id: 51,
-        name: "maxangle",
-        type: "numeric",
-        method: "additive",
-        higherbetter: true
-      },
       chargetime: {
         id: 52,
         name: "chargetime",
@@ -26530,6 +26516,20 @@ module.exports = {
         type: "percentage",
         method: "additive",
         higherbetter: true
+      },
+      scanrange: {
+        id: 54,
+        name: "scanrange",
+        type: "numeric",
+        method: "additive",
+        higherbetter: true
+      },
+      maxangle: {
+        id: 55,
+        name: "maxangle",
+        type: "numeric",
+        method: "additive",
+        higherbetter: true
       }
     },
     modifierActions: {
diff --git a/dist/index.json b/dist/index.json
index 0867161..584ee01 100644
--- a/dist/index.json
+++ b/dist/index.json
@@ -569,7 +569,7 @@
 			},
 			"bulkheads": [
 				{
-					"id": "CI",
+					"id": "3U",
 					"edID": 128816583,
 					"eddbID": 1659,
 					"grp": "bh",
@@ -582,7 +582,7 @@
 					"hullboost": 0.8
 				},
 				{
-					"id": "CJ",
+					"id": "3V",
 					"edID": 128816584,
 					"eddbID": 1660,
 					"grp": "bh",
@@ -595,7 +595,7 @@
 					"hullboost": 1.52
 				},
 				{
-					"id": "CK",
+					"id": "3W",
 					"edID": 128816585,
 					"eddbID": 1661,
 					"grp": "bh",
@@ -608,7 +608,7 @@
 					"hullboost": 2.5
 				},
 				{
-					"id": "CL",
+					"id": "3X",
 					"edID": 128816586,
 					"eddbID": 1662,
 					"grp": "bh",
@@ -621,7 +621,7 @@
 					"hullboost": 2.5
 				},
 				{
-					"id": "CM",
+					"id": "3Z",
 					"edID": 128816587,
 					"eddbID": 1663,
 					"grp": "bh",
@@ -723,7 +723,6 @@
 					0,
 					0,
 					0,
-					0,
 					0
 				],
 				"internal": [
@@ -4353,9 +4352,9 @@
 			"retailCost": 37472254,
 			"bulkheads": [
 				{
-					"id": "2T",
+					"id": "3B",
 					"edID": 128839283,
-					"eddbID": 1645,
+					"eddbID": 1768,
 					"grp": "bh",
 					"cost": 0,
 					"mass": 0,
@@ -4366,9 +4365,9 @@
 					"hullboost": 0.8
 				},
 				{
-					"id": "2U",
+					"id": "3C",
 					"edID": 128839284,
-					"eddbID": 1646,
+					"eddbID": 1769,
 					"grp": "bh",
 					"cost": 22791270,
 					"mass": 36,
@@ -4379,9 +4378,9 @@
 					"hullboost": 1.52
 				},
 				{
-					"id": "2V",
+					"id": "3D",
 					"edID": 128839285,
-					"eddbID": 1647,
+					"eddbID": 1770,
 					"grp": "bh",
 					"cost": 51280360,
 					"mass": 67,
@@ -4392,9 +4391,9 @@
 					"hullboost": 2.5
 				},
 				{
-					"id": "2W",
+					"id": "3E",
 					"edID": 128839286,
-					"eddbID": 1648,
+					"eddbID": 1771,
 					"grp": "bh",
 					"cost": 121192590,
 					"mass": 67,
@@ -4405,9 +4404,9 @@
 					"hullboost": 2.5
 				},
 				{
-					"id": "2X",
+					"id": "3F",
 					"edID": 128839287,
-					"eddbID": 1649,
+					"eddbID": 1772,
 					"grp": "bh",
 					"cost": 134297570,
 					"mass": 67,
@@ -4467,7 +4466,6 @@
 					0,
 					0,
 					0,
-					0,
 					0
 				],
 				"internal": [
@@ -4661,9 +4659,9 @@
 			"retailCost": 55867041,
 			"bulkheads": [
 				{
-					"id": "2T",
+					"id": "1A",
 					"edID": 128915981,
-					"eddbID": 813,
+					"eddbID": 1798,
 					"grp": "bh",
 					"cost": 0,
 					"mass": 0,
@@ -4674,9 +4672,9 @@
 					"hullboost": 0.8
 				},
 				{
-					"id": "2U",
+					"id": "1B",
 					"edID": 128915982,
-					"eddbID": 814,
+					"eddbID": 1799,
 					"grp": "bh",
 					"cost": 20626820,
 					"mass": 19,
@@ -4687,9 +4685,9 @@
 					"hullboost": 1.52
 				},
 				{
-					"id": "2V",
+					"id": "1C",
 					"edID": 128915983,
-					"eddbID": 815,
+					"eddbID": 1800,
 					"grp": "bh",
 					"cost": 46410340,
 					"mass": 38,
@@ -4700,9 +4698,9 @@
 					"hullboost": 2.5
 				},
 				{
-					"id": "2W",
+					"id": "1D",
 					"edID": 128915984,
-					"eddbID": 816,
+					"eddbID": 1801,
 					"grp": "bh",
 					"cost": 109683090,
 					"mass": 38,
@@ -4713,9 +4711,9 @@
 					"hullboost": 2.5
 				},
 				{
-					"id": "2X",
+					"id": "3A",
 					"edID": 128915985,
-					"eddbID": 817,
+					"eddbID": 1802,
 					"grp": "bh",
 					"cost": 121543510,
 					"mass": 38,
@@ -16129,7 +16127,7 @@
 					"class": 4,
 					"cost": 94330,
 					"edID": 128833944,
-					"eddbID": 1552,
+					"eddbID": 1699,
 					"grp": "cr",
 					"id": "0W",
 					"name": "Corrosion Resistant",
@@ -21666,7 +21664,7 @@
 					"cost": 10000,
 					"edID": 128833965,
 					"power": 0.35,
-					"eddbID": 1373,
+					"eddbID": 1720,
 					"grp": "gsrp",
 					"id": "0Z",
 					"mass": 2,
@@ -21680,7 +21678,7 @@
 					"cost": 30000,
 					"edID": 128833966,
 					"power": 0.46,
-					"eddbID": 1373,
+					"eddbID": 1721,
 					"grp": "gsrp",
 					"id": "0y",
 					"mass": 1,
@@ -21694,7 +21692,7 @@
 					"cost": 24000,
 					"edID": 128833967,
 					"power": 0.56,
-					"eddbID": 1373,
+					"eddbID": 1722,
 					"grp": "gsrp",
 					"id": "0z",
 					"mass": 4,
@@ -21708,7 +21706,7 @@
 					"cost": 72000,
 					"edID": 128833968,
 					"power": 0.67,
-					"eddbID": 1373,
+					"eddbID": 1723,
 					"grp": "gsrp",
 					"id": "1E",
 					"mass": 2,
@@ -21722,7 +21720,7 @@
 					"cost": 172800,
 					"edID": 128833970,
 					"power": 0.84,
-					"eddbID": 1373,
+					"eddbID": 1725,
 					"grp": "gsrp",
 					"id": "1F",
 					"mass": 4,
@@ -21736,7 +21734,7 @@
 					"cost": 57600,
 					"edID": 128833969,
 					"power": 0.74,
-					"eddbID": 1373,
+					"eddbID": 1724,
 					"grp": "gsrp",
 					"id": "1G",
 					"mass": 8,
@@ -21750,7 +21748,7 @@
 					"cost": 138240,
 					"edID": 128833971,
 					"power": 0.95,
-					"eddbID": 1373,
+					"eddbID": 1726,
 					"grp": "gsrp",
 					"id": "1I",
 					"mass": 16,
@@ -21764,7 +21762,7 @@
 					"cost": 414720,
 					"edID": 128833972,
 					"power": 1.05,
-					"eddbID": 1373,
+					"eddbID": 1727,
 					"grp": "gsrp",
 					"id": "1J",
 					"mass": 8,
@@ -21778,7 +21776,7 @@
 					"cost": 995330,
 					"edID": 128833974,
 					"power": 1.26,
-					"eddbID": 1373,
+					"eddbID": 1729,
 					"grp": "gsrp",
 					"id": "1K",
 					"mass": 16,
@@ -21792,7 +21790,7 @@
 					"cost": 331778,
 					"edID": 128833973,
 					"power": 1.16,
-					"eddbID": 1373,
+					"eddbID": 1728,
 					"grp": "gsrp",
 					"id": "1L",
 					"mass": 32,
@@ -21808,7 +21806,7 @@
 					"cost": 405022,
 					"edID": 128833975,
 					"power": 0.75,
-					"eddbID": 1373,
+					"eddbID": 1730,
 					"grp": "gfsb",
 					"id": "1H",
 					"mass": 1.3,
@@ -21822,7 +21820,7 @@
 					"cost": 810521,
 					"edID": 128833976,
 					"power": 0.98,
-					"eddbID": 1373,
+					"eddbID": 1731,
 					"grp": "gfsb",
 					"id": "1M",
 					"mass": 1.3,
@@ -21836,7 +21834,7 @@
 					"cost": 1620431,
 					"edID": 128833977,
 					"power": 1.27,
-					"eddbID": 1373,
+					"eddbID": 1732,
 					"grp": "gfsb",
 					"id": "1N",
 					"mass": 1.3,
@@ -21850,7 +21848,7 @@
 					"cost": 3245013,
 					"edID": 128833978,
 					"power": 1.65,
-					"eddbID": 1373,
+					"eddbID": 1733,
 					"grp": "gfsb",
 					"id": "1P",
 					"mass": 1.3,
@@ -21864,7 +21862,7 @@
 					"cost": 6483101,
 					"edID": 128833979,
 					"power": 2.14,
-					"eddbID": 1373,
+					"eddbID": 1734,
 					"grp": "gfsb",
 					"id": "1O",
 					"mass": 1.3,
@@ -21879,7 +21877,7 @@
 					"mass": 1,
 					"id": "1V",
 					"edID": 128833946,
-					"eddbID": 0,
+					"eddbID": 1701,
 					"power": 0.56,
 					"hullreinforcement": 138,
 					"causres": 0.05,
@@ -21896,7 +21894,7 @@
 					"mass": 2,
 					"id": "1W",
 					"edID": 128833945,
-					"eddbID": 0,
+					"eddbID": 1700,
 					"power": 0.45,
 					"hullreinforcement": 100,
 					"causres": 0.05,
@@ -21913,7 +21911,7 @@
 					"mass": 2,
 					"id": "1X",
 					"edID": 128833948,
-					"eddbID": 0,
+					"eddbID": 1703,
 					"power": 0.79,
 					"hullreinforcement": 238,
 					"causres": 0.05,
@@ -21930,7 +21928,7 @@
 					"mass": 4,
 					"id": "1Y",
 					"edID": 128833947,
-					"eddbID": 0,
+					"eddbID": 1702,
 					"power": 0.68,
 					"hullreinforcement": 188,
 					"causres": 0.05,
@@ -21947,7 +21945,7 @@
 					"mass": 4,
 					"id": "1Z",
 					"edID": 128833950,
-					"eddbID": 0,
+					"eddbID": 1705,
 					"power": 1.01,
 					"hullreinforcement": 325,
 					"causres": 0.05,
@@ -21964,7 +21962,7 @@
 					"mass": 8,
 					"id": "2A",
 					"edID": 128833949,
-					"eddbID": 0,
+					"eddbID": 1704,
 					"power": 0.9,
 					"hullreinforcement": 288,
 					"causres": 0.05,
@@ -21980,7 +21978,7 @@
 					"class": "4",
 					"mass": 8,
 					"edID": 128833952,
-					"eddbID": 0,
+					"eddbID": 1707,
 					"power": 1.24,
 					"hullreinforcement": 413,
 					"causres": 0.05,
@@ -21997,7 +21995,7 @@
 					"class": "4",
 					"mass": 16,
 					"edID": 128833951,
-					"eddbID": 0,
+					"eddbID": 1706,
 					"power": 1.13,
 					"hullreinforcement": 375,
 					"causres": 0.05,
@@ -22014,7 +22012,7 @@
 					"class": "5",
 					"mass": 16,
 					"edID": 128833954,
-					"eddbID": 0,
+					"eddbID": 1709,
 					"power": 1.46,
 					"hullreinforcement": 488,
 					"causres": 0.05,
@@ -22031,7 +22029,7 @@
 					"class": "5",
 					"mass": 32,
 					"edID": 128833953,
-					"eddbID": 0,
+					"eddbID": 1708,
 					"power": 1.35,
 					"hullreinforcement": 450,
 					"causres": 0.05,
@@ -22049,7 +22047,7 @@
 					"rating": "D",
 					"class": "1",
 					"mass": 1,
-					"eddbID": 0,
+					"eddbID": 1711,
 					"power": 0.34,
 					"protection": 0.6,
 					"integrity": 77,
@@ -22063,7 +22061,7 @@
 					"rating": "E",
 					"class": "1",
 					"mass": 2,
-					"eddbID": 0,
+					"eddbID": 1710,
 					"power": 0.27,
 					"protection": 0.3,
 					"integrity": 85,
@@ -22077,7 +22075,7 @@
 					"rating": "D",
 					"class": "2",
 					"mass": 2,
-					"eddbID": 0,
+					"eddbID": 1713,
 					"power": 0.47,
 					"protection": 0.6,
 					"integrity": 116,
@@ -22091,7 +22089,7 @@
 					"rating": "E",
 					"class": "2",
 					"mass": 4,
-					"eddbID": 0,
+					"eddbID": 1712,
 					"power": 0.41,
 					"protection": 0.3,
 					"integrity": 127,
@@ -22105,7 +22103,7 @@
 					"rating": "D",
 					"class": "3",
 					"mass": 4,
-					"eddbID": 0,
+					"eddbID": 1715,
 					"power": 0.61,
 					"protection": 0.6,
 					"integrity": 171,
@@ -22119,7 +22117,7 @@
 					"rating": "E",
 					"class": "3",
 					"mass": 8,
-					"eddbID": 0,
+					"eddbID": 1714,
 					"power": 0.54,
 					"protection": 0.3,
 					"integrity": 187,
@@ -22133,7 +22131,7 @@
 					"rating": "D",
 					"class": "4",
 					"mass": 8,
-					"eddbID": 0,
+					"eddbID": 1717,
 					"power": 0.74,
 					"protection": 0.6,
 					"integrity": 259,
@@ -22147,7 +22145,7 @@
 					"rating": "E",
 					"class": "4",
 					"mass": 16,
-					"eddbID": 0,
+					"eddbID": 1716,
 					"power": 0.68,
 					"protection": 0.3,
 					"integrity": 286,
@@ -22161,7 +22159,7 @@
 					"rating": "D",
 					"class": "5",
 					"mass": 16,
-					"eddbID": 0,
+					"eddbID": 1719,
 					"power": 0.88,
 					"protection": 0.6,
 					"integrity": 385,
@@ -22175,7 +22173,7 @@
 					"rating": "E",
 					"class": "5",
 					"mass": 32,
-					"eddbID": 0,
+					"eddbID": 1718,
 					"power": 0.81,
 					"protection": 0.3,
 					"integrity": 424,
@@ -34584,20 +34582,6 @@
 				"method": "additive",
 				"higherbetter": true
 			},
-			"scanrange": {
-				"id": 51,
-				"name": "scanrange",
-				"type": "numeric",
-				"method": "additive",
-				"higherbetter": true
-			},
-			"maxangle": {
-				"id": 51,
-				"name": "maxangle",
-				"type": "numeric",
-				"method": "additive",
-				"higherbetter": true
-			},
 			"chargetime": {
 				"id": 52,
 				"name": "chargetime",
@@ -34611,6 +34595,20 @@
 				"type": "percentage",
 				"method": "additive",
 				"higherbetter": true
+			},
+			"scanrange": {
+				"id": 54,
+				"name": "scanrange",
+				"type": "numeric",
+				"method": "additive",
+				"higherbetter": true
+			},
+			"maxangle": {
+				"id": 55,
+				"name": "maxangle",
+				"type": "numeric",
+				"method": "additive",
+				"higherbetter": true
 			}
 		},
 		"modifierActions": {
diff --git a/modifications/modifications.json b/modifications/modifications.json
index f05f509..caddfc3 100644
--- a/modifications/modifications.json
+++ b/modifications/modifications.json
@@ -51,8 +51,8 @@
     "shieldreinforcement": {"id": 39, "name": "shieldreinforcement", "type": "percentage", "method": "multiplicative", "higherbetter": true},
     "jumpboost": {"id": 47, "name": "jumpboost", "type": "numeric", "method": "additive", "higherbetter": true},
     "shieldaddition": {"id": 50, "name": "shieldaddition", "type": "numeric", "method": "additive", "higherbetter": true},
-    "scanrange": {"id": 51, "name": "scanrange", "type": "numeric", "method": "additive", "higherbetter": true},
-    "maxangle": {"id": 51, "name": "maxangle", "type": "numeric", "method": "additive", "higherbetter": true},
     "chargetime": {"id": 52, "name": "chargetime", "type": "percentage", "method": "multiplicative", "higherbetter": false},
-    "proberadius": {"id": 53, "name": "proberadius", "type": "percentage", "method": "additive", "higherbetter": true}
+    "proberadius": {"id": 53, "name": "proberadius", "type": "percentage", "method": "additive", "higherbetter": true},
+    "scanrange": {"id": 54, "name": "scanrange", "type": "numeric", "method": "additive", "higherbetter": true},
+    "maxangle": {"id": 55, "name": "maxangle", "type": "numeric", "method": "additive", "higherbetter": true}
 }
diff --git a/modules/internal/cargo_rack.json b/modules/internal/cargo_rack.json
index 259bb0d..814327f 100644
--- a/modules/internal/cargo_rack.json
+++ b/modules/internal/cargo_rack.json
@@ -140,7 +140,7 @@
       "class": 4,
       "cost": 94330,
       "edID": 128833944,
-      "eddbID": 1552,
+      "eddbID": 1699,
       "grp": "cr",
       "id": "0W",
       "name": "Corrosion Resistant",
diff --git a/modules/internal/guardian_fsd_booster.json b/modules/internal/guardian_fsd_booster.json
index 62d4b5a..535395f 100644
--- a/modules/internal/guardian_fsd_booster.json
+++ b/modules/internal/guardian_fsd_booster.json
@@ -7,7 +7,7 @@
       "cost": 405022,
       "edID": 128833975,
       "power": 0.75,
-      "eddbID": 1373,
+      "eddbID": 1730,
       "grp": "gfsb",
       "id": "1H",
       "mass": 1.3,
@@ -21,7 +21,7 @@
       "cost": 810521,
       "edID": 128833976,
       "power": 0.98,
-      "eddbID": 1373,
+      "eddbID": 1731,
       "grp": "gfsb",
       "id": "1M",
       "mass": 1.3,
@@ -35,7 +35,7 @@
       "cost": 1620431,
       "edID": 128833977,
       "power": 1.27,
-      "eddbID": 1373,
+      "eddbID": 1732,
       "grp": "gfsb",
       "id": "1N",
       "mass": 1.3,
@@ -49,7 +49,7 @@
       "cost": 3245013,
       "edID": 128833978,
       "power": 1.65,
-      "eddbID": 1373,
+      "eddbID": 1733,
       "grp": "gfsb",
       "id": "1P",
       "mass": 1.3,
@@ -63,7 +63,7 @@
       "cost": 6483101,
       "edID": 128833979,
       "power": 2.14,
-      "eddbID": 1373,
+      "eddbID": 1734,
       "grp": "gfsb",
       "id": "1O",
       "mass": 1.3,
diff --git a/modules/internal/guardian_hull_reinforcement_package.json b/modules/internal/guardian_hull_reinforcement_package.json
index 5da417a..3bae45a 100644
--- a/modules/internal/guardian_hull_reinforcement_package.json
+++ b/modules/internal/guardian_hull_reinforcement_package.json
@@ -6,7 +6,7 @@
       "mass": 1,
       "id": "1V",
       "edID": 128833946,
-      "eddbID": 0,
+      "eddbID": 1701,
       "power": 0.56,
       "hullreinforcement": 138,
       "causres": 0.05,
@@ -23,7 +23,7 @@
       "mass": 2,
       "id": "1W",
       "edID": 128833945,
-      "eddbID": 0,
+      "eddbID": 1700,
       "power": 0.45,
       "hullreinforcement": 100,
       "causres": 0.05,
@@ -40,7 +40,7 @@
       "mass": 2,
       "id": "1X",
       "edID": 128833948,
-      "eddbID": 0,
+      "eddbID": 1703,
       "power": 0.79,
       "hullreinforcement": 238,
       "causres": 0.05,
@@ -57,7 +57,7 @@
       "mass": 4,
       "id": "1Y",
       "edID": 128833947,
-      "eddbID": 0,
+      "eddbID": 1702,
       "power": 0.68,
       "hullreinforcement": 188,
       "causres": 0.05,
@@ -74,7 +74,7 @@
       "mass": 4,
       "id": "1Z",
       "edID": 128833950,
-      "eddbID": 0,
+      "eddbID": 1705,
       "power": 1.01,
       "hullreinforcement": 325,
       "causres": 0.05,
@@ -91,7 +91,7 @@
       "mass": 8,
       "id": "2A",
       "edID": 128833949,
-      "eddbID": 0,
+      "eddbID": 1704,
       "power": 0.9,
       "hullreinforcement": 288,
       "causres": 0.05,
@@ -107,7 +107,7 @@
       "class": "4",
       "mass": 8,
       "edID": 128833952,
-      "eddbID": 0,
+      "eddbID": 1707,
       "power": 1.24,
       "hullreinforcement": 413,
       "causres": 0.05,
@@ -124,7 +124,7 @@
       "class": "4",
       "mass": 16,
       "edID": 128833951,
-      "eddbID": 0,
+      "eddbID": 1706,
       "power": 1.13,
       "hullreinforcement": 375,
       "causres": 0.05,
@@ -141,7 +141,7 @@
       "class": "5",
       "mass": 16,
       "edID": 128833954,
-      "eddbID": 0,
+      "eddbID": 1709,
       "power": 1.46,
       "hullreinforcement": 488,
       "causres": 0.05,
@@ -158,7 +158,7 @@
       "class": "5",
       "mass": 32,
       "edID": 128833953,
-      "eddbID": 0,
+      "eddbID": 1708,
       "power": 1.35,
       "hullreinforcement": 450,
       "causres": 0.05,
diff --git a/modules/internal/guardian_module_reinforcement_package.json b/modules/internal/guardian_module_reinforcement_package.json
index 53137e3..298b904 100644
--- a/modules/internal/guardian_module_reinforcement_package.json
+++ b/modules/internal/guardian_module_reinforcement_package.json
@@ -4,7 +4,7 @@
       "rating": "D",
       "class": "1",
       "mass": 1,
-      "eddbID": 0,
+      "eddbID": 1711,
       "power": 0.34,
       "protection": 0.6,
       "integrity": 77,
@@ -18,7 +18,7 @@
       "rating": "E",
       "class": "1",
       "mass": 2,
-      "eddbID": 0,
+      "eddbID": 1710,
       "power": 0.27,
       "protection": 0.3,
       "integrity": 85,
@@ -32,7 +32,7 @@
       "rating": "D",
       "class": "2",
       "mass": 2,
-      "eddbID": 0,
+      "eddbID": 1713,
       "power": 0.47,
       "protection": 0.6,
       "integrity": 116,
@@ -46,7 +46,7 @@
       "rating": "E",
       "class": "2",
       "mass": 4,
-      "eddbID": 0,
+      "eddbID": 1712,
       "power": 0.41,
       "protection": 0.3,
       "integrity": 127,
@@ -60,7 +60,7 @@
       "rating": "D",
       "class": "3",
       "mass": 4,
-      "eddbID": 0,
+      "eddbID": 1715,
       "power": 0.61,
       "protection": 0.6,
       "integrity": 171,
@@ -74,7 +74,7 @@
       "rating": "E",
       "class": "3",
       "mass": 8,
-      "eddbID": 0,
+      "eddbID": 1714,
       "power": 0.54,
       "protection": 0.3,
       "integrity": 187,
@@ -88,7 +88,7 @@
       "rating": "D",
       "class": "4",
       "mass": 8,
-      "eddbID": 0,
+      "eddbID": 1717,
       "power": 0.74,
       "protection": 0.6,
       "integrity": 259,
@@ -102,7 +102,7 @@
       "rating": "E",
       "class": "4",
       "mass": 16,
-      "eddbID": 0,
+      "eddbID": 1716,
       "power": 0.68,
       "protection": 0.3,
       "integrity": 286,
@@ -116,7 +116,7 @@
       "rating": "D",
       "class": "5",
       "mass": 16,
-      "eddbID": 0,
+      "eddbID": 1719,
       "power": 0.88,
       "protection": 0.6,
       "integrity": 385,
@@ -130,7 +130,7 @@
       "rating": "E",
       "class": "5",
       "mass": 32,
-      "eddbID": 0,
+      "eddbID": 1718,
       "power": 0.81,
       "protection": 0.3,
       "integrity": 424,
diff --git a/modules/internal/guardian_shield_reinforcement_package.json b/modules/internal/guardian_shield_reinforcement_package.json
index 2297765..4c5a0c1 100644
--- a/modules/internal/guardian_shield_reinforcement_package.json
+++ b/modules/internal/guardian_shield_reinforcement_package.json
@@ -7,7 +7,7 @@
       "cost": 10000,
       "edID": 128833965,
       "power": 0.35,
-      "eddbID": 1373,
+      "eddbID": 1720,
       "grp": "gsrp",
       "id": "0Z",
       "mass": 2,
@@ -21,7 +21,7 @@
       "cost": 30000,
       "edID": 128833966,
       "power": 0.46,
-      "eddbID": 1373,
+      "eddbID": 1721,
       "grp": "gsrp",
       "id": "0y",
       "mass": 1,
@@ -35,7 +35,7 @@
       "cost": 24000,
       "edID": 128833967,
       "power": 0.56,
-      "eddbID": 1373,
+      "eddbID": 1722,
       "grp": "gsrp",
       "id": "0z",
       "mass": 4,
@@ -49,7 +49,7 @@
       "cost": 72000,
       "edID": 128833968,
       "power": 0.67,
-      "eddbID": 1373,
+      "eddbID": 1723,
       "grp": "gsrp",
       "id": "1E",
       "mass": 2,
@@ -63,7 +63,7 @@
       "cost": 172800,
       "edID": 128833970,
       "power": 0.84,
-      "eddbID": 1373,
+      "eddbID": 1725,
       "grp": "gsrp",
       "id": "1F",
       "mass": 4,
@@ -77,7 +77,7 @@
       "cost": 57600,
       "edID": 128833969,
       "power": 0.74,
-      "eddbID": 1373,
+      "eddbID": 1724,
       "grp": "gsrp",
       "id": "1G",
       "mass": 8,
@@ -91,7 +91,7 @@
       "cost": 138240,
       "edID": 128833971,
       "power": 0.95,
-      "eddbID": 1373,
+      "eddbID": 1726,
       "grp": "gsrp",
       "id": "1I",
       "mass": 16,
@@ -105,7 +105,7 @@
       "cost": 414720,
       "edID": 128833972,
       "power": 1.05,
-      "eddbID": 1373,
+      "eddbID": 1727,
       "grp": "gsrp",
       "id": "1J",
       "mass": 8,
@@ -119,7 +119,7 @@
       "cost": 995330,
       "edID": 128833974,
       "power": 1.26,
-      "eddbID": 1373,
+      "eddbID": 1729,
       "grp": "gsrp",
       "id": "1K",
       "mass": 16,
@@ -133,7 +133,7 @@
       "cost": 331778,
       "edID": 128833973,
       "power": 1.16,
-      "eddbID": 1373,
+      "eddbID": 1728,
       "grp": "gsrp",
       "id": "1L",
       "mass": 32,
diff --git a/ships/alliance_crusader.json b/ships/alliance_crusader.json
index 3a933c9..629a3c2 100644
--- a/ships/alliance_crusader.json
+++ b/ships/alliance_crusader.json
@@ -28,11 +28,11 @@
       "horizons": true
     },
     "bulkheads": [
-      { "id": "CI", "edID": 128816583, "eddbID": 1659, "grp": "bh", "cost": 0, "mass": 0, "causres": 0, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 0.8 },
-      { "id": "CJ", "edID": 128816584, "eddbID": 1660, "grp": "bh", "cost": 6803170, "mass": 40, "causres": 0, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 1.52 },
-      { "id": "CK", "edID": 128816585, "eddbID": 1661, "grp": "bh", "cost": 15307134, "mass": 78, "causres": 0, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 2.5 },
-      { "id": "CL", "edID": 128816586, "eddbID": 1662, "grp": "bh", "cost": 36175859, "mass": 78, "causres": 0, "explres": -0.5, "kinres": -0.75, "thermres": 0.5, "hullboost": 2.5  },
-      { "id": "CM", "edID": 128816587, "eddbID": 1663, "grp": "bh", "cost": 40087682, "mass": 78, "causres": 0, "explres": 0.2, "kinres": 0.25, "thermres": -0.4, "hullboost": 2.5 }
+      { "id": "3U", "edID": 128816583, "eddbID": 1659, "grp": "bh", "cost": 0, "mass": 0, "causres": 0, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 0.8 },
+      { "id": "3V", "edID": 128816584, "eddbID": 1660, "grp": "bh", "cost": 6803170, "mass": 40, "causres": 0, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 1.52 },
+      { "id": "3W", "edID": 128816585, "eddbID": 1661, "grp": "bh", "cost": 15307134, "mass": 78, "causres": 0, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 2.5 },
+      { "id": "3X", "edID": 128816586, "eddbID": 1662, "grp": "bh", "cost": 36175859, "mass": 78, "causres": 0, "explres": -0.5, "kinres": -0.75, "thermres": 0.5, "hullboost": 2.5  },
+      { "id": "3Z", "edID": 128816587, "eddbID": 1663, "grp": "bh", "cost": 40087682, "mass": 78, "causres": 0, "explres": 0.2, "kinres": 0.25, "thermres": -0.4, "hullboost": 2.5 }
     ],
     "slots": {
       "standard": [6, 6, 5, 5, 6, 4, 4],
@@ -45,7 +45,7 @@
     },
     "defaults": {
       "standard": ["6E", "6E", "5E", "5E", "6E", "4E", "4C"],
-      "hardpoints": [17, 0, 17, 0, 0, 0, 0, 0, 0, 0],
+      "hardpoints": [17, 0, 17, 0, 0, 0, 0, 0, 0],
       "internal": ["04", "4e", "02", "", "", "", "", ""]
     }
   }
diff --git a/ships/krait_phantom.json b/ships/krait_phantom.json
index 8091734..c86ca09 100644
--- a/ships/krait_phantom.json
+++ b/ships/krait_phantom.json
@@ -25,9 +25,9 @@
     "retailCost": 37472254,
     "bulkheads": [
       {
-        "id": "2T",
+        "id": "3B",
         "edID": 128839283,
-        "eddbID": 1645,
+        "eddbID": 1768,
         "grp": "bh",
         "cost": 0,
         "mass": 0,
@@ -38,9 +38,9 @@
         "hullboost": 0.8
       },
       {
-        "id": "2U",
+        "id": "3C",
         "edID": 128839284,
-        "eddbID": 1646,
+        "eddbID": 1769,
         "grp": "bh",
         "cost": 22791270,
         "mass": 36,
@@ -51,9 +51,9 @@
         "hullboost": 1.52
       },
       {
-        "id": "2V",
+        "id": "3D",
         "edID": 128839285,
-        "eddbID": 1647,
+        "eddbID": 1770,
         "grp": "bh",
         "cost": 51280360,
         "mass": 67,
@@ -64,9 +64,9 @@
         "hullboost": 2.5
       },
       {
-        "id": "2W",
+        "id": "3E",
         "edID": 128839286,
-        "eddbID": 1648,
+        "eddbID": 1771,
         "grp": "bh",
         "cost": 121192590,
         "mass": 67,
@@ -77,9 +77,9 @@
         "hullboost": 2.5
       },
       {
-        "id": "2X",
+        "id": "3F",
         "edID": 128839287,
-        "eddbID": 1649,
+        "eddbID": 1772,
         "grp": "bh",
         "cost": 134297570,
         "mass": 67,
@@ -97,7 +97,7 @@
     },
     "defaults": {
       "standard": ["7E", "6E", "5E", "4E", "7E", "6E", "5C"],
-      "hardpoints": [0, 0, "17", "17", 0, 0, 0, 0, 0],
+      "hardpoints": [0, 0, "17", "17", 0, 0, 0, 0],
       "internal": ["4j", "04", "04", "04", 0, "", 0, "00"]
     }
   }
diff --git a/ships/mamba.json b/ships/mamba.json
index 0648d07..699270d 100644
--- a/ships/mamba.json
+++ b/ships/mamba.json
@@ -25,9 +25,9 @@
     "retailCost": 55867041,
     "bulkheads": [
       {
-        "id": "2T",
+        "id": "1A",
         "edID": 128915981,
-        "eddbID": 813,
+        "eddbID": 1798,
         "grp": "bh",
         "cost": 0,
         "mass": 0,
@@ -38,9 +38,9 @@
         "hullboost": 0.8
       },
       {
-        "id": "2U",
+        "id": "1B",
         "edID": 128915982,
-        "eddbID": 814,
+        "eddbID": 1799,
         "grp": "bh",
         "cost": 20626820,
         "mass": 19,
@@ -51,9 +51,9 @@
         "hullboost": 1.52
       },
       {
-        "id": "2V",
+        "id": "1C",
         "edID": 128915983,
-        "eddbID": 815,
+        "eddbID": 1800,
         "grp": "bh",
         "cost": 46410340,
         "mass": 38,
@@ -64,9 +64,9 @@
         "hullboost": 2.5
       },
       {
-        "id": "2W",
+        "id": "1D",
         "edID": 128915984,
-        "eddbID": 816,
+        "eddbID": 1801,
         "grp": "bh",
         "cost": 109683090,
         "mass": 38,
@@ -77,9 +77,9 @@
         "hullboost": 2.5
       },
       {
-        "id": "2X",
+        "id": "3A",
         "edID": 128915985,
-        "eddbID": 817,
+        "eddbID": 1802,
         "grp": "bh",
         "cost": 121543510,
         "mass": 38,