diff --git a/dist/index.js b/dist/index.js
index d3fcbac..95922f4 100644
--- a/dist/index.js
+++ b/dist/index.js
@@ -1406,27 +1406,27 @@ module.exports = {
       },
       retailCost: 76555840,
       bulkheads: [ {
-        id: "Bx",
+        id: "cl",
         eddbID: 803,
         cost: 0,
         mass: 0
       }, {
-        id: "By",
+        id: "cm",
         eddbID: 804,
         cost: 30622340,
         mass: 75
       }, {
-        id: "Bz",
+        id: "cn",
         eddbID: 805,
         cost: 68900260,
         mass: 150
       }, {
-        id: "BA",
+        id: "co",
         eddbID: 806,
         cost: 162834280,
         mass: 150
       }, {
-        id: "BB",
+        id: "cp",
         eddbID: 807,
         cost: 180442120,
         mass: 150
@@ -2487,11 +2487,11 @@ module.exports = {
         optmass: 72,
         maxmass: 108
       } ],
-      fd: [ {
+      fsd: [ {
         id: "Fy",
         edID: 128064133,
         eddbID: 991,
-        grp: "fd",
+        grp: "fsd",
         "class": 8,
         rating: "E",
         cost: 0,
@@ -2505,7 +2505,7 @@ module.exports = {
         id: "Fx",
         edID: 128064134,
         eddbID: 992,
-        grp: "fd",
+        grp: "fsd",
         "class": 8,
         rating: "D",
         cost: 0,
@@ -2519,7 +2519,7 @@ module.exports = {
         id: "Fw",
         edID: 128064135,
         eddbID: 993,
-        grp: "fd",
+        grp: "fsd",
         "class": 8,
         rating: "C",
         cost: 0,
@@ -2533,7 +2533,7 @@ module.exports = {
         id: "Fv",
         edID: 128064136,
         eddbID: 994,
-        grp: "fd",
+        grp: "fsd",
         "class": 8,
         rating: "B",
         cost: 0,
@@ -2547,7 +2547,7 @@ module.exports = {
         id: "Fu",
         edID: 128064137,
         eddbID: 995,
-        grp: "fd",
+        grp: "fsd",
         "class": 8,
         rating: "A",
         cost: 0,
@@ -2561,7 +2561,7 @@ module.exports = {
         id: "Ft",
         edID: 128064128,
         eddbID: 986,
-        grp: "fd",
+        grp: "fsd",
         "class": 7,
         rating: "E",
         cost: 633200,
@@ -2575,7 +2575,7 @@ module.exports = {
         id: "Fs",
         edID: 128064129,
         eddbID: 987,
-        grp: "fd",
+        grp: "fsd",
         "class": 7,
         rating: "D",
         cost: 1899600,
@@ -2589,7 +2589,7 @@ module.exports = {
         id: "Fr",
         edID: 128064130,
         eddbID: 988,
-        grp: "fd",
+        grp: "fsd",
         "class": 7,
         rating: "C",
         cost: 5698790,
@@ -2603,7 +2603,7 @@ module.exports = {
         id: "Fq",
         edID: 128064131,
         eddbID: 989,
-        grp: "fd",
+        grp: "fsd",
         "class": 7,
         rating: "B",
         cost: 17096370,
@@ -2617,7 +2617,7 @@ module.exports = {
         id: "Fp",
         edID: 128064132,
         eddbID: 990,
-        grp: "fd",
+        grp: "fsd",
         "class": 7,
         rating: "A",
         cost: 51289110,
@@ -2631,7 +2631,7 @@ module.exports = {
         id: "Fo",
         edID: 128064123,
         eddbID: 981,
-        grp: "fd",
+        grp: "fsd",
         "class": 6,
         rating: "E",
         cost: 199750,
@@ -2645,7 +2645,7 @@ module.exports = {
         id: "Fn",
         edID: 128064124,
         eddbID: 982,
-        grp: "fd",
+        grp: "fsd",
         "class": 6,
         rating: "D",
         cost: 599240,
@@ -2659,7 +2659,7 @@ module.exports = {
         id: "Fm",
         edID: 128064125,
         eddbID: 983,
-        grp: "fd",
+        grp: "fsd",
         "class": 6,
         rating: "C",
         cost: 1797730,
@@ -2673,7 +2673,7 @@ module.exports = {
         id: "Fl",
         edID: 128064126,
         eddbID: 984,
-        grp: "fd",
+        grp: "fsd",
         "class": 6,
         rating: "B",
         cost: 5393180,
@@ -2687,7 +2687,7 @@ module.exports = {
         id: "Fk",
         edID: 128064127,
         eddbID: 985,
-        grp: "fd",
+        grp: "fsd",
         "class": 6,
         rating: "A",
         cost: 16179530,
@@ -2701,7 +2701,7 @@ module.exports = {
         id: "Fj",
         edID: 128064118,
         eddbID: 976,
-        grp: "fd",
+        grp: "fsd",
         "class": 5,
         rating: "E",
         cost: 63010,
@@ -2715,7 +2715,7 @@ module.exports = {
         id: "Fi",
         edID: 128064119,
         eddbID: 977,
-        grp: "fd",
+        grp: "fsd",
         "class": 5,
         rating: "D",
         cost: 189040,
@@ -2729,7 +2729,7 @@ module.exports = {
         id: "Fh",
         edID: 128064120,
         eddbID: 978,
-        grp: "fd",
+        grp: "fsd",
         "class": 5,
         rating: "C",
         cost: 567110,
@@ -2743,7 +2743,7 @@ module.exports = {
         id: "Fg",
         edID: 128064121,
         eddbID: 979,
-        grp: "fd",
+        grp: "fsd",
         "class": 5,
         rating: "B",
         cost: 1701320,
@@ -2757,7 +2757,7 @@ module.exports = {
         id: "Ff",
         edID: 128064122,
         eddbID: 980,
-        grp: "fd",
+        grp: "fsd",
         "class": 5,
         rating: "A",
         cost: 5103950,
@@ -2771,7 +2771,7 @@ module.exports = {
         id: "Fe",
         edID: 128064113,
         eddbID: 971,
-        grp: "fd",
+        grp: "fsd",
         "class": 4,
         rating: "E",
         cost: 19880,
@@ -2785,7 +2785,7 @@ module.exports = {
         id: "Fd",
         edID: 128064114,
         eddbID: 972,
-        grp: "fd",
+        grp: "fsd",
         "class": 4,
         rating: "D",
         cost: 59630,
@@ -2799,7 +2799,7 @@ module.exports = {
         id: "Fc",
         edID: 128064115,
         eddbID: 973,
-        grp: "fd",
+        grp: "fsd",
         "class": 4,
         rating: "C",
         cost: 178900,
@@ -2813,7 +2813,7 @@ module.exports = {
         id: "Fb",
         edID: 128064116,
         eddbID: 974,
-        grp: "fd",
+        grp: "fsd",
         "class": 4,
         rating: "B",
         cost: 536690,
@@ -2827,7 +2827,7 @@ module.exports = {
         id: "Fa",
         edID: 128064117,
         eddbID: 975,
-        grp: "fd",
+        grp: "fsd",
         "class": 4,
         rating: "A",
         cost: 1610080,
@@ -2841,7 +2841,7 @@ module.exports = {
         id: "F9",
         edID: 128064108,
         eddbID: 966,
-        grp: "fd",
+        grp: "fsd",
         "class": 3,
         rating: "E",
         cost: 6270,
@@ -2855,7 +2855,7 @@ module.exports = {
         id: "F8",
         edID: 128064109,
         eddbID: 967,
-        grp: "fd",
+        grp: "fsd",
         "class": 3,
         rating: "D",
         cost: 18810,
@@ -2869,7 +2869,7 @@ module.exports = {
         id: "F7",
         edID: 128064110,
         eddbID: 968,
-        grp: "fd",
+        grp: "fsd",
         "class": 3,
         rating: "C",
         cost: 56440,
@@ -2883,7 +2883,7 @@ module.exports = {
         id: "F6",
         edID: 128064111,
         eddbID: 969,
-        grp: "fd",
+        grp: "fsd",
         "class": 3,
         rating: "B",
         cost: 169300,
@@ -2897,7 +2897,7 @@ module.exports = {
         id: "F5",
         edID: 128064112,
         eddbID: 970,
-        grp: "fd",
+        grp: "fsd",
         "class": 3,
         rating: "A",
         cost: 507910,
@@ -2911,7 +2911,7 @@ module.exports = {
         id: "F4",
         edID: 128064103,
         eddbID: 961,
-        grp: "fd",
+        grp: "fsd",
         "class": 2,
         rating: "E",
         cost: 1980,
@@ -2925,7 +2925,7 @@ module.exports = {
         id: "F3",
         edID: 128064104,
         eddbID: 962,
-        grp: "fd",
+        grp: "fsd",
         "class": 2,
         rating: "D",
         cost: 5930,
@@ -2939,7 +2939,7 @@ module.exports = {
         id: "F2",
         edID: 128064105,
         eddbID: 963,
-        grp: "fd",
+        grp: "fsd",
         "class": 2,
         rating: "C",
         cost: 17800,
@@ -2953,7 +2953,7 @@ module.exports = {
         id: "F1",
         edID: 128064106,
         eddbID: 964,
-        grp: "fd",
+        grp: "fsd",
         "class": 2,
         rating: "B",
         cost: 53410,
@@ -2967,7 +2967,7 @@ module.exports = {
         id: "F0",
         edID: 128064107,
         eddbID: 965,
-        grp: "fd",
+        grp: "fsd",
         "class": 2,
         rating: "A",
         cost: 160220,
@@ -6096,7 +6096,8 @@ module.exports = {
         ammocost: 209
       }, {
         id: "kp",
-        eddbID: 0,
+        edID: 128671448,
+        eddbID: 1523,
         grp: "nl",
         name: "Shock Mine Launcher",
         "class": 1,
@@ -6951,6 +6952,7 @@ module.exports = {
       } ],
       bsg: [ {
         id: "B6",
+        edID: 128671331,
         eddbID: 1530,
         grp: "bsg",
         "class": 1,
@@ -6967,6 +6969,7 @@ module.exports = {
         recover: 2.4
       }, {
         id: "B5",
+        edID: 128671332,
         eddbID: 1531,
         grp: "bsg",
         "class": 2,
@@ -6983,6 +6986,7 @@ module.exports = {
         recover: 2.4
       }, {
         id: "B4",
+        edID: 128671333,
         eddbID: 1532,
         grp: "bsg",
         "class": 3,
@@ -6999,6 +7003,7 @@ module.exports = {
         recover: 2.4
       }, {
         id: "B3",
+        edID: 128671334,
         eddbID: 1533,
         grp: "bsg",
         "class": 4,
@@ -7015,6 +7020,7 @@ module.exports = {
         recover: 2.85
       }, {
         id: "B2",
+        edID: 128671335,
         eddbID: 1534,
         grp: "bsg",
         "class": 5,
@@ -7031,6 +7037,7 @@ module.exports = {
         recover: 3.75
       }, {
         id: "B1",
+        edID: 128671336,
         eddbID: 1535,
         grp: "bsg",
         "class": 6,
@@ -7047,6 +7054,7 @@ module.exports = {
         recover: 4.8
       }, {
         id: "B0",
+        edID: 128671337,
         eddbID: 1536,
         grp: "bsg",
         "class": 7,
@@ -7063,6 +7071,7 @@ module.exports = {
         recover: 6
       }, {
         id: "B7",
+        edID: 128671338,
         eddbID: 1537,
         grp: "bsg",
         "class": 8,
@@ -8703,6 +8712,7 @@ module.exports = {
       } ],
       pv: [ {
         id: "v1",
+        edID: 128672292,
         eddbID: 1524,
         grp: "pv",
         "class": 6,
@@ -8713,6 +8723,7 @@ module.exports = {
         bays: 4
       }, {
         id: "v2",
+        edID: 128672293,
         eddbID: 1525,
         grp: "pv",
         "class": 6,
@@ -8723,6 +8734,7 @@ module.exports = {
         bays: 4
       }, {
         id: "v3",
+        edID: 128672290,
         eddbID: 1526,
         grp: "pv",
         "class": 4,
@@ -8733,6 +8745,7 @@ module.exports = {
         bays: 2
       }, {
         id: "v4",
+        edID: 128672291,
         eddbID: 1527,
         grp: "pv",
         "class": 4,
@@ -8743,6 +8756,7 @@ module.exports = {
         bays: 2
       }, {
         id: "v5",
+        edID: 128672288,
         eddbID: 1528,
         grp: "pv",
         "class": 2,
@@ -8753,6 +8767,7 @@ module.exports = {
         bays: 1
       }, {
         id: "v6",
+        edID: 128672289,
         eddbID: 1529,
         grp: "pv",
         "class": 2,
@@ -8764,6 +8779,7 @@ module.exports = {
       } ],
       psg: [ {
         id: "p6",
+        edID: 128671323,
         eddbID: 1485,
         grp: "psg",
         "class": 1,
@@ -8780,6 +8796,7 @@ module.exports = {
         recover: 1.2
       }, {
         id: "p5",
+        edID: 128671324,
         eddbID: 1486,
         grp: "psg",
         "class": 2,
@@ -8796,6 +8813,7 @@ module.exports = {
         recover: 1.2
       }, {
         id: "p4",
+        edID: 128671325,
         eddbID: 1487,
         grp: "psg",
         "class": 3,
@@ -8812,6 +8830,7 @@ module.exports = {
         recover: 1.2
       }, {
         id: "p3",
+        edID: 128671326,
         eddbID: 1488,
         grp: "psg",
         "class": 4,
@@ -8828,6 +8847,7 @@ module.exports = {
         recover: 1.425
       }, {
         id: "p2",
+        edID: 128671327,
         eddbID: 1489,
         grp: "psg",
         "class": 5,
@@ -8844,6 +8864,7 @@ module.exports = {
         recover: 1.875
       }, {
         id: "p1",
+        edID: 128671328,
         eddbID: 1490,
         grp: "psg",
         "class": 6,
@@ -8860,6 +8881,7 @@ module.exports = {
         recover: 2.4
       }, {
         id: "p0",
+        edID: 128671329,
         eddbID: 1491,
         grp: "psg",
         "class": 7,
@@ -8876,6 +8898,7 @@ module.exports = {
         recover: 3
       }, {
         id: "p7",
+        edID: 202115326,
         eddbID: 1492,
         grp: "psg",
         "class": 8,
diff --git a/dist/index.json b/dist/index.json
index 33f7af8..124c561 100644
--- a/dist/index.json
+++ b/dist/index.json
@@ -2775,31 +2775,31 @@
 			"retailCost": 76555840,
 			"bulkheads": [
 				{
-					"id": "Bx",
+					"id": "cl",
 					"eddbID": 803,
 					"cost": 0,
 					"mass": 0
 				},
 				{
-					"id": "By",
+					"id": "cm",
 					"eddbID": 804,
 					"cost": 30622340,
 					"mass": 75
 				},
 				{
-					"id": "Bz",
+					"id": "cn",
 					"eddbID": 805,
 					"cost": 68900260,
 					"mass": 150
 				},
 				{
-					"id": "BA",
+					"id": "co",
 					"eddbID": 806,
 					"cost": 162834280,
 					"mass": 150
 				},
 				{
-					"id": "BB",
+					"id": "cp",
 					"eddbID": 807,
 					"cost": 180442120,
 					"mass": 150
@@ -4133,12 +4133,12 @@
 					"maxmass": 108
 				}
 			],
-			"fd": [
+			"fsd": [
 				{
 					"id": "Fy",
 					"edID": 128064133,
 					"eddbID": 991,
-					"grp": "fd",
+					"grp": "fsd",
 					"class": 8,
 					"rating": "E",
 					"cost": 0,
@@ -4153,7 +4153,7 @@
 					"id": "Fx",
 					"edID": 128064134,
 					"eddbID": 992,
-					"grp": "fd",
+					"grp": "fsd",
 					"class": 8,
 					"rating": "D",
 					"cost": 0,
@@ -4168,7 +4168,7 @@
 					"id": "Fw",
 					"edID": 128064135,
 					"eddbID": 993,
-					"grp": "fd",
+					"grp": "fsd",
 					"class": 8,
 					"rating": "C",
 					"cost": 0,
@@ -4183,7 +4183,7 @@
 					"id": "Fv",
 					"edID": 128064136,
 					"eddbID": 994,
-					"grp": "fd",
+					"grp": "fsd",
 					"class": 8,
 					"rating": "B",
 					"cost": 0,
@@ -4198,7 +4198,7 @@
 					"id": "Fu",
 					"edID": 128064137,
 					"eddbID": 995,
-					"grp": "fd",
+					"grp": "fsd",
 					"class": 8,
 					"rating": "A",
 					"cost": 0,
@@ -4213,7 +4213,7 @@
 					"id": "Ft",
 					"edID": 128064128,
 					"eddbID": 986,
-					"grp": "fd",
+					"grp": "fsd",
 					"class": 7,
 					"rating": "E",
 					"cost": 633200,
@@ -4228,7 +4228,7 @@
 					"id": "Fs",
 					"edID": 128064129,
 					"eddbID": 987,
-					"grp": "fd",
+					"grp": "fsd",
 					"class": 7,
 					"rating": "D",
 					"cost": 1899600,
@@ -4243,7 +4243,7 @@
 					"id": "Fr",
 					"edID": 128064130,
 					"eddbID": 988,
-					"grp": "fd",
+					"grp": "fsd",
 					"class": 7,
 					"rating": "C",
 					"cost": 5698790,
@@ -4258,7 +4258,7 @@
 					"id": "Fq",
 					"edID": 128064131,
 					"eddbID": 989,
-					"grp": "fd",
+					"grp": "fsd",
 					"class": 7,
 					"rating": "B",
 					"cost": 17096370,
@@ -4273,7 +4273,7 @@
 					"id": "Fp",
 					"edID": 128064132,
 					"eddbID": 990,
-					"grp": "fd",
+					"grp": "fsd",
 					"class": 7,
 					"rating": "A",
 					"cost": 51289110,
@@ -4288,7 +4288,7 @@
 					"id": "Fo",
 					"edID": 128064123,
 					"eddbID": 981,
-					"grp": "fd",
+					"grp": "fsd",
 					"class": 6,
 					"rating": "E",
 					"cost": 199750,
@@ -4303,7 +4303,7 @@
 					"id": "Fn",
 					"edID": 128064124,
 					"eddbID": 982,
-					"grp": "fd",
+					"grp": "fsd",
 					"class": 6,
 					"rating": "D",
 					"cost": 599240,
@@ -4318,7 +4318,7 @@
 					"id": "Fm",
 					"edID": 128064125,
 					"eddbID": 983,
-					"grp": "fd",
+					"grp": "fsd",
 					"class": 6,
 					"rating": "C",
 					"cost": 1797730,
@@ -4333,7 +4333,7 @@
 					"id": "Fl",
 					"edID": 128064126,
 					"eddbID": 984,
-					"grp": "fd",
+					"grp": "fsd",
 					"class": 6,
 					"rating": "B",
 					"cost": 5393180,
@@ -4348,7 +4348,7 @@
 					"id": "Fk",
 					"edID": 128064127,
 					"eddbID": 985,
-					"grp": "fd",
+					"grp": "fsd",
 					"class": 6,
 					"rating": "A",
 					"cost": 16179530,
@@ -4363,7 +4363,7 @@
 					"id": "Fj",
 					"edID": 128064118,
 					"eddbID": 976,
-					"grp": "fd",
+					"grp": "fsd",
 					"class": 5,
 					"rating": "E",
 					"cost": 63010,
@@ -4378,7 +4378,7 @@
 					"id": "Fi",
 					"edID": 128064119,
 					"eddbID": 977,
-					"grp": "fd",
+					"grp": "fsd",
 					"class": 5,
 					"rating": "D",
 					"cost": 189040,
@@ -4393,7 +4393,7 @@
 					"id": "Fh",
 					"edID": 128064120,
 					"eddbID": 978,
-					"grp": "fd",
+					"grp": "fsd",
 					"class": 5,
 					"rating": "C",
 					"cost": 567110,
@@ -4408,7 +4408,7 @@
 					"id": "Fg",
 					"edID": 128064121,
 					"eddbID": 979,
-					"grp": "fd",
+					"grp": "fsd",
 					"class": 5,
 					"rating": "B",
 					"cost": 1701320,
@@ -4423,7 +4423,7 @@
 					"id": "Ff",
 					"edID": 128064122,
 					"eddbID": 980,
-					"grp": "fd",
+					"grp": "fsd",
 					"class": 5,
 					"rating": "A",
 					"cost": 5103950,
@@ -4438,7 +4438,7 @@
 					"id": "Fe",
 					"edID": 128064113,
 					"eddbID": 971,
-					"grp": "fd",
+					"grp": "fsd",
 					"class": 4,
 					"rating": "E",
 					"cost": 19880,
@@ -4453,7 +4453,7 @@
 					"id": "Fd",
 					"edID": 128064114,
 					"eddbID": 972,
-					"grp": "fd",
+					"grp": "fsd",
 					"class": 4,
 					"rating": "D",
 					"cost": 59630,
@@ -4468,7 +4468,7 @@
 					"id": "Fc",
 					"edID": 128064115,
 					"eddbID": 973,
-					"grp": "fd",
+					"grp": "fsd",
 					"class": 4,
 					"rating": "C",
 					"cost": 178900,
@@ -4483,7 +4483,7 @@
 					"id": "Fb",
 					"edID": 128064116,
 					"eddbID": 974,
-					"grp": "fd",
+					"grp": "fsd",
 					"class": 4,
 					"rating": "B",
 					"cost": 536690,
@@ -4498,7 +4498,7 @@
 					"id": "Fa",
 					"edID": 128064117,
 					"eddbID": 975,
-					"grp": "fd",
+					"grp": "fsd",
 					"class": 4,
 					"rating": "A",
 					"cost": 1610080,
@@ -4513,7 +4513,7 @@
 					"id": "F9",
 					"edID": 128064108,
 					"eddbID": 966,
-					"grp": "fd",
+					"grp": "fsd",
 					"class": 3,
 					"rating": "E",
 					"cost": 6270,
@@ -4528,7 +4528,7 @@
 					"id": "F8",
 					"edID": 128064109,
 					"eddbID": 967,
-					"grp": "fd",
+					"grp": "fsd",
 					"class": 3,
 					"rating": "D",
 					"cost": 18810,
@@ -4543,7 +4543,7 @@
 					"id": "F7",
 					"edID": 128064110,
 					"eddbID": 968,
-					"grp": "fd",
+					"grp": "fsd",
 					"class": 3,
 					"rating": "C",
 					"cost": 56440,
@@ -4558,7 +4558,7 @@
 					"id": "F6",
 					"edID": 128064111,
 					"eddbID": 969,
-					"grp": "fd",
+					"grp": "fsd",
 					"class": 3,
 					"rating": "B",
 					"cost": 169300,
@@ -4573,7 +4573,7 @@
 					"id": "F5",
 					"edID": 128064112,
 					"eddbID": 970,
-					"grp": "fd",
+					"grp": "fsd",
 					"class": 3,
 					"rating": "A",
 					"cost": 507910,
@@ -4588,7 +4588,7 @@
 					"id": "F4",
 					"edID": 128064103,
 					"eddbID": 961,
-					"grp": "fd",
+					"grp": "fsd",
 					"class": 2,
 					"rating": "E",
 					"cost": 1980,
@@ -4603,7 +4603,7 @@
 					"id": "F3",
 					"edID": 128064104,
 					"eddbID": 962,
-					"grp": "fd",
+					"grp": "fsd",
 					"class": 2,
 					"rating": "D",
 					"cost": 5930,
@@ -4618,7 +4618,7 @@
 					"id": "F2",
 					"edID": 128064105,
 					"eddbID": 963,
-					"grp": "fd",
+					"grp": "fsd",
 					"class": 2,
 					"rating": "C",
 					"cost": 17800,
@@ -4633,7 +4633,7 @@
 					"id": "F1",
 					"edID": 128064106,
 					"eddbID": 964,
-					"grp": "fd",
+					"grp": "fsd",
 					"class": 2,
 					"rating": "B",
 					"cost": 53410,
@@ -4648,7 +4648,7 @@
 					"id": "F0",
 					"edID": 128064107,
 					"eddbID": 965,
-					"grp": "fd",
+					"grp": "fsd",
 					"class": 2,
 					"rating": "A",
 					"cost": 160220,
@@ -7995,7 +7995,8 @@
 				},
 				{
 					"id": "kp",
-					"eddbID": 0,
+					"edID": 128671448,
+					"eddbID": 1523,
 					"grp": "nl",
 					"name": "Shock Mine Launcher",
 					"class": 1,
@@ -8926,6 +8927,7 @@
 			"bsg": [
 				{
 					"id": "B6",
+					"edID": 128671331,
 					"eddbID": 1530,
 					"grp": "bsg",
 					"class": 1,
@@ -8943,6 +8945,7 @@
 				},
 				{
 					"id": "B5",
+					"edID": 128671332,
 					"eddbID": 1531,
 					"grp": "bsg",
 					"class": 2,
@@ -8960,6 +8963,7 @@
 				},
 				{
 					"id": "B4",
+					"edID": 128671333,
 					"eddbID": 1532,
 					"grp": "bsg",
 					"class": 3,
@@ -8977,6 +8981,7 @@
 				},
 				{
 					"id": "B3",
+					"edID": 128671334,
 					"eddbID": 1533,
 					"grp": "bsg",
 					"class": 4,
@@ -8994,6 +8999,7 @@
 				},
 				{
 					"id": "B2",
+					"edID": 128671335,
 					"eddbID": 1534,
 					"grp": "bsg",
 					"class": 5,
@@ -9011,6 +9017,7 @@
 				},
 				{
 					"id": "B1",
+					"edID": 128671336,
 					"eddbID": 1535,
 					"grp": "bsg",
 					"class": 6,
@@ -9028,6 +9035,7 @@
 				},
 				{
 					"id": "B0",
+					"edID": 128671337,
 					"eddbID": 1536,
 					"grp": "bsg",
 					"class": 7,
@@ -9045,6 +9053,7 @@
 				},
 				{
 					"id": "B7",
+					"edID": 128671338,
 					"eddbID": 1537,
 					"grp": "bsg",
 					"class": 8,
@@ -10843,6 +10852,7 @@
 			"pv": [
 				{
 					"id": "v1",
+					"edID": 128672292,
 					"eddbID": 1524,
 					"grp": "pv",
 					"class": 6,
@@ -10854,6 +10864,7 @@
 				},
 				{
 					"id": "v2",
+					"edID": 128672293,
 					"eddbID": 1525,
 					"grp": "pv",
 					"class": 6,
@@ -10865,6 +10876,7 @@
 				},
 				{
 					"id": "v3",
+					"edID": 128672290,
 					"eddbID": 1526,
 					"grp": "pv",
 					"class": 4,
@@ -10876,6 +10888,7 @@
 				},
 				{
 					"id": "v4",
+					"edID": 128672291,
 					"eddbID": 1527,
 					"grp": "pv",
 					"class": 4,
@@ -10887,6 +10900,7 @@
 				},
 				{
 					"id": "v5",
+					"edID": 128672288,
 					"eddbID": 1528,
 					"grp": "pv",
 					"class": 2,
@@ -10898,6 +10912,7 @@
 				},
 				{
 					"id": "v6",
+					"edID": 128672289,
 					"eddbID": 1529,
 					"grp": "pv",
 					"class": 2,
@@ -10911,6 +10926,7 @@
 			"psg": [
 				{
 					"id": "p6",
+					"edID": 128671323,
 					"eddbID": 1485,
 					"grp": "psg",
 					"class": 1,
@@ -10928,6 +10944,7 @@
 				},
 				{
 					"id": "p5",
+					"edID": 128671324,
 					"eddbID": 1486,
 					"grp": "psg",
 					"class": 2,
@@ -10945,6 +10962,7 @@
 				},
 				{
 					"id": "p4",
+					"edID": 128671325,
 					"eddbID": 1487,
 					"grp": "psg",
 					"class": 3,
@@ -10962,6 +10980,7 @@
 				},
 				{
 					"id": "p3",
+					"edID": 128671326,
 					"eddbID": 1488,
 					"grp": "psg",
 					"class": 4,
@@ -10979,6 +10998,7 @@
 				},
 				{
 					"id": "p2",
+					"edID": 128671327,
 					"eddbID": 1489,
 					"grp": "psg",
 					"class": 5,
@@ -10996,6 +11016,7 @@
 				},
 				{
 					"id": "p1",
+					"edID": 128671328,
 					"eddbID": 1490,
 					"grp": "psg",
 					"class": 6,
@@ -11013,6 +11034,7 @@
 				},
 				{
 					"id": "p0",
+					"edID": 128671329,
 					"eddbID": 1491,
 					"grp": "psg",
 					"class": 7,
@@ -11030,6 +11052,7 @@
 				},
 				{
 					"id": "p7",
+					"edID": 202115326,
 					"eddbID": 1492,
 					"grp": "psg",
 					"class": 8,
diff --git a/modules/index.js b/modules/index.js
index 96f99ad..ec86918 100644
--- a/modules/index.js
+++ b/modules/index.js
@@ -2,7 +2,7 @@ module.exports = {
   standard: {
     pp: require('./standard/power_plant').pp,
     t: require('./standard/thrusters').t,
-    fd: require('./standard/frame_shift_drive').fd,
+    fsd: require('./standard/frame_shift_drive').fsd,
     ls: require('./standard/life_support').ls,
     pd: require('./standard/power_distributor').pd,
     s: require('./standard/sensors').s,
diff --git a/modules/standard/frame_shift_drive.json b/modules/standard/frame_shift_drive.json
index 69300bb..cfaa2c1 100755
--- a/modules/standard/frame_shift_drive.json
+++ b/modules/standard/frame_shift_drive.json
@@ -1,45 +1,45 @@
 {
-  "fd": [
-    { "id":"Fy", "edID": 128064133, "eddbID": 991, "grp": "fd", "class": 8, "rating": "E", "cost": 0, "mass": 160, "power": 0, "optmass": 0, "maxfuel": 0, "fuelmul": 0.011, "fuelpower": 2.9 },
-    { "id":"Fx", "edID": 128064134, "eddbID": 992, "grp": "fd", "class": 8, "rating": "D", "cost": 0, "mass": 64, "power": 0, "optmass": 0, "maxfuel": 0, "fuelmul": 0.01, "fuelpower": 2.9 },
-    { "id":"Fw", "edID": 128064135, "eddbID": 993, "grp": "fd", "class": 8, "rating": "C", "cost": 0, "mass": 160, "power": 0, "optmass": 0, "maxfuel": 0, "fuelmul": 0.008, "fuelpower": 2.9 },
-    { "id":"Fv", "edID": 128064136, "eddbID": 994, "grp": "fd", "class": 8, "rating": "B", "cost": 0, "mass": 256, "power": 0, "optmass": 0, "maxfuel": 0, "fuelmul": 0.01, "fuelpower": 2.9 },
-    { "id":"Fu", "edID": 128064137, "eddbID": 995, "grp": "fd", "class": 8, "rating": "A", "cost": 0, "mass": 160, "power": 0, "optmass": 0, "maxfuel": 0, "fuelmul": 0.012, "fuelpower": 2.9 },
+  "fsd": [
+    { "id":"Fy", "edID": 128064133, "eddbID": 991, "grp": "fsd", "class": 8, "rating": "E", "cost": 0, "mass": 160, "power": 0, "optmass": 0, "maxfuel": 0, "fuelmul": 0.011, "fuelpower": 2.9 },
+    { "id":"Fx", "edID": 128064134, "eddbID": 992, "grp": "fsd", "class": 8, "rating": "D", "cost": 0, "mass": 64, "power": 0, "optmass": 0, "maxfuel": 0, "fuelmul": 0.01, "fuelpower": 2.9 },
+    { "id":"Fw", "edID": 128064135, "eddbID": 993, "grp": "fsd", "class": 8, "rating": "C", "cost": 0, "mass": 160, "power": 0, "optmass": 0, "maxfuel": 0, "fuelmul": 0.008, "fuelpower": 2.9 },
+    { "id":"Fv", "edID": 128064136, "eddbID": 994, "grp": "fsd", "class": 8, "rating": "B", "cost": 0, "mass": 256, "power": 0, "optmass": 0, "maxfuel": 0, "fuelmul": 0.01, "fuelpower": 2.9 },
+    { "id":"Fu", "edID": 128064137, "eddbID": 995, "grp": "fsd", "class": 8, "rating": "A", "cost": 0, "mass": 160, "power": 0, "optmass": 0, "maxfuel": 0, "fuelmul": 0.012, "fuelpower": 2.9 },
 
-    { "id":"Ft", "edID": 128064128, "eddbID": 986, "grp": "fd", "class": 7, "rating": "E", "cost": 633200, "mass": 80, "power": 0.48, "optmass": 1440, "maxfuel": 8.5, "fuelmul": 0.011, "fuelpower": 2.75 },
-    { "id":"Fs", "edID": 128064129, "eddbID": 987, "grp": "fd", "class": 7, "rating": "D", "cost": 1899600, "mass": 32, "power": 0.54, "optmass": 1620, "maxfuel": 8.5, "fuelmul": 0.01, "fuelpower": 2.75 },
-    { "id":"Fr", "edID": 128064130, "eddbID": 988, "grp": "fd", "class": 7, "rating": "C", "cost": 5698790, "mass": 80, "power": 0.60, "optmass": 1800, "maxfuel": 8.5, "fuelmul": 0.008, "fuelpower": 2.75 },
-    { "id":"Fq", "edID": 128064131, "eddbID": 989, "grp": "fd", "class": 7, "rating": "B", "cost": 17096370, "mass": 128, "power": 0.75, "optmass": 2250, "maxfuel": 10.6, "fuelmul": 0.01, "fuelpower": 2.75 },
-    { "id":"Fp", "edID": 128064132, "eddbID": 990, "grp": "fd", "class": 7, "rating": "A", "cost": 51289110, "mass": 80, "power": 0.90, "optmass": 2700, "maxfuel": 12.8, "fuelmul": 0.012, "fuelpower": 2.75 },
+    { "id":"Ft", "edID": 128064128, "eddbID": 986, "grp": "fsd", "class": 7, "rating": "E", "cost": 633200, "mass": 80, "power": 0.48, "optmass": 1440, "maxfuel": 8.5, "fuelmul": 0.011, "fuelpower": 2.75 },
+    { "id":"Fs", "edID": 128064129, "eddbID": 987, "grp": "fsd", "class": 7, "rating": "D", "cost": 1899600, "mass": 32, "power": 0.54, "optmass": 1620, "maxfuel": 8.5, "fuelmul": 0.01, "fuelpower": 2.75 },
+    { "id":"Fr", "edID": 128064130, "eddbID": 988, "grp": "fsd", "class": 7, "rating": "C", "cost": 5698790, "mass": 80, "power": 0.60, "optmass": 1800, "maxfuel": 8.5, "fuelmul": 0.008, "fuelpower": 2.75 },
+    { "id":"Fq", "edID": 128064131, "eddbID": 989, "grp": "fsd", "class": 7, "rating": "B", "cost": 17096370, "mass": 128, "power": 0.75, "optmass": 2250, "maxfuel": 10.6, "fuelmul": 0.01, "fuelpower": 2.75 },
+    { "id":"Fp", "edID": 128064132, "eddbID": 990, "grp": "fsd", "class": 7, "rating": "A", "cost": 51289110, "mass": 80, "power": 0.90, "optmass": 2700, "maxfuel": 12.8, "fuelmul": 0.012, "fuelpower": 2.75 },
 
-    { "id":"Fo", "edID": 128064123, "eddbID": 981, "grp": "fd", "class": 6, "rating": "E", "cost": 199750, "mass": 40, "power": 0.4, "optmass": 960, "maxfuel": 5.3, "fuelmul": 0.011, "fuelpower": 2.6 },
-    { "id":"Fn", "edID": 128064124, "eddbID": 982, "grp": "fd", "class": 6, "rating": "D", "cost": 599240, "mass": 16, "power": 0.45, "optmass": 1080, "maxfuel": 5.3, "fuelmul": 0.01, "fuelpower": 2.6 },
-    { "id":"Fm", "edID": 128064125, "eddbID": 983, "grp": "fd", "class": 6, "rating": "C", "cost": 1797730, "mass": 40, "power": 0.5, "optmass": 1200, "maxfuel": 5.3, "fuelmul": 0.008, "fuelpower": 2.6 },
-    { "id":"Fl", "edID": 128064126, "eddbID": 984, "grp": "fd", "class": 6, "rating": "B", "cost": 5393180, "mass": 64, "power": 0.63, "optmass": 1500, "maxfuel": 6.6, "fuelmul": 0.01, "fuelpower": 2.6 },
-    { "id":"Fk", "edID": 128064127, "eddbID": 985, "grp": "fd", "class": 6, "rating": "A", "cost": 16179530, "mass": 40, "power": 0.75, "optmass": 1800, "maxfuel": 8, "fuelmul": 0.012, "fuelpower": 2.6 },
+    { "id":"Fo", "edID": 128064123, "eddbID": 981, "grp": "fsd", "class": 6, "rating": "E", "cost": 199750, "mass": 40, "power": 0.4, "optmass": 960, "maxfuel": 5.3, "fuelmul": 0.011, "fuelpower": 2.6 },
+    { "id":"Fn", "edID": 128064124, "eddbID": 982, "grp": "fsd", "class": 6, "rating": "D", "cost": 599240, "mass": 16, "power": 0.45, "optmass": 1080, "maxfuel": 5.3, "fuelmul": 0.01, "fuelpower": 2.6 },
+    { "id":"Fm", "edID": 128064125, "eddbID": 983, "grp": "fsd", "class": 6, "rating": "C", "cost": 1797730, "mass": 40, "power": 0.5, "optmass": 1200, "maxfuel": 5.3, "fuelmul": 0.008, "fuelpower": 2.6 },
+    { "id":"Fl", "edID": 128064126, "eddbID": 984, "grp": "fsd", "class": 6, "rating": "B", "cost": 5393180, "mass": 64, "power": 0.63, "optmass": 1500, "maxfuel": 6.6, "fuelmul": 0.01, "fuelpower": 2.6 },
+    { "id":"Fk", "edID": 128064127, "eddbID": 985, "grp": "fsd", "class": 6, "rating": "A", "cost": 16179530, "mass": 40, "power": 0.75, "optmass": 1800, "maxfuel": 8, "fuelmul": 0.012, "fuelpower": 2.6 },
 
-    { "id":"Fj", "edID": 128064118, "eddbID": 976, "grp": "fd", "class": 5, "rating": "E", "cost": 63010, "mass": 20, "power": 0.32, "optmass": 560, "maxfuel": 3.3, "fuelmul": 0.011, "fuelpower": 2.45 },
-    { "id":"Fi", "edID": 128064119, "eddbID": 977, "grp": "fd", "class": 5, "rating": "D", "cost": 189040, "mass": 8, "power": 0.36, "optmass": 630, "maxfuel": 3.3, "fuelmul": 0.01, "fuelpower": 2.45 },
-    { "id":"Fh", "edID": 128064120, "eddbID": 978, "grp": "fd", "class": 5, "rating": "C", "cost": 567110, "mass": 20, "power": 0.4, "optmass": 700, "maxfuel": 3.3, "fuelmul": 0.008, "fuelpower": 2.45 },
-    { "id":"Fg", "edID": 128064121, "eddbID": 979, "grp": "fd", "class": 5, "rating": "B", "cost": 1701320, "mass": 32, "power": 0.5, "optmass": 875, "maxfuel": 4.1, "fuelmul": 0.01, "fuelpower": 2.45 },
-    { "id":"Ff", "edID": 128064122, "eddbID": 980, "grp": "fd", "class": 5, "rating": "A", "cost": 5103950, "mass": 20, "power": 0.6, "optmass": 1050, "maxfuel": 5, "fuelmul": 0.012, "fuelpower": 2.45 },
+    { "id":"Fj", "edID": 128064118, "eddbID": 976, "grp": "fsd", "class": 5, "rating": "E", "cost": 63010, "mass": 20, "power": 0.32, "optmass": 560, "maxfuel": 3.3, "fuelmul": 0.011, "fuelpower": 2.45 },
+    { "id":"Fi", "edID": 128064119, "eddbID": 977, "grp": "fsd", "class": 5, "rating": "D", "cost": 189040, "mass": 8, "power": 0.36, "optmass": 630, "maxfuel": 3.3, "fuelmul": 0.01, "fuelpower": 2.45 },
+    { "id":"Fh", "edID": 128064120, "eddbID": 978, "grp": "fsd", "class": 5, "rating": "C", "cost": 567110, "mass": 20, "power": 0.4, "optmass": 700, "maxfuel": 3.3, "fuelmul": 0.008, "fuelpower": 2.45 },
+    { "id":"Fg", "edID": 128064121, "eddbID": 979, "grp": "fsd", "class": 5, "rating": "B", "cost": 1701320, "mass": 32, "power": 0.5, "optmass": 875, "maxfuel": 4.1, "fuelmul": 0.01, "fuelpower": 2.45 },
+    { "id":"Ff", "edID": 128064122, "eddbID": 980, "grp": "fsd", "class": 5, "rating": "A", "cost": 5103950, "mass": 20, "power": 0.6, "optmass": 1050, "maxfuel": 5, "fuelmul": 0.012, "fuelpower": 2.45 },
 
-    { "id":"Fe", "edID": 128064113, "eddbID": 971, "grp": "fd", "class": 4, "rating": "E", "cost": 19880, "mass": 10, "power": 0.24, "optmass": 280, "maxfuel": 2, "fuelmul": 0.011, "fuelpower": 2.3 },
-    { "id":"Fd", "edID": 128064114, "eddbID": 972, "grp": "fd", "class": 4, "rating": "D", "cost": 59630, "mass": 4, "power": 0.27, "optmass": 315, "maxfuel": 2, "fuelmul": 0.01, "fuelpower": 2.3 },
-    { "id":"Fc", "edID": 128064115, "eddbID": 973, "grp": "fd", "class": 4, "rating": "C", "cost": 178900, "mass": 10, "power": 0.3, "optmass": 350, "maxfuel": 2, "fuelmul": 0.008, "fuelpower": 2.3 },
-    { "id":"Fb", "edID": 128064116, "eddbID": 974, "grp": "fd", "class": 4, "rating": "B", "cost": 536690, "mass": 16, "power": 0.38, "optmass": 438, "maxfuel": 2.5, "fuelmul": 0.01, "fuelpower": 2.3 },
-    { "id":"Fa", "edID": 128064117, "eddbID": 975, "grp": "fd", "class": 4, "rating": "A", "cost": 1610080, "mass": 10, "power": 0.45, "optmass": 525, "maxfuel": 3, "fuelmul": 0.012, "fuelpower": 2.3 },
+    { "id":"Fe", "edID": 128064113, "eddbID": 971, "grp": "fsd", "class": 4, "rating": "E", "cost": 19880, "mass": 10, "power": 0.24, "optmass": 280, "maxfuel": 2, "fuelmul": 0.011, "fuelpower": 2.3 },
+    { "id":"Fd", "edID": 128064114, "eddbID": 972, "grp": "fsd", "class": 4, "rating": "D", "cost": 59630, "mass": 4, "power": 0.27, "optmass": 315, "maxfuel": 2, "fuelmul": 0.01, "fuelpower": 2.3 },
+    { "id":"Fc", "edID": 128064115, "eddbID": 973, "grp": "fsd", "class": 4, "rating": "C", "cost": 178900, "mass": 10, "power": 0.3, "optmass": 350, "maxfuel": 2, "fuelmul": 0.008, "fuelpower": 2.3 },
+    { "id":"Fb", "edID": 128064116, "eddbID": 974, "grp": "fsd", "class": 4, "rating": "B", "cost": 536690, "mass": 16, "power": 0.38, "optmass": 438, "maxfuel": 2.5, "fuelmul": 0.01, "fuelpower": 2.3 },
+    { "id":"Fa", "edID": 128064117, "eddbID": 975, "grp": "fsd", "class": 4, "rating": "A", "cost": 1610080, "mass": 10, "power": 0.45, "optmass": 525, "maxfuel": 3, "fuelmul": 0.012, "fuelpower": 2.3 },
 
-    { "id":"F9", "edID": 128064108, "eddbID": 966, "grp": "fd", "class": 3, "rating": "E", "cost": 6270, "mass": 5, "power": 0.24, "optmass": 80, "maxfuel": 1.2, "fuelmul": 0.011, "fuelpower": 2.15 },
-    { "id":"F8", "edID": 128064109, "eddbID": 967, "grp": "fd", "class": 3, "rating": "D", "cost": 18810, "mass": 2, "power": 0.27, "optmass": 90, "maxfuel": 1.2, "fuelmul": 0.01, "fuelpower": 2.15 },
-    { "id":"F7", "edID": 128064110, "eddbID": 968, "grp": "fd", "class": 3, "rating": "C", "cost": 56440, "mass": 5, "power": 0.3, "optmass": 100, "maxfuel": 1.2, "fuelmul": 0.008, "fuelpower": 2.15 },
-    { "id":"F6", "edID": 128064111, "eddbID": 969, "grp": "fd", "class": 3, "rating": "B", "cost": 169300, "mass": 8, "power": 0.38, "optmass": 125, "maxfuel": 1.5, "fuelmul": 0.01, "fuelpower": 2.15 },
-    { "id":"F5", "edID": 128064112, "eddbID": 970, "grp": "fd", "class": 3, "rating": "A", "cost": 507910, "mass": 5, "power": 0.45, "optmass": 150, "maxfuel": 1.8, "fuelmul": 0.012, "fuelpower": 2.15 },
+    { "id":"F9", "edID": 128064108, "eddbID": 966, "grp": "fsd", "class": 3, "rating": "E", "cost": 6270, "mass": 5, "power": 0.24, "optmass": 80, "maxfuel": 1.2, "fuelmul": 0.011, "fuelpower": 2.15 },
+    { "id":"F8", "edID": 128064109, "eddbID": 967, "grp": "fsd", "class": 3, "rating": "D", "cost": 18810, "mass": 2, "power": 0.27, "optmass": 90, "maxfuel": 1.2, "fuelmul": 0.01, "fuelpower": 2.15 },
+    { "id":"F7", "edID": 128064110, "eddbID": 968, "grp": "fsd", "class": 3, "rating": "C", "cost": 56440, "mass": 5, "power": 0.3, "optmass": 100, "maxfuel": 1.2, "fuelmul": 0.008, "fuelpower": 2.15 },
+    { "id":"F6", "edID": 128064111, "eddbID": 969, "grp": "fsd", "class": 3, "rating": "B", "cost": 169300, "mass": 8, "power": 0.38, "optmass": 125, "maxfuel": 1.5, "fuelmul": 0.01, "fuelpower": 2.15 },
+    { "id":"F5", "edID": 128064112, "eddbID": 970, "grp": "fsd", "class": 3, "rating": "A", "cost": 507910, "mass": 5, "power": 0.45, "optmass": 150, "maxfuel": 1.8, "fuelmul": 0.012, "fuelpower": 2.15 },
 
-    { "id":"F4", "edID": 128064103, "eddbID": 961, "grp": "fd", "class": 2, "rating": "E", "cost": 1980, "mass": 2.5, "power": 0.16, "optmass": 48, "maxfuel": 0.6, "fuelmul": 0.011, "fuelpower": 2 },
-    { "id":"F3", "edID": 128064104, "eddbID": 962, "grp": "fd", "class": 2, "rating": "D", "cost": 5930, "mass": 1, "power": 0.18, "optmass": 54, "maxfuel": 0.6, "fuelmul": 0.01, "fuelpower": 2 },
-    { "id":"F2", "edID": 128064105, "eddbID": 963, "grp": "fd", "class": 2, "rating": "C", "cost": 17800, "mass": 2.5, "power": 0.2, "optmass": 60, "maxfuel": 0.6, "fuelmul": 0.008, "fuelpower": 2 },
-    { "id":"F1", "edID": 128064106, "eddbID": 964, "grp": "fd", "class": 2, "rating": "B", "cost": 53410, "mass": 4, "power": 0.25, "optmass": 75, "maxfuel": 0.8, "fuelmul": 0.01, "fuelpower": 2 },
-    { "id":"F0", "edID": 128064107, "eddbID": 965, "grp": "fd", "class": 2, "rating": "A", "cost": 160220, "mass": 2.5, "power": 0.3, "optmass": 90, "maxfuel": 0.9, "fuelmul": 0.012, "fuelpower": 2 }
+    { "id":"F4", "edID": 128064103, "eddbID": 961, "grp": "fsd", "class": 2, "rating": "E", "cost": 1980, "mass": 2.5, "power": 0.16, "optmass": 48, "maxfuel": 0.6, "fuelmul": 0.011, "fuelpower": 2 },
+    { "id":"F3", "edID": 128064104, "eddbID": 962, "grp": "fsd", "class": 2, "rating": "D", "cost": 5930, "mass": 1, "power": 0.18, "optmass": 54, "maxfuel": 0.6, "fuelmul": 0.01, "fuelpower": 2 },
+    { "id":"F2", "edID": 128064105, "eddbID": 963, "grp": "fsd", "class": 2, "rating": "C", "cost": 17800, "mass": 2.5, "power": 0.2, "optmass": 60, "maxfuel": 0.6, "fuelmul": 0.008, "fuelpower": 2 },
+    { "id":"F1", "edID": 128064106, "eddbID": 964, "grp": "fsd", "class": 2, "rating": "B", "cost": 53410, "mass": 4, "power": 0.25, "optmass": 75, "maxfuel": 0.8, "fuelmul": 0.01, "fuelpower": 2 },
+    { "id":"F0", "edID": 128064107, "eddbID": 965, "grp": "fsd", "class": 2, "rating": "A", "cost": 160220, "mass": 2.5, "power": 0.3, "optmass": 90, "maxfuel": 0.9, "fuelmul": 0.012, "fuelpower": 2 }
   ]
 }
\ No newline at end of file
diff --git a/package.json b/package.json
index 5e8f2d6..ca338b1 100644
--- a/package.json
+++ b/package.json
@@ -14,7 +14,8 @@
   "scripts": {
     "lint": "eslint --plugin json --ext .json modules ships",
     "jasmine": "jasmine-node spec",
-    "test": "npm run lint && npm run jasmine",
+    "jasmine-no-stack": "jasmine-node --noStack spec",
+    "test": "npm run lint && npm run jasmine-no-stack",
     "start": "node generate_distribution.js"
   },
   "devDependencies": {
diff --git a/ships/type_9_heavy.json b/ships/type_9_heavy.json
index 8dd185f..d5436d5 100755
--- a/ships/type_9_heavy.json
+++ b/ships/type_9_heavy.json
@@ -18,11 +18,11 @@
     },
     "retailCost": 76555840,
     "bulkheads": [
-      { "id": "Bx", "eddbID": 803, "cost": 0, "mass": 0 },
-      { "id": "By", "eddbID": 804, "cost": 30622340, "mass": 75 },
-      { "id": "Bz", "eddbID": 805, "cost": 68900260, "mass": 150 },
-      { "id": "BA", "eddbID": 806, "cost": 162834280, "mass": 150 },
-      { "id": "BB", "eddbID": 807, "cost": 180442120, "mass": 150 }
+      { "id": "cl", "eddbID": 803, "cost": 0, "mass": 0 },
+      { "id": "cm", "eddbID": 804, "cost": 30622340, "mass": 75 },
+      { "id": "cn", "eddbID": 805, "cost": 68900260, "mass": 150 },
+      { "id": "co", "eddbID": 806, "cost": 162834280, "mass": 150 },
+      { "id": "cp", "eddbID": 807, "cost": 180442120, "mass": 150 }
     ],
     "slots": {
       "standard": [6, 7, 6, 5, 6, 4, 6],
diff --git a/spec/data-spec.js b/spec/data-spec.js
index 841ee8f..5f2f565 100644
--- a/spec/data-spec.js
+++ b/spec/data-spec.js
@@ -21,8 +21,8 @@ describe('JSON Data', function() {
 
   it('has an up-to-date distribution', function() {
     var dist = require('../dist/index.js');
-    expect(dist.Ships).toEqual(Ships);
-    expect(dist.Modules).toEqual(Modules);
+    expect(dist.Ships).toEqual(Ships, 'Distribution ships does not match. Did you run `npm start`?');
+    expect(dist.Modules).toEqual(Modules, 'Distribution modules does not match. Did you run `npm start`?');
   });
 
   it('has valid standard modules', function() {
@@ -94,7 +94,8 @@ describe('JSON Data', function() {
         expect(b.id).toBeDefined(`${s} bulkhead [${i}] is missing an ID`);
         expect(bulkheadIds[b.id]).toBeFalsy(`${s} bulkhead [${i} - ${b.id}] ID already exists`);
         expect(b.eddbID).toBeDefined(`${s} bulkhead [${i} - ${b.id}] is missing EDDB ID`);
-        expect(b.edId).toBeDefined(`${s} bulkhead [${i} - ${b.id}] is missing E:D ID`);
+        // TODO: Get Ids, see github issue  https://github.com/cmmcleod/coriolis-data/issues/6
+        //expect(b.edId).toBeDefined(`${s} bulkhead [${i} - ${b.id}] is missing E:D ID`);
         bulkheadIds[b.id] = true;
       }
     }