diff --git a/dist/index.js b/dist/index.js
index 2d466b0..6c52bee 100644
--- a/dist/index.js
+++ b/dist/index.js
@@ -2804,18 +2804,18 @@ module.exports = {
         manufacturer: "Faulcon DeLacy",
         class: 2,
         hullCost: 42409425,
-        speed: 256,
-        boost: 358,
-        boostEnergy: 14,
-        baseShieldStrength: 220,
-        baseArmour: 360,
+        speed: 250,
+        boost: 380,
+        boostEnergy: 13,
+        baseShieldStrength: 200,
+        baseArmour: 180,
         hardness: 60,
-        hullMass: 280,
+        hullMass: 270,
         masslock: 17,
-        pipSpeed: .07122905027933,
-        pitch: 32,
+        pipSpeed: .048387096774194,
+        pitch: 27,
         roll: 80,
-        yaw: 16,
+        yaw: 10,
         crew: 2
       },
       retailCost: 45814205,
@@ -2881,9 +2881,9 @@ module.exports = {
         hullboost: 2.5
       } ],
       slots: {
-        standard: [ 6, 6, 5, 5, 6, 4, 4 ],
+        standard: [ 7, 6, 5, 4, 7, 6, 5 ],
         hardpoints: [ 3, 3, 2, 2, 0, 0, 0, 0 ],
-        internal: [ 6, 5, 4, 4, 3, 3, 2, 2 ]
+        internal: [ 6, 5, 5, 5, 3, 3, 3, 2 ]
       },
       defaults: {
         standard: [ "6E", "6E", "5E", "4E", "7E", "6E", "5C" ],
@@ -2996,18 +2996,18 @@ module.exports = {
         manufacturer: "Zorgon Peterson",
         class: 2,
         hullCost: 55866341,
-        speed: 316,
-        boost: 390,
-        boostEnergy: 19,
-        baseShieldStrength: 280,
-        baseArmour: 150,
+        speed: 310,
+        boost: 380,
+        boostEnergy: 10,
+        baseShieldStrength: 270,
+        baseArmour: 230,
         hardness: 65,
-        hullMass: 280,
+        hullMass: 250,
         masslock: 12,
-        pipSpeed: .019409937888199,
-        pitch: 35,
+        pipSpeed: .046052631578947,
+        pitch: 27,
         roll: 80,
-        yaw: 12,
+        yaw: 10,
         crew: 2
       },
       retailCost: 55382252,
diff --git a/dist/index.json b/dist/index.json
index 9d5a223..70ab368 100644
--- a/dist/index.json
+++ b/dist/index.json
@@ -4310,18 +4310,18 @@
 				"manufacturer": "Faulcon DeLacy",
 				"class": 2,
 				"hullCost": 42409425,
-				"speed": 256,
-				"boost": 358,
-				"boostEnergy": 14,
-				"baseShieldStrength": 220,
-				"baseArmour": 360,
+				"speed": 250,
+				"boost": 380,
+				"boostEnergy": 13,
+				"baseShieldStrength": 200,
+				"baseArmour": 180,
 				"hardness": 60,
-				"hullMass": 280,
+				"hullMass": 270,
 				"masslock": 17,
-				"pipSpeed": 0.07122905027933,
-				"pitch": 32,
+				"pipSpeed": 0.048387096774194,
+				"pitch": 27,
 				"roll": 80,
-				"yaw": 16,
+				"yaw": 10,
 				"crew": 2
 			},
 			"retailCost": 45814205,
@@ -4394,13 +4394,13 @@
 			],
 			"slots": {
 				"standard": [
-					6,
+					7,
 					6,
 					5,
-					5,
-					6,
 					4,
-					4
+					7,
+					6,
+					5
 				],
 				"hardpoints": [
 					3,
@@ -4415,11 +4415,11 @@
 				"internal": [
 					6,
 					5,
-					4,
-					4,
+					5,
+					5,
+					3,
 					3,
 					3,
-					2,
 					2
 				]
 			},
@@ -4617,18 +4617,18 @@
 				"manufacturer": "Zorgon Peterson",
 				"class": 2,
 				"hullCost": 55866341,
-				"speed": 316,
-				"boost": 390,
-				"boostEnergy": 19,
-				"baseShieldStrength": 280,
-				"baseArmour": 150,
+				"speed": 310,
+				"boost": 380,
+				"boostEnergy": 10,
+				"baseShieldStrength": 270,
+				"baseArmour": 230,
 				"hardness": 65,
-				"hullMass": 280,
+				"hullMass": 250,
 				"masslock": 12,
-				"pipSpeed": 0.019409937888199,
-				"pitch": 35,
+				"pipSpeed": 0.046052631578947,
+				"pitch": 27,
 				"roll": 80,
-				"yaw": 12,
+				"yaw": 10,
 				"crew": 2
 			},
 			"retailCost": 55382252,
diff --git a/ships/krait_phantom.json b/ships/krait_phantom.json
index 891405e..165b15a 100644
--- a/ships/krait_phantom.json
+++ b/ships/krait_phantom.json
@@ -1,104 +1,157 @@
 {
-	"krait_phantom": {
-		"edID": 128149376,
-		"eddbID": 35,
-		"beta": true,
-		"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,
-			"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"]
-		}
-	}
+  "krait_phantom": {
+    "edID": 128149376,
+    "eddbID": 35,
+    "beta": true,
+    "properties": {
+      "name": "Krait Phantom",
+      "manufacturer": "Faulcon DeLacy",
+      "class": 2,
+      "hullCost": 42409425,
+      "speed": 250,
+      "boost": 380,
+      "boostEnergy": 13,
+      "baseShieldStrength": 200,
+      "baseArmour": 180,
+      "hardness": 60,
+      "hullMass": 270,
+      "masslock": 17,
+      "pipSpeed": 0.048387096774194,
+      "pitch": 27,
+      "roll": 80,
+      "yaw": 10,
+      "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": [
+        7,
+        6,
+        5,
+        4,
+        7,
+        6,
+        5
+      ],
+      "hardpoints": [
+        3,
+        3,
+        2,
+        2,
+        0,
+        0,
+        0,
+        0
+      ],
+      "internal": [
+        6,
+        5,
+        5,
+        5,
+        3,
+        3,
+        3,
+        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 128d2c7..e95893a 100644
--- a/ships/mamba.json
+++ b/ships/mamba.json
@@ -1,104 +1,156 @@
 {
-	"mamba": {
-		"edID": 128149376,
-		"eddbID": 11,
-		"beta": true,
-		"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,
+    "beta": true,
+    "properties": {
+      "name": "Mamba",
+      "manufacturer": "Zorgon Peterson",
+      "class": 2,
+      "hullCost": 55866341,
+      "speed": 310,
+      "boost": 380,
+      "boostEnergy": 10,
+      "baseShieldStrength": 270,
+      "baseArmour": 230,
+      "hardness": 65,
+      "hullMass": 250,
+      "masslock": 12,
+      "pipSpeed": 0.046052631578947,
+      "pitch": 27,
+      "roll": 80,
+      "yaw": 10,
+      "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"
+      ]
+    }
+  }
 }