diff --git a/dist/index.js b/dist/index.js
index 8c5b3aa..e9598c4 100644
--- a/dist/index.js
+++ b/dist/index.js
@@ -2886,7 +2886,7 @@ module.exports = {
         internal: [ 6, 5, 4, 4, 3, 3, 2, 2 ]
       },
       defaults: {
-        standard: [ "7E", "6E", "5E", "4E", "7E", "6E", "5C" ],
+        standard: [ "6E", "6E", "5E", "4E", "7E", "6E", "5C" ],
         hardpoints: [ 0, 0, 0, 0, 0, 0, 0, 0, 0 ],
         internal: [ "4h", "04", "04", "03", 0, "2h", 0, "00" ]
       }
diff --git a/dist/index.json b/dist/index.json
index 93f67b2..7bd3970 100644
--- a/dist/index.json
+++ b/dist/index.json
@@ -4425,7 +4425,7 @@
 			},
 			"defaults": {
 				"standard": [
-					"7E",
+					"6E",
 					"6E",
 					"5E",
 					"4E",
diff --git a/ships/krait_phantom.json b/ships/krait_phantom.json
index 8f37aca..12d1304 100644
--- a/ships/krait_phantom.json
+++ b/ships/krait_phantom.json
@@ -1,44 +1,104 @@
 {
-  "krait_phantom": {
-    "edID": 128149376,
-    "eddbID": 35,
-    "properties": {
-      "name": "Krait Phantom",
-      "manufacturer": "Faulcon DeLacy",
-      "class": 2,
-      "hullCost": 42409425,
-      "speed": 256,
-      "boost": 358,
-      "boostEnergy": 14,
-      "baseShieldStrength": 220,
-      "baseArmour": 360,
-      "hardness": 60,
-      "hullMass": 280,
-      "masslock": 17,
-      "pipSpeed": 0.07122905027933,
-      "fighterHangars": true,
-      "pitch": 32,
-      "roll": 80,
-      "yaw": 16,
-      "crew": 2
-    },
-    "retailCost": 45814205,
-    "bulkheads": [
-      { "id": "2T", "edID": 128816569, "eddbID": 1645, "grp": "bh", "cost": 0, "mass": 0, "causres": 0, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 0.8 },
-      { "id": "2U", "edID": 128816570, "eddbID": 1646, "grp": "bh", "cost": 22791270, "mass": 36, "causres": 0, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 1.52 },
-      { "id": "2V", "edID": 128816571, "eddbID": 1647, "grp": "bh", "cost": 51280360, "mass": 67, "causres": 0, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 2.5 },
-      { "id": "2W", "edID": 128816572, "eddbID": 1648, "grp": "bh", "cost": 121192590, "mass": 67, "causres": 0, "explres": -0.5, "kinres": -0.75, "thermres": 0.5, "hullboost": 2.5  },
-      { "id": "2X", "edID": 128816573, "eddbID": 1649, "grp": "bh", "cost": 134297570, "mass": 67, "causres": 0, "explres": 0.2, "kinres": 0.25, "thermres": -0.4, "hullboost": 2.5 }
-    ],
-    "slots": {
-      "standard": [6, 6, 5, 5, 6, 4, 4],
-      "hardpoints": [3, 3, 2, 2, 0, 0, 0, 0],
-      "internal": [6,5,4,4,3,3,2,2]
-    },
-    "defaults": {
-      "standard": ["7E", "6E", "5E", "4E", "7E", "6E", "5C"],
-      "hardpoints": [0, 0, 0, 0, 0, 0, 0, 0, 0],
-      "internal": ["4h", "04", "04", "03", 0, "2h", 0, "00"]
-    }
-  }
+	"krait_phantom": {
+		"edID": 128149376,
+		"eddbID": 35,
+		"properties": {
+			"name": "Krait Phantom",
+			"manufacturer": "Faulcon DeLacy",
+			"class": 2,
+			"hullCost": 42409425,
+			"speed": 256,
+			"boost": 358,
+			"boostEnergy": 14,
+			"baseShieldStrength": 220,
+			"baseArmour": 360,
+			"hardness": 60,
+			"hullMass": 280,
+			"masslock": 17,
+			"pipSpeed": 0.07122905027933,
+			"fighterHangars": true,
+			"pitch": 32,
+			"roll": 80,
+			"yaw": 16,
+			"crew": 2
+		},
+		"retailCost": 45814205,
+		"bulkheads": [
+			{
+				"id": "2T",
+				"edID": 128816569,
+				"eddbID": 1645,
+				"grp": "bh",
+				"cost": 0,
+				"mass": 0,
+				"causres": 0,
+				"explres": -0.4,
+				"kinres": -0.2,
+				"thermres": 0,
+				"hullboost": 0.8
+			},
+			{
+				"id": "2U",
+				"edID": 128816570,
+				"eddbID": 1646,
+				"grp": "bh",
+				"cost": 22791270,
+				"mass": 36,
+				"causres": 0,
+				"explres": -0.4,
+				"kinres": -0.2,
+				"thermres": 0,
+				"hullboost": 1.52
+			},
+			{
+				"id": "2V",
+				"edID": 128816571,
+				"eddbID": 1647,
+				"grp": "bh",
+				"cost": 51280360,
+				"mass": 67,
+				"causres": 0,
+				"explres": -0.4,
+				"kinres": -0.2,
+				"thermres": 0,
+				"hullboost": 2.5
+			},
+			{
+				"id": "2W",
+				"edID": 128816572,
+				"eddbID": 1648,
+				"grp": "bh",
+				"cost": 121192590,
+				"mass": 67,
+				"causres": 0,
+				"explres": -0.5,
+				"kinres": -0.75,
+				"thermres": 0.5,
+				"hullboost": 2.5
+			},
+			{
+				"id": "2X",
+				"edID": 128816573,
+				"eddbID": 1649,
+				"grp": "bh",
+				"cost": 134297570,
+				"mass": 67,
+				"causres": 0,
+				"explres": 0.2,
+				"kinres": 0.25,
+				"thermres": -0.4,
+				"hullboost": 2.5
+			}
+		],
+		"slots": {
+			"standard": [6, 6, 5, 5, 6, 4, 4],
+			"hardpoints": [3, 3, 2, 2, 0, 0, 0, 0],
+			"internal": [6, 5, 4, 4, 3, 3, 2, 2]
+		},
+		"defaults": {
+			"standard": ["6E", "6E", "5E", "4E", "7E", "6E", "5C"],
+			"hardpoints": [0, 0, 0, 0, 0, 0, 0, 0, 0],
+			"internal": ["4h", "04", "04", "03", 0, "2h", 0, "00"]
+		}
+	}
 }
diff --git a/ships/mamba.json b/ships/mamba.json
index df60b95..9ef3ce3 100644
--- a/ships/mamba.json
+++ b/ships/mamba.json
@@ -1,43 +1,103 @@
 {
-  "mamba": {
-    "edID": 128149376,
-    "eddbID": 11,
-    "properties": {
-      "name": "Mamba",
-      "manufacturer": "Zorgon Peterson",
-      "class": 2,
-      "hullCost": 55866341,
-      "speed": 316,
-      "boost": 390,
-      "boostEnergy": 19,
-      "baseShieldStrength": 280,
-      "baseArmour": 150,
-      "hardness": 65,
-      "hullMass": 280,
-      "masslock": 12,
-      "pipSpeed": 0.019409937888199,
-      "pitch": 35,
-      "roll": 80,
-      "yaw": 12,
-      "crew": 2
-    },
-    "retailCost": 55382252,
-    "bulkheads": [
-      { "id": "2T", "edID": 128049376, "eddbID": 813, "grp": "bh", "cost": 0, "mass": 0, "causres": 0, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 0.8 },
-      { "id": "2U", "edID": 128049377, "eddbID": 814, "grp": "bh", "cost": 20626820, "mass": 19, "causres": 0, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 1.52 },
-      { "id": "2V", "edID": 128049378, "eddbID": 815, "grp": "bh", "cost": 46410340, "mass": 38, "causres": 0, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 2.5 },
-      { "id": "2W", "edID": 128049379, "eddbID": 816, "grp": "bh", "cost": 109683090, "mass": 38, "causres": 0, "explres": -0.5, "kinres": -0.75, "thermres": 0.5, "hullboost": 2.5  },
-      { "id": "2X", "edID": 128049380, "eddbID": 817, "grp": "bh", "cost": 121543510, "mass": 38, "causres": 0, "explres": 0.2, "kinres": 0.25, "thermres": -0.4, "hullboost": 2.5 }
-    ],
-    "slots": {
-      "standard": [6, 5, 4, 4, 6, 4, 3],
-      "hardpoints": [4, 3, 3, 1, 1, 0, 0, 0, 0, 0, 0],
-      "internal": [5, 4, 3, 2, 2]
-    },
-    "defaults": {
-      "standard": ["5E", "5E", "4E", "4E", "6E", "4E", "3C"],
-      "hardpoints": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
-      "internal": ["03", "49", "02", 0, "2h"]
-    }
-  }
+	"mamba": {
+		"edID": 128149376,
+		"eddbID": 11,
+		"properties": {
+			"name": "Mamba",
+			"manufacturer": "Zorgon Peterson",
+			"class": 2,
+			"hullCost": 55866341,
+			"speed": 316,
+			"boost": 390,
+			"boostEnergy": 19,
+			"baseShieldStrength": 280,
+			"baseArmour": 150,
+			"hardness": 65,
+			"hullMass": 280,
+			"masslock": 12,
+			"pipSpeed": 0.019409937888199,
+			"pitch": 35,
+			"roll": 80,
+			"yaw": 12,
+			"crew": 2
+		},
+		"retailCost": 55382252,
+		"bulkheads": [
+			{
+				"id": "2T",
+				"edID": 128049376,
+				"eddbID": 813,
+				"grp": "bh",
+				"cost": 0,
+				"mass": 0,
+				"causres": 0,
+				"explres": -0.4,
+				"kinres": -0.2,
+				"thermres": 0,
+				"hullboost": 0.8
+			},
+			{
+				"id": "2U",
+				"edID": 128049377,
+				"eddbID": 814,
+				"grp": "bh",
+				"cost": 20626820,
+				"mass": 19,
+				"causres": 0,
+				"explres": -0.4,
+				"kinres": -0.2,
+				"thermres": 0,
+				"hullboost": 1.52
+			},
+			{
+				"id": "2V",
+				"edID": 128049378,
+				"eddbID": 815,
+				"grp": "bh",
+				"cost": 46410340,
+				"mass": 38,
+				"causres": 0,
+				"explres": -0.4,
+				"kinres": -0.2,
+				"thermres": 0,
+				"hullboost": 2.5
+			},
+			{
+				"id": "2W",
+				"edID": 128049379,
+				"eddbID": 816,
+				"grp": "bh",
+				"cost": 109683090,
+				"mass": 38,
+				"causres": 0,
+				"explres": -0.5,
+				"kinres": -0.75,
+				"thermres": 0.5,
+				"hullboost": 2.5
+			},
+			{
+				"id": "2X",
+				"edID": 128049380,
+				"eddbID": 817,
+				"grp": "bh",
+				"cost": 121543510,
+				"mass": 38,
+				"causres": 0,
+				"explres": 0.2,
+				"kinres": 0.25,
+				"thermres": -0.4,
+				"hullboost": 2.5
+			}
+		],
+		"slots": {
+			"standard": [6, 5, 4, 4, 6, 4, 3],
+			"hardpoints": [4, 3, 3, 1, 1, 0, 0, 0, 0, 0, 0],
+			"internal": [5, 4, 3, 2, 2]
+		},
+		"defaults": {
+			"standard": ["5E", "5E", "4E", "4E", "6E", "4E", "3C"],
+			"hardpoints": [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
+			"internal": ["03", "49", "02", 0, "2h"]
+		}
+	}
 }