diff --git a/dist/index.js b/dist/index.js
index 24ebc1b..4a3f562 100644
--- a/dist/index.js
+++ b/dist/index.js
@@ -232,7 +232,7 @@ module.exports = {
         hardness: 65,
         hullMass: 450,
         masslock: 13,
-        pipSpeed: .0875,
+        pipSpeed: .088709677419355,
         pitch: 32,
         roll: 90,
         yaw: 16,
@@ -342,6 +342,133 @@ module.exports = {
         internal: [ "04", "4h", "01", "01", "2h", "", "", "", "" ]
       }
     },
+    alliance_crusader: {
+      edID: 128816581,
+      eddbID: 0,
+      properties: {
+        name: "Alliance Crusader",
+        manufacturer: "Lakon",
+        class: 2,
+        hullCost: 22866341,
+        speed: 180,
+        boost: 300,
+        boostEnergy: 19,
+        baseShieldStrength: 200,
+        baseArmour: 300,
+        hardness: 65,
+        hullMass: 500,
+        masslock: 13,
+        fighterHangars: true,
+        pipSpeed: .15833333333333,
+        pitch: 32,
+        roll: 80,
+        yaw: 16,
+        crew: 3
+      },
+      retailCost: 19382252,
+      requirements: {
+        horizons: true
+      },
+      bulkheads: [ {
+        id: "CI",
+        edID: 128816583,
+        eddbID: 1640,
+        grp: "bh",
+        cost: 0,
+        mass: 0,
+        explres: -.4,
+        kinres: -.2,
+        thermres: 0,
+        hullboost: .8
+      }, {
+        id: "CJ",
+        edID: 128816584,
+        eddbID: 1641,
+        grp: "bh",
+        cost: 6803170,
+        mass: 40,
+        explres: -.4,
+        kinres: -.2,
+        thermres: 0,
+        hullboost: 1.52
+      }, {
+        id: "CK",
+        edID: 128816585,
+        eddbID: 1642,
+        grp: "bh",
+        cost: 15307134,
+        mass: 78,
+        explres: -.4,
+        kinres: -.2,
+        thermres: 0,
+        hullboost: 2.5
+      }, {
+        id: "CL",
+        edID: 128816586,
+        eddbID: 1643,
+        grp: "bh",
+        cost: 36175859,
+        mass: 78,
+        explres: -.5,
+        kinres: -.75,
+        thermres: .5,
+        hullboost: 2.5
+      }, {
+        id: "CM",
+        edID: 128816587,
+        eddbID: 1644,
+        grp: "bh",
+        cost: 40087682,
+        mass: 78,
+        explres: .2,
+        kinres: .25,
+        thermres: -.4,
+        hullboost: 2.5
+      } ],
+      slots: {
+        standard: [ 6, 6, 5, 5, 6, 4, 4 ],
+        hardpoints: [ 3, 2, 2, 1, 1, 1, 0, 0, 0, 0 ],
+        internal: [ 6, 5, 3, 3, 2, 2, {
+          class: 4,
+          name: "Military",
+          eligible: {
+            hr: 1,
+            scb: 1,
+            mrp: 1,
+            gsrp: 1,
+            gmrp: 1,
+            ghrp: 1
+          }
+        }, {
+          class: 4,
+          name: "Military",
+          eligible: {
+            hr: 1,
+            scb: 1,
+            mrp: 1,
+            gsrp: 1,
+            gmrp: 1,
+            ghrp: 1
+          }
+        }, {
+          class: 4,
+          name: "Military",
+          eligible: {
+            hr: 1,
+            scb: 1,
+            mrp: 1,
+            gsrp: 1,
+            gmrp: 1,
+            ghrp: 1
+          }
+        } ]
+      },
+      defaults: {
+        standard: [ "6E", "6E", "5E", "5E", "6E", "4E", "4C" ],
+        hardpoints: [ 17, 0, 17, 0, 0, 0, 0, 0, 0, 0 ],
+        internal: [ "04", "4e", "02", "", "2h", "", "", "" ]
+      }
+    },
     anaconda: {
       edID: 128049363,
       eddbID: 2,
@@ -10829,6 +10956,66 @@ module.exports = {
         shotspeed: 1200,
         thermload: 5.8,
         symbol: "Hpt_Guardian_PlasmaLauncher_Turret_Medium"
+      }, {
+        rating: "C",
+        class: 3,
+        grp: "gpc",
+        id: "xu",
+        eddbID: 0,
+        edID: 128834783,
+        mount: "F",
+        cost: 1423301,
+        mass: 8,
+        integrity: 51,
+        power: 3.1,
+        damage: 3.4,
+        distdraw: 2.42,
+        thermload: 6.2,
+        piercing: 95,
+        range: 3e3,
+        shotspeed: 1200,
+        rof: 5,
+        clip: 15,
+        ammo: 200,
+        reload: 3,
+        breachdmg: 1,
+        breachmin: .5,
+        breachmax: .8,
+        symbol: "Hpt_Guardian_PlasmaLauncher_Fixed_Large",
+        damagedist: {
+          A: 1
+        },
+        falloff: 1e3
+      }, {
+        ammo: 200,
+        breachdmg: .8,
+        breachmax: .8,
+        breachmin: .5,
+        class: 3,
+        clip: 15,
+        cost: 5495200,
+        damage: 3.3,
+        damagedist: {
+          A: 1
+        },
+        distdraw: 2.6,
+        edID: 128834784,
+        eddbID: 0,
+        falloff: 1e3,
+        grp: "gpc",
+        id: "xv",
+        integrity: 51,
+        mass: 8,
+        mount: "T",
+        piercing: 95,
+        power: 2.53,
+        range: 3e3,
+        rating: "D",
+        reload: 3,
+        rof: 5,
+        shotspeed: 1200,
+        thermload: 6.4,
+        symbol: "Hpt_Guardian_PlasmaLauncher_Turret_Large"
       } ],
       ggc: [ {
         ammo: 80,
@@ -10903,6 +11090,38 @@ module.exports = {
         symbol: "Hpt_XenoScanner_Basic_Tiny"
       } ],
       tbsc: [ {
+        rating: "C",
+        class: 3,
+        grp: "tbsc",
+        id: "yG",
+        eddbID: 0,
+        edID: 128834780,
+        mount: "F",
+        cost: 1015750,
+        mass: 8,
+        integrity: 64,
+        power: .89,
+        damage: 18.1,
+        distdraw: .92,
+        thermload: 2.7,
+        piercing: 60,
+        range: 3e3,
+        shotspeed: 1200,
+        rof: 10,
+        roundspershot: 0,
+        clip: 16,
+        ammo: 240,
+        reload: 6,
+        breachdmg: 12.7,
+        breachmin: .4,
+        breachmax: .8,
+        jitter: 0,
+        symbol: "Hpt_PlasmaShockCannon_Fixed_Large",
+        damagedist: {
+          K: 1
+        },
+        falloff: 2500
+      }, {
         rating: "C",
         class: 3,
         grp: "tbsc",
@@ -10921,17 +11140,47 @@ module.exports = {
         falloff: 2500,
         integrity: 64,
         mount: "G",
-        piercing: 95,
+        piercing: 60,
         power: .89,
         range: 3e3,
         rof: 10,
         shotspeed: 1200,
         thermload: 3.1,
-        cost: 1015750,
+        cost: 2249050,
         reload: 6,
         id: "2N",
-        edID: 128834780,
-        symbol: "Hpt_PlasmaShockCannon_Fixed_Large"
+        edID: 128834781,
+        symbol: "Hpt_PlasmaShockCannon_Gimbal_Large"
+      }, {
+        rating: "D",
+        class: 3,
+        grp: "tbsc",
+        symbol: "Hpt_PlasmaShockCannon_Turret_Large",
+        id: "xz",
+        eddbID: 0,
+        edID: 128834782,
+        mount: "T",
+        cost: 6050201,
+        mass: 8,
+        integrity: 64,
+        power: .64,
+        damage: 12.32,
+        distdraw: .79,
+        thermload: 2.2,
+        piercing: 60,
+        range: 3e3,
+        shotspeed: 1200,
+        rof: 10,
+        clip: 16,
+        ammo: 240,
+        reload: 6,
+        breachdmg: 8.6,
+        breachmin: .4,
+        breachmax: .8,
+        damagedist: {
+          K: 1
+        },
+        falloff: 2500
       }, {
         rating: "D",
         class: 2,
@@ -10962,6 +11211,154 @@ module.exports = {
         id: "2O",
         edID: 128834003,
         symbol: "Hpt_PlasmaShockCannon_Gimbal_Medium"
+      }, {
+        grp: "tbsc",
+        symbol: "Hpt_PlasmaShockCannon_Fixed_Medium",
+        id: "y0",
+        eddbID: 0,
+        edID: 128834002,
+        class: 2,
+        rating: "D",
+        mount: "F",
+        cost: 367501,
+        mass: 4,
+        integrity: 51,
+        power: .57,
+        damage: 13,
+        distdraw: .47,
+        thermload: 1.8,
+        piercing: 40,
+        range: 3e3,
+        shotspeed: 1200,
+        rof: 10,
+        clip: 16,
+        ammo: 240,
+        reload: 6,
+        breachdmg: 9.1,
+        breachmin: .4,
+        breachmax: .6,
+        damagedist: {
+          K: 1
+        },
+        falloff: 2500
+      }, {
+        rating: "E",
+        class: 2,
+        grp: "tbsc",
+        id: "0",
+        eddbID: 0,
+        edID: 128834004,
+        mount: "T",
+        cost: 1359200,
+        mass: 4,
+        integrity: 51,
+        power: .5,
+        damage: 9,
+        distdraw: .39,
+        thermload: 1.2,
+        piercing: 40,
+        range: 3e3,
+        shotspeed: 1200,
+        rof: 10,
+        roundspershot: 0,
+        clip: 16,
+        ammo: 240,
+        reload: 6,
+        breachdmg: 6.3,
+        breachmin: .4,
+        breachmax: .8,
+        jitter: 0,
+        symbol: "Hpt_PlasmaShockCannon_Turret_Medium",
+        damagedist: {
+          K: 1
+        },
+        falloff: 2500
+      } ],
+      tbem: [ {
+        rating: "B",
+        class: 2,
+        grp: "tbem",
+        id: "xt",
+        eddbID: 0,
+        edID: 128833995,
+        mount: "F",
+        cost: 480501,
+        mass: 4,
+        integrity: 51,
+        power: 1.2,
+        damage: 5,
+        distdraw: .08,
+        thermload: 1.5,
+        piercing: 60,
+        shotspeed: 750,
+        rof: .5,
+        clip: 8,
+        ammo: 64,
+        reload: 5,
+        breachdmg: 0,
+        breachmin: .8,
+        breachmax: 1,
+        symbol: "Hpt_CausticMissile_Fixed_Medium",
+        damagedist: {
+          E: 1
+        }
+      } ],
+      tbrfl: [ {
+        rating: "B",
+        class: 2,
+        grp: "tbrfl",
+        id: "xy",
+        eddbID: 0,
+        edID: 128833996,
+        mount: "F",
+        cost: 353761,
+        mass: 4,
+        integrity: 51,
+        power: 1.2,
+        damage: 13,
+        distdraw: .24,
+        thermload: 3.6,
+        piercing: 80,
+        shotspeed: 550,
+        rof: .5,
+        clip: 1,
+        ammo: 72,
+        reload: 2,
+        breachdmg: 6.5,
+        breachmin: 1,
+        breachmax: 1,
+        symbol: "Hpt_FlechetteLauncher_Fixed_Medium",
+        damagedist: {
+          K: 1
+        }
+      }, {
+        rating: "B",
+        class: 2,
+        grp: "tbrfl",
+        id: "yF",
+        eddbID: 0,
+        edID: 128833997,
+        mount: "T",
+        cost: 1279200,
+        mass: 4,
+        integrity: 51,
+        power: 1.2,
+        damage: 13,
+        distdraw: .24,
+        thermload: 3.6,
+        piercing: 70,
+        shotspeed: 550,
+        rof: .5,
+        clip: 1,
+        ammo: 72,
+        reload: 2,
+        breachdmg: 6.5,
+        breachmin: 1,
+        breachmax: 1,
+        symbol: "Hpt_FlechetteLauncher_Turret_Medium",
+        damagedist: {
+          K: 1
+        }
       } ],
       gsc: [ {
         rating: "A",
@@ -10995,6 +11392,38 @@ module.exports = {
           T: 1
         },
         falloff: 1700
+      }, {
+        rating: "D",
+        class: 2,
+        grp: "gsc",
+        id: "xw",
+        eddbID: 0,
+        edID: 0,
+        mount: "T",
+        cost: 1767001,
+        mass: 4,
+        integrity: 42,
+        power: 1.16,
+        damage: 2.4,
+        distdraw: .57,
+        thermload: 1.1,
+        piercing: 45,
+        range: 1700,
+        shotspeed: 1133,
+        rof: 1.7,
+        roundspershot: 12,
+        clip: 5,
+        ammo: 180,
+        reload: 5,
+        breachdmg: 1.9,
+        breachmin: .6,
+        breachmax: .8,
+        jitter: 5,
+        symbol: "Hpt_Guardian_ShardCannon_Turret_Medium",
+        damagedist: {
+          T: 1
+        },
+        falloff: 1700
       }, {
         rating: "C",
         class: 3,
@@ -11027,6 +11456,38 @@ module.exports = {
           T: 1
         },
         falloff: 1700
+      }, {
+        rating: "D",
+        class: 3,
+        grp: "gsc",
+        id: "xx",
+        eddbID: 0,
+        edID: 128834779,
+        mount: "T",
+        cost: 5865026,
+        mass: 8,
+        integrity: 51,
+        power: 1.39,
+        damage: 3.4,
+        distdraw: 1.2,
+        thermload: 2,
+        piercing: 60,
+        range: 1700,
+        shotspeed: 1133,
+        rof: 1.7,
+        clip: 5,
+        ammo: 180,
+        roundspershot: 12,
+        reload: 5,
+        breachdmg: 2.7,
+        breachmin: .6,
+        breachmax: .8,
+        jitter: 5,
+        symbol: "Hpt_Guardian_ShardCannon_Turret_Large",
+        damagedist: {
+          T: 1
+        },
+        falloff: 1700
       } ]
     },
     internal: {
@@ -11861,7 +12322,7 @@ module.exports = {
         cargo: 16,
         class: 4,
         cost: 94330,
-        edID: 128681992,
+        edID: 128833944,
         eddbID: 1552,
         grp: "cr",
         id: "0W",
@@ -12163,6 +12624,59 @@ module.exports = {
         rating: "E",
         symbol: "Int_DockingComputer_Standard"
       } ],
+      dtl: [ {
+        class: 1,
+        cost: 3600,
+        edID: 128793941,
+        eddbID: 0,
+        grp: "dtl",
+        id: "y1",
+        mass: 1.3,
+        maximum: 1,
+        power: .18,
+        range: .6,
+        rating: "E",
+        symbol: "Int_DroneControl_Decontamination_Size1_Class1"
+      }, {
+        class: 3,
+        cost: 16201,
+        edID: 128793942,
+        eddbID: 0,
+        grp: "dtl",
+        id: "y2",
+        mass: 2,
+        maximum: 2,
+        power: .2,
+        range: .88,
+        rating: "E",
+        symbol: "Int_DroneControl_Decontamination_Size3_Class1"
+      }, {
+        class: 5,
+        cost: 145801,
+        edID: 128793943,
+        eddbID: 0,
+        grp: "dtl",
+        id: "y3",
+        mass: 20,
+        maximum: 3,
+        power: .5,
+        range: 1.3,
+        rating: "E",
+        symbol: "Int_DroneControl_Decontamination_Size5_Class1"
+      }, {
+        class: 7,
+        cost: 1312201,
+        edID: 128793944,
+        eddbID: 0,
+        grp: "dtl",
+        id: "y4",
+        mass: 128,
+        maximum: 4,
+        power: .97,
+        range: 2.04,
+        rating: "E",
+        symbol: "Int_DroneControl_Decontamination_Size7_Class1"
+      } ],
       fh: [ {
         bays: 1,
         class: 5,
@@ -13715,6 +14229,157 @@ module.exports = {
         thermres: .025,
         symbol: "Int_HullReinforcement_Size5_Class2"
       } ],
+      mahr: [ {
+        hullreinforcement: 72,
+        class: 1,
+        cost: 7501,
+        edID: 128793117,
+        eddbID: 0,
+        explres: 0,
+        grp: "mahr",
+        id: "y5",
+        kinres: 0,
+        mass: 2,
+        rating: "E",
+        thermres: 0,
+        causres: .03,
+        symbol: "Int_MetaAlloyHullReinforcement_Size1_Class1"
+      }, {
+        hullreinforcement: 99,
+        class: 1,
+        cost: 22501,
+        edID: 128793118,
+        eddbID: 0,
+        explres: 0,
+        grp: "mahr",
+        id: "y6",
+        kinres: 0,
+        mass: 2,
+        rating: "D",
+        thermres: 0,
+        causres: .03,
+        symbol: "Int_MetaAlloyHullReinforcement_Size1_Class2"
+      }, {
+        hullreinforcement: 135,
+        class: 2,
+        cost: 18e3,
+        edID: 128793119,
+        eddbID: 0,
+        explres: 0,
+        grp: "mahr",
+        id: "y7",
+        kinres: 0,
+        mass: 4,
+        rating: "E",
+        thermres: 0,
+        causres: .03,
+        symbol: "Int_MetaAlloyHullReinforcement_Size2_Class1"
+      }, {
+        hullreinforcement: 171,
+        class: 2,
+        cost: 54e3,
+        edID: 128793120,
+        eddbID: 0,
+        explres: 0,
+        grp: "mahr",
+        id: "y8",
+        kinres: 0,
+        mass: 2,
+        rating: "D",
+        thermres: 0,
+        causres: .03,
+        symbol: "Int_MetaAlloyHullReinforcement_Size2_Class2"
+      }, {
+        hullreinforcement: 207,
+        class: 3,
+        cost: 42e3,
+        edID: 128793121,
+        eddbID: 0,
+        explres: 0,
+        grp: "mahr",
+        id: "y9",
+        kinres: 0,
+        mass: 8,
+        rating: "E",
+        thermres: 0,
+        causres: .03,
+        symbol: "Int_MetaAlloyHullReinforcement_Size3_Class1"
+      }, {
+        hullreinforcement: 234,
+        class: 3,
+        cost: 126e3,
+        edID: 128793122,
+        eddbID: 0,
+        explres: 0,
+        grp: "mahr",
+        id: "yA",
+        kinres: 0,
+        mass: 4,
+        rating: "D",
+        thermres: 0,
+        causres: .03,
+        symbol: "Int_MetaAlloyHullReinforcement_Size3_Class2"
+      }, {
+        hullreinforcement: 270,
+        class: 4,
+        cost: 97501,
+        edID: 128793123,
+        eddbID: 0,
+        explres: 0,
+        grp: "mahr",
+        id: "yB",
+        kinres: 0,
+        mass: 16,
+        rating: "E",
+        thermres: 0,
+        causres: .03,
+        symbol: "Int_MetaAlloyHullReinforcement_Size4_Class1"
+      }, {
+        hullreinforcement: 297,
+        class: 4,
+        cost: 292501,
+        edID: 128793124,
+        eddbID: 0,
+        explres: 0,
+        grp: "mahr",
+        id: "yC",
+        kinres: 0,
+        mass: 8,
+        rating: "D",
+        thermres: 0,
+        causres: .03,
+        symbol: "Int_MetaAlloyHullReinforcement_Size4_Class2"
+      }, {
+        hullreinforcement: 324,
+        class: 5,
+        cost: 225001,
+        edID: 128793125,
+        eddbID: 0,
+        explres: 0,
+        grp: "mahr",
+        id: "yD",
+        kinres: 0,
+        mass: 32,
+        rating: "E",
+        thermres: 0,
+        causres: .03,
+        symbol: "Int_MetaAlloyHullReinforcement_Size5_Class1"
+      }, {
+        hullreinforcement: 351,
+        class: 5,
+        cost: 675001,
+        edID: 128793126,
+        eddbID: 0,
+        explres: 0,
+        grp: "mahr",
+        id: "yE",
+        kinres: 0,
+        mass: 16,
+        rating: "D",
+        thermres: 0,
+        causres: .03,
+        symbol: "Int_MetaAlloyHullReinforcement_Size5_Class2"
+      } ],
       mrp: [ {
         class: 1,
         cost: 5e3,
@@ -16840,6 +17505,22 @@ module.exports = {
         hacktime: 10,
         symbol: "Int_DroneControl_Recon_Size7_Class1"
       } ],
+      rsl: [ {
+        rating: "E",
+        class: 1,
+        grp: "rsl",
+        id: "0",
+        eddbID: 1617,
+        edID: 128793116,
+        cost: 1749600,
+        mass: 1.3,
+        maximum: 1,
+        power: .4,
+        range: 2e3,
+        symbol: "Int_DroneControl_UnkVesselResearch",
+        time: 300,
+        integrity: 20
+      } ],
       gsrp: [ {
         shieldaddition: 44,
         integrity: 36,
@@ -17046,6 +17727,7 @@ module.exports = {
         eddbID: 0,
         power: .56,
         hullreinforcement: 138,
+        causres: .05,
         thermres: .02,
         cost: 3e4,
         symbol: "Int_GuardianHullReinforcement_Size1_Class2",
@@ -17059,6 +17741,7 @@ module.exports = {
         eddbID: 0,
         power: .45,
         hullreinforcement: 100,
+        causres: .05,
         thermres: .02,
         cost: 1e4,
         symbol: "Int_GuardianHullReinforcement_Size1_Class1",
@@ -17072,6 +17755,7 @@ module.exports = {
         eddbID: 0,
         power: .79,
         hullreinforcement: 238,
+        causres: .05,
         thermres: .02,
         cost: 72e3,
         symbol: "Int_GuardianHullReinforcement_Size2_Class2",
@@ -17085,6 +17769,7 @@ module.exports = {
         eddbID: 0,
         power: .68,
         hullreinforcement: 188,
+        causres: .05,
         thermres: .02,
         cost: 24e3,
         symbol: "Int_GuardianHullReinforcement_Size2_Class1",
@@ -17098,6 +17783,7 @@ module.exports = {
         eddbID: 0,
         power: 1.01,
         hullreinforcement: 325,
+        causres: .05,
         thermres: .02,
         cost: 172800,
         symbol: "Int_GuardianHullReinforcement_Size3_Class2",
@@ -17111,6 +17797,7 @@ module.exports = {
         eddbID: 0,
         power: .9,
         hullreinforcement: 288,
+        causres: .05,
         thermres: .02,
         cost: 57600,
         symbol: "Int_GuardianHullReinforcement_Size3_Class1",
@@ -17123,6 +17810,7 @@ module.exports = {
         eddbID: 0,
         power: 1.24,
         hullreinforcement: 413,
+        causres: .05,
         thermres: .02,
         cost: 414720,
         id: "2R",
@@ -17136,6 +17824,7 @@ module.exports = {
         eddbID: 0,
         power: 1.13,
         hullreinforcement: 375,
+        causres: .05,
         thermres: .02,
         cost: 138240,
         id: "2B",
@@ -17149,6 +17838,7 @@ module.exports = {
         eddbID: 0,
         power: 1.46,
         hullreinforcement: 488,
+        causres: .05,
         thermres: .02,
         cost: 995330,
         id: "2C",
@@ -17162,6 +17852,7 @@ module.exports = {
         eddbID: 0,
         power: 1.35,
         hullreinforcement: 450,
+        causres: .05,
         thermres: .02,
         cost: 331778,
         id: "2D",
@@ -18534,11 +19225,11 @@ module.exports = {
               "Specialised Legacy Firmware": 1
             },
             features: {
-              integrity: [ 0, -.03 ],
-              optmass: [ 0, -.03 ],
+              integrity: [ -.03, -.03 ],
+              optmass: [ -.03, -.03 ],
               optmul: [ 0, .12 ],
-              power: [ 0, .04 ],
-              thermload: [ 0, .2 ]
+              power: [ .04, .04 ],
+              thermload: [ .2, .2 ]
             },
             uuid: "bbdea125-dd2b-4031-8698-56c922df3b76"
           },
@@ -18548,11 +19239,11 @@ module.exports = {
               "Specialised Legacy Firmware": 1
             },
             features: {
-              integrity: [ -.03, -.06 ],
-              optmass: [ -.03, -.05 ],
+              integrity: [ -.06, -.06 ],
+              optmass: [ -.05, -.05 ],
               optmul: [ .12, .19 ],
-              power: [ .04, .06 ],
-              thermload: [ .2, .3 ]
+              power: [ .06, .06 ],
+              thermload: [ .3, .3 ]
             },
             uuid: "d3ccba04-e0f5-40c3-a6f8-a038d5e5b4bf"
           },
@@ -18563,11 +19254,11 @@ module.exports = {
               "Specialised Legacy Firmware": 1
             },
             features: {
-              integrity: [ -.06, -.09 ],
-              optmass: [ -.05, -.08 ],
+              integrity: [ -.09, -.09 ],
+              optmass: [ -.08, -.08 ],
               optmul: [ .19, .26 ],
-              power: [ .06, .08 ],
-              thermload: [ .3, .4 ]
+              power: [ .08, .08 ],
+              thermload: [ .4, .4 ]
             },
             uuid: "60091d1f-38a9-4d62-bbc0-6332e03c7f3d"
           },
@@ -18578,11 +19269,11 @@ module.exports = {
               Selenium: 1
             },
             features: {
-              integrity: [ -.09, -.12 ],
-              optmass: [ -.08, -.1 ],
+              integrity: [ -.12, -.12 ],
+              optmass: [ -.1, -.1 ],
               optmul: [ .26, .33 ],
-              power: [ .08, .1 ],
-              thermload: [ .4, .5 ]
+              power: [ .1, .1 ],
+              thermload: [ .5, .5 ]
             },
             uuid: "7355e32e-b850-4428-8279-66f234f59c6a"
           },
@@ -18593,11 +19284,11 @@ module.exports = {
               "Pharmaceutical Isolators": 1
             },
             features: {
-              integrity: [ -.12, -.15 ],
-              optmass: [ -.1, -.13 ],
+              integrity: [ -.15, -.15 ],
+              optmass: [ -.13, -.13 ],
               optmul: [ .33, .4 ],
-              power: [ .1, .12 ],
-              thermload: [ .5, .6 ]
+              power: [ .12, .12 ],
+              thermload: [ .6, .6 ]
             },
             uuid: "92514d80-4513-489e-b85f-1b7010b3ae0f"
           }
@@ -18615,7 +19306,7 @@ module.exports = {
             },
             features: {
               integrity: [ 0, .3 ],
-              mass: [ 0, .05 ],
+              mass: [ .05, .05 ],
               thermload: [ -.1, -.1 ]
             },
             uuid: "21503395-f165-4340-91c7-07d062895eae"
@@ -18627,7 +19318,7 @@ module.exports = {
             },
             features: {
               integrity: [ .3, .5 ],
-              mass: [ .05, .1 ],
+              mass: [ .1, .1 ],
               thermload: [ -.1, -.2 ]
             },
             uuid: "452e2359-5804-4de1-94bf-d16c9d512cc4"
@@ -18640,7 +19331,7 @@ module.exports = {
             },
             features: {
               integrity: [ .5, .7 ],
-              mass: [ .1, .15 ],
+              mass: [ .15, .15 ],
               thermload: [ -.2, -.3 ]
             },
             uuid: "ae1a71bb-e025-4268-aa7f-fd4063945beb"
@@ -18653,7 +19344,7 @@ module.exports = {
             },
             features: {
               integrity: [ .7, .9 ],
-              mass: [ .15, .2 ],
+              mass: [ .2, .2 ],
               thermload: [ -.3, -.4 ]
             },
             uuid: "4bc0b925-dd64-41da-a653-f15acf108f23"
@@ -18666,7 +19357,7 @@ module.exports = {
             },
             features: {
               integrity: [ .9, 1.1 ],
-              mass: [ .2, .25 ],
+              mass: [ .25, .25 ],
               thermload: [ -.4, -.5 ]
             },
             uuid: "88aef454-76f6-48a3-a66c-958e50c92e7c"
@@ -18684,7 +19375,7 @@ module.exports = {
               Sulphur: 1
             },
             features: {
-              optmass: [ 0, -.02 ],
+              optmass: [ -.02, -.02 ],
               optmul: [ 0, .08 ],
               thermload: [ 0, -.2 ]
             },
@@ -18696,10 +19387,10 @@ module.exports = {
               "Specialised Legacy Firmware": 1
             },
             features: {
-              integrity: [ 0, -.04 ],
-              optmass: [ -.02, -.04 ],
+              integrity: [ -.04, -.04 ],
+              optmass: [ -.04, -.04 ],
               optmul: [ .08, .13 ],
-              power: [ 0, .04 ],
+              power: [ .04, .04 ],
               thermload: [ -.2, -.3 ]
             },
             uuid: "5382eecb-c840-4613-99c1-9bcbdb8d7760"
@@ -18711,10 +19402,10 @@ module.exports = {
               "Unexpected Emission Data": 1
             },
             features: {
-              integrity: [ -.04, -.08 ],
-              optmass: [ -.04, -.06 ],
+              integrity: [ -.08, -.08 ],
+              optmass: [ -.06, -.06 ],
               optmul: [ .13, .18 ],
-              power: [ .04, .08 ],
+              power: [ .08, .08 ],
               thermload: [ -.3, -.4 ]
             },
             uuid: "0c58a5c8-0bf9-4a2c-baf0-b14228f236df"
@@ -18726,10 +19417,10 @@ module.exports = {
               "Modified Consumer Firmware": 1
             },
             features: {
-              integrity: [ -.08, -.12 ],
-              optmass: [ -.06, -.08 ],
+              integrity: [ -.12, -.12 ],
+              optmass: [ -.08, -.08 ],
               optmul: [ .18, .23 ],
-              power: [ .08, .12 ],
+              power: [ .12, .12 ],
               thermload: [ -.4, -.5 ]
             },
             uuid: "afb2b22e-ab30-4195-8bfe-ae81ea6067f3"
@@ -18741,10 +19432,10 @@ module.exports = {
               Tin: 1
             },
             features: {
-              integrity: [ -.12, -.16 ],
-              optmass: [ -.08, -.1 ],
+              integrity: [ -.16, -.16 ],
+              optmass: [ -.1, -.1 ],
               optmul: [ .23, .28 ],
-              power: [ .12, .16 ],
+              power: [ .16, .16 ],
               thermload: [ -.5, -.6 ]
             },
             uuid: "74e6e223-c709-4c91-88d5-c55f9dfdf722"
@@ -19044,7 +19735,7 @@ module.exports = {
               "Unusual Encrypted Files": 1
             },
             features: {
-              facinglimit: [ -.1, -.01 ],
+              facinglimit: [ -.01, -.01 ],
               mass: [ .1, .1 ],
               power: [ .1, .1 ],
               ranget: [ 0, .2 ]
@@ -20217,7 +20908,7 @@ module.exports = {
             },
             features: {
               power: [ .2, .2 ],
-              angle: [ -.12, -.15 ],
+              angle: [ -.15, -.15 ],
               range: [ .24, .48 ]
             },
             uuid: "c2160767-b03f-491e-9a45-31976fb78899"
@@ -21837,7 +22528,7 @@ module.exports = {
             },
             features: {
               power: [ .2, .2 ],
-              angle: [ -.12, -.15 ],
+              angle: [ -.15, -.15 ],
               range: [ .24, .48 ]
             },
             uuid: "9371ee9f-12a1-4859-9b97-e3c3c87ee0a0"
@@ -22175,7 +22866,7 @@ module.exports = {
             },
             features: {
               mass: [ .2, .2 ],
-              angle: [ 0, -.1 ],
+              angle: [ -.1, -.1 ],
               range: [ 0, .15 ]
             },
             uuid: "92c755ae-690b-442c-bacd-606575987f22"
@@ -22187,7 +22878,7 @@ module.exports = {
             },
             features: {
               mass: [ .4, .4 ],
-              angle: [ -.1, -.15 ],
+              angle: [ -.15, -.15 ],
               range: [ .15, .3 ]
             },
             uuid: "40167259-2960-4072-a135-cba93c87709d"
@@ -22200,7 +22891,7 @@ module.exports = {
             },
             features: {
               mass: [ .6, .6 ],
-              angle: [ -.15, -.2 ],
+              angle: [ -.2, -.2 ],
               range: [ .3, .45 ]
             },
             uuid: "6d422ca1-ebdd-4c87-b2b2-056e36c0cbfb"
@@ -22213,7 +22904,7 @@ module.exports = {
             },
             features: {
               mass: [ .8, .8 ],
-              angle: [ -.2, -.25 ],
+              angle: [ -.25, -.25 ],
               range: [ .45, .6 ]
             },
             uuid: "6b09d91f-919f-4a3a-9900-850b026ab01c"
@@ -22226,7 +22917,7 @@ module.exports = {
             },
             features: {
               mass: [ 1, 1 ],
-              angle: [ -.25, -.3 ],
+              angle: [ -.3, -.3 ],
               range: [ .6, .75 ]
             },
             uuid: "c055cafb-3e8a-4415-8e9b-cfa8be809b75"
@@ -22592,7 +23283,7 @@ module.exports = {
             },
             features: {
               power: [ .2, .2 ],
-              angle: [ -.12, -.15 ],
+              angle: [ -.15, -.15 ],
               range: [ .24, .48 ]
             },
             uuid: "16235231-561b-4efb-a9bc-dcacb18b5651"
@@ -24137,10 +24828,10 @@ module.exports = {
               Nickel: 1
             },
             features: {
-              clip: [ 0, -.03 ],
+              clip: [ -.03, -.03 ],
               damage: [ 0, .3 ],
-              distdraw: [ 0, .15 ],
-              thermload: [ 0, .03 ]
+              distdraw: [ .15, .15 ],
+              thermload: [ .03, .03 ]
             },
             uuid: "e917ebe3-d5f1-4016-b8a9-2c759e16a7d4"
           },
@@ -24150,10 +24841,10 @@ module.exports = {
               Nickel: 1
             },
             features: {
-              clip: [ -.03, -.06 ],
+              clip: [ -.06, -.06 ],
               damage: [ .3, .4 ],
-              distdraw: [ .15, .2 ],
-              thermload: [ .03, .06 ]
+              distdraw: [ .2, .2 ],
+              thermload: [ .06, .06 ]
             },
             uuid: "f5921fc1-fb10-4d2f-8e0a-cd8d8e9e3a84"
           },
@@ -24164,10 +24855,10 @@ module.exports = {
               Nickel: 1
             },
             features: {
-              clip: [ -.06, -.09 ],
+              clip: [ -.09, -.09 ],
               damage: [ .4, .5 ],
-              distdraw: [ .2, .25 ],
-              thermload: [ .06, .09 ]
+              distdraw: [ .25, .25 ],
+              thermload: [ .09, .09 ]
             },
             uuid: "4389883f-c2b3-4487-9b1a-b668a761057a"
           },
@@ -24178,10 +24869,10 @@ module.exports = {
               Zinc: 1
             },
             features: {
-              clip: [ -.09, -.12 ],
+              clip: [ -.12, -.12 ],
               damage: [ .5, .6 ],
-              distdraw: [ .25, .3 ],
-              thermload: [ .09, .12 ]
+              distdraw: [ .3, .3 ],
+              thermload: [ .12, .12 ]
             },
             uuid: "25ec26dd-63b8-4e83-9a6e-86e5b80c4771"
           },
@@ -24192,10 +24883,10 @@ module.exports = {
               Zirconium: 1
             },
             features: {
-              clip: [ -.12, -.15 ],
+              clip: [ -.15, -.15 ],
               damage: [ .6, .7 ],
-              distdraw: [ .3, .35 ],
-              thermload: [ .12, .15 ]
+              distdraw: [ .35, .35 ],
+              thermload: [ .15, .15 ]
             },
             uuid: "4dcf6bdc-bcff-448a-92a0-7612de548db7"
           }
@@ -24462,7 +25153,7 @@ module.exports = {
         name: "burstrof",
         type: "numeric",
         method: "overwrite",
-        higherbetter: false
+        higherbetter: true
       },
       clip: {
         id: 4,
@@ -24672,7 +25363,7 @@ module.exports = {
         name: "rof",
         type: "percentage",
         method: "multiplicative",
-        higherbetter: false
+        higherbetter: true
       },
       angle: {
         id: 46,
@@ -28846,6 +29537,22 @@ module.exports = {
           }
         },
         modifications: [ "integrity", "mass", "power", "angle", "range", "scantime" ]
+      },
+      tbem: {
+        blueprints: {},
+        modifications: []
+      },
+      tbrfl: {
+        blueprints: {},
+        modifications: []
+      },
+      dtl: {
+        blueprints: {},
+        modifications: []
+      },
+      mahr: {
+        blueprints: {},
+        modifications: []
       }
     },
     specials: {
diff --git a/dist/index.json b/dist/index.json
index a7e6e2b..4d3a9ac 100644
--- a/dist/index.json
+++ b/dist/index.json
@@ -340,7 +340,7 @@
 				"hardness": 65,
 				"hullMass": 450,
 				"masslock": 13,
-				"pipSpeed": 0.0875,
+				"pipSpeed": 0.088709677419355,
 				"pitch": 32,
 				"roll": 90,
 				"yaw": 16,
@@ -515,6 +515,196 @@
 				]
 			}
 		},
+		"alliance_crusader": {
+			"edID": 128816581,
+			"eddbID": 0,
+			"properties": {
+				"name": "Alliance Crusader",
+				"manufacturer": "Lakon",
+				"class": 2,
+				"hullCost": 22866341,
+				"speed": 180,
+				"boost": 300,
+				"boostEnergy": 19,
+				"baseShieldStrength": 200,
+				"baseArmour": 300,
+				"hardness": 65,
+				"hullMass": 500,
+				"masslock": 13,
+				"fighterHangars": true,
+				"pipSpeed": 0.15833333333333,
+				"pitch": 32,
+				"roll": 80,
+				"yaw": 16,
+				"crew": 3
+			},
+			"retailCost": 19382252,
+			"requirements": {
+				"horizons": true
+			},
+			"bulkheads": [
+				{
+					"id": "CI",
+					"edID": 128816583,
+					"eddbID": 1640,
+					"grp": "bh",
+					"cost": 0,
+					"mass": 0,
+					"explres": -0.4,
+					"kinres": -0.2,
+					"thermres": 0,
+					"hullboost": 0.8
+				},
+				{
+					"id": "CJ",
+					"edID": 128816584,
+					"eddbID": 1641,
+					"grp": "bh",
+					"cost": 6803170,
+					"mass": 40,
+					"explres": -0.4,
+					"kinres": -0.2,
+					"thermres": 0,
+					"hullboost": 1.52
+				},
+				{
+					"id": "CK",
+					"edID": 128816585,
+					"eddbID": 1642,
+					"grp": "bh",
+					"cost": 15307134,
+					"mass": 78,
+					"explres": -0.4,
+					"kinres": -0.2,
+					"thermres": 0,
+					"hullboost": 2.5
+				},
+				{
+					"id": "CL",
+					"edID": 128816586,
+					"eddbID": 1643,
+					"grp": "bh",
+					"cost": 36175859,
+					"mass": 78,
+					"explres": -0.5,
+					"kinres": -0.75,
+					"thermres": 0.5,
+					"hullboost": 2.5
+				},
+				{
+					"id": "CM",
+					"edID": 128816587,
+					"eddbID": 1644,
+					"grp": "bh",
+					"cost": 40087682,
+					"mass": 78,
+					"explres": 0.2,
+					"kinres": 0.25,
+					"thermres": -0.4,
+					"hullboost": 2.5
+				}
+			],
+			"slots": {
+				"standard": [
+					6,
+					6,
+					5,
+					5,
+					6,
+					4,
+					4
+				],
+				"hardpoints": [
+					3,
+					2,
+					2,
+					1,
+					1,
+					1,
+					0,
+					0,
+					0,
+					0
+				],
+				"internal": [
+					6,
+					5,
+					3,
+					3,
+					2,
+					2,
+					{
+						"class": 4,
+						"name": "Military",
+						"eligible": {
+							"hr": 1,
+							"scb": 1,
+							"mrp": 1,
+							"gsrp": 1,
+							"gmrp": 1,
+							"ghrp": 1
+						}
+					},
+					{
+						"class": 4,
+						"name": "Military",
+						"eligible": {
+							"hr": 1,
+							"scb": 1,
+							"mrp": 1,
+							"gsrp": 1,
+							"gmrp": 1,
+							"ghrp": 1
+						}
+					},
+					{
+						"class": 4,
+						"name": "Military",
+						"eligible": {
+							"hr": 1,
+							"scb": 1,
+							"mrp": 1,
+							"gsrp": 1,
+							"gmrp": 1,
+							"ghrp": 1
+						}
+					}
+				]
+			},
+			"defaults": {
+				"standard": [
+					"6E",
+					"6E",
+					"5E",
+					"5E",
+					"6E",
+					"4E",
+					"4C"
+				],
+				"hardpoints": [
+					17,
+					0,
+					17,
+					0,
+					0,
+					0,
+					0,
+					0,
+					0,
+					0
+				],
+				"internal": [
+					"04",
+					"4e",
+					"02",
+					"",
+					"2h",
+					"",
+					"",
+					""
+				]
+			}
+		},
 		"anaconda": {
 			"edID": 128049363,
 			"eddbID": 2,
@@ -13247,6 +13437,68 @@
 					"shotspeed": 1200,
 					"thermload": 5.8,
 					"symbol": "Hpt_Guardian_PlasmaLauncher_Turret_Medium"
+				},
+				{
+					"rating": "C",
+					"class": 3,
+					"grp": "gpc",
+					"id": "xu",
+					"eddbID": 0,
+					"edID": 128834783,
+					"mount": "F",
+					"cost": 1423301,
+					"mass": 8,
+					"integrity": 51,
+					"power": 3.1,
+					"damage": 3.4,
+					"distdraw": 2.42,
+					"thermload": 6.2,
+					"piercing": 95,
+					"range": 3000,
+					"shotspeed": 1200,
+					"rof": 5,
+					"clip": 15,
+					"ammo": 200,
+					"reload": 3,
+					"breachdmg": 1,
+					"breachmin": 0.5,
+					"breachmax": 0.8,
+					"symbol": "Hpt_Guardian_PlasmaLauncher_Fixed_Large",
+					"damagedist": {
+						"A": 1
+					},
+					"falloff": 1000
+				},
+				{
+					"ammo": 200,
+					"breachdmg": 0.8,
+					"breachmax": 0.8,
+					"breachmin": 0.5,
+					"class": 3,
+					"clip": 15,
+					"cost": 5495200,
+					"damage": 3.3,
+					"damagedist": {
+						"A": 1
+					},
+					"distdraw": 2.6,
+					"edID": 128834784,
+					"eddbID": 0,
+					"falloff": 1000,
+					"grp": "gpc",
+					"id": "xv",
+					"integrity": 51,
+					"mass": 8,
+					"mount": "T",
+					"piercing": 95,
+					"power": 2.53,
+					"range": 3000,
+					"rating": "D",
+					"reload": 3,
+					"rof": 5,
+					"shotspeed": 1200,
+					"thermload": 6.4,
+					"symbol": "Hpt_Guardian_PlasmaLauncher_Turret_Large"
 				}
 			],
 			"ggc": [
@@ -13328,6 +13580,39 @@
 				}
 			],
 			"tbsc": [
+				{
+					"rating": "C",
+					"class": 3,
+					"grp": "tbsc",
+					"id": "yG",
+					"eddbID": 0,
+					"edID": 128834780,
+					"mount": "F",
+					"cost": 1015750,
+					"mass": 8,
+					"integrity": 64,
+					"power": 0.89,
+					"damage": 18.1,
+					"distdraw": 0.92,
+					"thermload": 2.7,
+					"piercing": 60,
+					"range": 3000,
+					"shotspeed": 1200,
+					"rof": 10,
+					"roundspershot": 0,
+					"clip": 16,
+					"ammo": 240,
+					"reload": 6,
+					"breachdmg": 12.7,
+					"breachmin": 0.4,
+					"breachmax": 0.8,
+					"jitter": 0,
+					"symbol": "Hpt_PlasmaShockCannon_Fixed_Large",
+					"damagedist": {
+						"K": 1
+					},
+					"falloff": 2500
+				},
 				{
 					"rating": "C",
 					"class": 3,
@@ -13347,17 +13632,48 @@
 					"falloff": 2500,
 					"integrity": 64,
 					"mount": "G",
-					"piercing": 95,
+					"piercing": 60,
 					"power": 0.89,
 					"range": 3000,
 					"rof": 10,
 					"shotspeed": 1200,
 					"thermload": 3.1,
-					"cost": 1015750,
+					"cost": 2249050,
 					"reload": 6,
 					"id": "2N",
-					"edID": 128834780,
-					"symbol": "Hpt_PlasmaShockCannon_Fixed_Large"
+					"edID": 128834781,
+					"symbol": "Hpt_PlasmaShockCannon_Gimbal_Large"
+				},
+				{
+					"rating": "D",
+					"class": 3,
+					"grp": "tbsc",
+					"symbol": "Hpt_PlasmaShockCannon_Turret_Large",
+					"id": "xz",
+					"eddbID": 0,
+					"edID": 128834782,
+					"mount": "T",
+					"cost": 6050201,
+					"mass": 8,
+					"integrity": 64,
+					"power": 0.64,
+					"damage": 12.32,
+					"distdraw": 0.79,
+					"thermload": 2.2,
+					"piercing": 60,
+					"range": 3000,
+					"shotspeed": 1200,
+					"rof": 10,
+					"clip": 16,
+					"ammo": 240,
+					"reload": 6,
+					"breachdmg": 8.6,
+					"breachmin": 0.4,
+					"breachmax": 0.8,
+					"damagedist": {
+						"K": 1
+					},
+					"falloff": 2500
 				},
 				{
 					"rating": "D",
@@ -13389,6 +13705,161 @@
 					"id": "2O",
 					"edID": 128834003,
 					"symbol": "Hpt_PlasmaShockCannon_Gimbal_Medium"
+				},
+				{
+					"grp": "tbsc",
+					"symbol": "Hpt_PlasmaShockCannon_Fixed_Medium",
+					"id": "y0",
+					"eddbID": 0,
+					"edID": 128834002,
+					"class": 2,
+					"rating": "D",
+					"mount": "F",
+					"cost": 367501,
+					"mass": 4,
+					"integrity": 51,
+					"power": 0.57,
+					"damage": 13,
+					"distdraw": 0.47,
+					"thermload": 1.8,
+					"piercing": 40,
+					"range": 3000,
+					"shotspeed": 1200,
+					"rof": 10,
+					"clip": 16,
+					"ammo": 240,
+					"reload": 6,
+					"breachdmg": 9.1,
+					"breachmin": 0.4,
+					"breachmax": 0.6,
+					"damagedist": {
+						"K": 1
+					},
+					"falloff": 2500
+				},
+				{
+					"rating": "E",
+					"class": 2,
+					"grp": "tbsc",
+					"id": "0",
+					"eddbID": 0,
+					"edID": 128834004,
+					"mount": "T",
+					"cost": 1359200,
+					"mass": 4,
+					"integrity": 51,
+					"power": 0.5,
+					"damage": 9,
+					"distdraw": 0.39,
+					"thermload": 1.2,
+					"piercing": 40,
+					"range": 3000,
+					"shotspeed": 1200,
+					"rof": 10,
+					"roundspershot": 0,
+					"clip": 16,
+					"ammo": 240,
+					"reload": 6,
+					"breachdmg": 6.3,
+					"breachmin": 0.4,
+					"breachmax": 0.8,
+					"jitter": 0,
+					"symbol": "Hpt_PlasmaShockCannon_Turret_Medium",
+					"damagedist": {
+						"K": 1
+					},
+					"falloff": 2500
+				}
+			],
+			"tbem": [
+				{
+					"rating": "B",
+					"class": 2,
+					"grp": "tbem",
+					"id": "xt",
+					"eddbID": 0,
+					"edID": 128833995,
+					"mount": "F",
+					"cost": 480501,
+					"mass": 4,
+					"integrity": 51,
+					"power": 1.2,
+					"damage": 5,
+					"distdraw": 0.08,
+					"thermload": 1.5,
+					"piercing": 60,
+					"shotspeed": 750,
+					"rof": 0.5,
+					"clip": 8,
+					"ammo": 64,
+					"reload": 5,
+					"breachdmg": 0,
+					"breachmin": 0.8,
+					"breachmax": 1,
+					"symbol": "Hpt_CausticMissile_Fixed_Medium",
+					"damagedist": {
+						"E": 1
+					}
+				}
+			],
+			"tbrfl": [
+				{
+					"rating": "B",
+					"class": 2,
+					"grp": "tbrfl",
+					"id": "xy",
+					"eddbID": 0,
+					"edID": 128833996,
+					"mount": "F",
+					"cost": 353761,
+					"mass": 4,
+					"integrity": 51,
+					"power": 1.2,
+					"damage": 13,
+					"distdraw": 0.24,
+					"thermload": 3.6,
+					"piercing": 80,
+					"shotspeed": 550,
+					"rof": 0.5,
+					"clip": 1,
+					"ammo": 72,
+					"reload": 2,
+					"breachdmg": 6.5,
+					"breachmin": 1,
+					"breachmax": 1,
+					"symbol": "Hpt_FlechetteLauncher_Fixed_Medium",
+					"damagedist": {
+						"K": 1
+					}
+				},
+				{
+					"rating": "B",
+					"class": 2,
+					"grp": "tbrfl",
+					"id": "yF",
+					"eddbID": 0,
+					"edID": 128833997,
+					"mount": "T",
+					"cost": 1279200,
+					"mass": 4,
+					"integrity": 51,
+					"power": 1.2,
+					"damage": 13,
+					"distdraw": 0.24,
+					"thermload": 3.6,
+					"piercing": 70,
+					"shotspeed": 550,
+					"rof": 0.5,
+					"clip": 1,
+					"ammo": 72,
+					"reload": 2,
+					"breachdmg": 6.5,
+					"breachmin": 1,
+					"breachmax": 1,
+					"symbol": "Hpt_FlechetteLauncher_Turret_Medium",
+					"damagedist": {
+						"K": 1
+					}
 				}
 			],
 			"gsc": [
@@ -13425,6 +13896,39 @@
 					},
 					"falloff": 1700
 				},
+				{
+					"rating": "D",
+					"class": 2,
+					"grp": "gsc",
+					"id": "xw",
+					"eddbID": 0,
+					"edID": 0,
+					"mount": "T",
+					"cost": 1767001,
+					"mass": 4,
+					"integrity": 42,
+					"power": 1.16,
+					"damage": 2.4,
+					"distdraw": 0.57,
+					"thermload": 1.1,
+					"piercing": 45,
+					"range": 1700,
+					"shotspeed": 1133,
+					"rof": 1.7,
+					"roundspershot": 12,
+					"clip": 5,
+					"ammo": 180,
+					"reload": 5,
+					"breachdmg": 1.9,
+					"breachmin": 0.6,
+					"breachmax": 0.8,
+					"jitter": 5,
+					"symbol": "Hpt_Guardian_ShardCannon_Turret_Medium",
+					"damagedist": {
+						"T": 1
+					},
+					"falloff": 1700
+				},
 				{
 					"rating": "C",
 					"class": 3,
@@ -13457,6 +13961,39 @@
 						"T": 1
 					},
 					"falloff": 1700
+				},
+				{
+					"rating": "D",
+					"class": 3,
+					"grp": "gsc",
+					"id": "xx",
+					"eddbID": 0,
+					"edID": 128834779,
+					"mount": "T",
+					"cost": 5865026,
+					"mass": 8,
+					"integrity": 51,
+					"power": 1.39,
+					"damage": 3.4,
+					"distdraw": 1.2,
+					"thermload": 2,
+					"piercing": 60,
+					"range": 1700,
+					"shotspeed": 1133,
+					"rof": 1.7,
+					"clip": 5,
+					"ammo": 180,
+					"roundspershot": 12,
+					"reload": 5,
+					"breachdmg": 2.7,
+					"breachmin": 0.6,
+					"breachmax": 0.8,
+					"jitter": 5,
+					"symbol": "Hpt_Guardian_ShardCannon_Turret_Large",
+					"damagedist": {
+						"T": 1
+					},
+					"falloff": 1700
 				}
 			]
 		},
@@ -14354,7 +14891,7 @@
 					"cargo": 16,
 					"class": 4,
 					"cost": 94330,
-					"edID": 128681992,
+					"edID": 128833944,
 					"eddbID": 1552,
 					"grp": "cr",
 					"id": "0W",
@@ -14680,6 +15217,64 @@
 					"symbol": "Int_DockingComputer_Standard"
 				}
 			],
+			"dtl": [
+				{
+					"class": 1,
+					"cost": 3600,
+					"edID": 128793941,
+					"eddbID": 0,
+					"grp": "dtl",
+					"id": "y1",
+					"mass": 1.3,
+					"maximum": 1,
+					"power": 0.18,
+					"range": 0.6,
+					"rating": "E",
+					"symbol": "Int_DroneControl_Decontamination_Size1_Class1"
+				},
+				{
+					"class": 3,
+					"cost": 16201,
+					"edID": 128793942,
+					"eddbID": 0,
+					"grp": "dtl",
+					"id": "y2",
+					"mass": 2,
+					"maximum": 2,
+					"power": 0.2,
+					"range": 0.88,
+					"rating": "E",
+					"symbol": "Int_DroneControl_Decontamination_Size3_Class1"
+				},
+				{
+					"class": 5,
+					"cost": 145801,
+					"edID": 128793943,
+					"eddbID": 0,
+					"grp": "dtl",
+					"id": "y3",
+					"mass": 20,
+					"maximum": 3,
+					"power": 0.5,
+					"range": 1.3,
+					"rating": "E",
+					"symbol": "Int_DroneControl_Decontamination_Size5_Class1"
+				},
+				{
+					"class": 7,
+					"cost": 1312201,
+					"edID": 128793944,
+					"eddbID": 0,
+					"grp": "dtl",
+					"id": "y4",
+					"mass": 128,
+					"maximum": 4,
+					"power": 0.97,
+					"range": 2.04,
+					"rating": "E",
+					"symbol": "Int_DroneControl_Decontamination_Size7_Class1"
+				}
+			],
 			"fh": [
 				{
 					"bays": 1,
@@ -16360,6 +16955,168 @@
 					"symbol": "Int_HullReinforcement_Size5_Class2"
 				}
 			],
+			"mahr": [
+				{
+					"hullreinforcement": 72,
+					"class": 1,
+					"cost": 7501,
+					"edID": 128793117,
+					"eddbID": 0,
+					"explres": 0,
+					"grp": "mahr",
+					"id": "y5",
+					"kinres": 0,
+					"mass": 2,
+					"rating": "E",
+					"thermres": 0,
+					"causres": 0.03,
+					"symbol": "Int_MetaAlloyHullReinforcement_Size1_Class1"
+				},
+				{
+					"hullreinforcement": 99,
+					"class": 1,
+					"cost": 22501,
+					"edID": 128793118,
+					"eddbID": 0,
+					"explres": 0,
+					"grp": "mahr",
+					"id": "y6",
+					"kinres": 0,
+					"mass": 2,
+					"rating": "D",
+					"thermres": 0,
+					"causres": 0.03,
+					"symbol": "Int_MetaAlloyHullReinforcement_Size1_Class2"
+				},
+				{
+					"hullreinforcement": 135,
+					"class": 2,
+					"cost": 18000,
+					"edID": 128793119,
+					"eddbID": 0,
+					"explres": 0,
+					"grp": "mahr",
+					"id": "y7",
+					"kinres": 0,
+					"mass": 4,
+					"rating": "E",
+					"thermres": 0,
+					"causres": 0.03,
+					"symbol": "Int_MetaAlloyHullReinforcement_Size2_Class1"
+				},
+				{
+					"hullreinforcement": 171,
+					"class": 2,
+					"cost": 54000,
+					"edID": 128793120,
+					"eddbID": 0,
+					"explres": 0,
+					"grp": "mahr",
+					"id": "y8",
+					"kinres": 0,
+					"mass": 2,
+					"rating": "D",
+					"thermres": 0,
+					"causres": 0.03,
+					"symbol": "Int_MetaAlloyHullReinforcement_Size2_Class2"
+				},
+				{
+					"hullreinforcement": 207,
+					"class": 3,
+					"cost": 42000,
+					"edID": 128793121,
+					"eddbID": 0,
+					"explres": 0,
+					"grp": "mahr",
+					"id": "y9",
+					"kinres": 0,
+					"mass": 8,
+					"rating": "E",
+					"thermres": 0,
+					"causres": 0.03,
+					"symbol": "Int_MetaAlloyHullReinforcement_Size3_Class1"
+				},
+				{
+					"hullreinforcement": 234,
+					"class": 3,
+					"cost": 126000,
+					"edID": 128793122,
+					"eddbID": 0,
+					"explres": 0,
+					"grp": "mahr",
+					"id": "yA",
+					"kinres": 0,
+					"mass": 4,
+					"rating": "D",
+					"thermres": 0,
+					"causres": 0.03,
+					"symbol": "Int_MetaAlloyHullReinforcement_Size3_Class2"
+				},
+				{
+					"hullreinforcement": 270,
+					"class": 4,
+					"cost": 97501,
+					"edID": 128793123,
+					"eddbID": 0,
+					"explres": 0,
+					"grp": "mahr",
+					"id": "yB",
+					"kinres": 0,
+					"mass": 16,
+					"rating": "E",
+					"thermres": 0,
+					"causres": 0.03,
+					"symbol": "Int_MetaAlloyHullReinforcement_Size4_Class1"
+				},
+				{
+					"hullreinforcement": 297,
+					"class": 4,
+					"cost": 292501,
+					"edID": 128793124,
+					"eddbID": 0,
+					"explres": 0,
+					"grp": "mahr",
+					"id": "yC",
+					"kinres": 0,
+					"mass": 8,
+					"rating": "D",
+					"thermres": 0,
+					"causres": 0.03,
+					"symbol": "Int_MetaAlloyHullReinforcement_Size4_Class2"
+				},
+				{
+					"hullreinforcement": 324,
+					"class": 5,
+					"cost": 225001,
+					"edID": 128793125,
+					"eddbID": 0,
+					"explres": 0,
+					"grp": "mahr",
+					"id": "yD",
+					"kinres": 0,
+					"mass": 32,
+					"rating": "E",
+					"thermres": 0,
+					"causres": 0.03,
+					"symbol": "Int_MetaAlloyHullReinforcement_Size5_Class1"
+				},
+				{
+					"hullreinforcement": 351,
+					"class": 5,
+					"cost": 675001,
+					"edID": 128793126,
+					"eddbID": 0,
+					"explres": 0,
+					"grp": "mahr",
+					"id": "yE",
+					"kinres": 0,
+					"mass": 16,
+					"rating": "D",
+					"thermres": 0,
+					"causres": 0.03,
+					"symbol": "Int_MetaAlloyHullReinforcement_Size5_Class2"
+				}
+			],
 			"mrp": [
 				{
 					"class": 1,
@@ -19682,6 +20439,24 @@
 					"symbol": "Int_DroneControl_Recon_Size7_Class1"
 				}
 			],
+			"rsl": [
+				{
+					"rating": "E",
+					"class": 1,
+					"grp": "rsl",
+					"id": "0",
+					"eddbID": 1617,
+					"edID": 128793116,
+					"cost": 1749600,
+					"mass": 1.3,
+					"maximum": 1,
+					"power": 0.4,
+					"range": 2000,
+					"symbol": "Int_DroneControl_UnkVesselResearch",
+					"time": 300,
+					"integrity": 20
+				}
+			],
 			"gsrp": [
 				{
 					"shieldaddition": 44,
@@ -19906,6 +20681,7 @@
 					"eddbID": 0,
 					"power": 0.56,
 					"hullreinforcement": 138,
+					"causres": 0.05,
 					"thermres": 0.02,
 					"cost": 30000,
 					"symbol": "Int_GuardianHullReinforcement_Size1_Class2",
@@ -19920,6 +20696,7 @@
 					"eddbID": 0,
 					"power": 0.45,
 					"hullreinforcement": 100,
+					"causres": 0.05,
 					"thermres": 0.02,
 					"cost": 10000,
 					"symbol": "Int_GuardianHullReinforcement_Size1_Class1",
@@ -19934,6 +20711,7 @@
 					"eddbID": 0,
 					"power": 0.79,
 					"hullreinforcement": 238,
+					"causres": 0.05,
 					"thermres": 0.02,
 					"cost": 72000,
 					"symbol": "Int_GuardianHullReinforcement_Size2_Class2",
@@ -19948,6 +20726,7 @@
 					"eddbID": 0,
 					"power": 0.68,
 					"hullreinforcement": 188,
+					"causres": 0.05,
 					"thermres": 0.02,
 					"cost": 24000,
 					"symbol": "Int_GuardianHullReinforcement_Size2_Class1",
@@ -19962,6 +20741,7 @@
 					"eddbID": 0,
 					"power": 1.01,
 					"hullreinforcement": 325,
+					"causres": 0.05,
 					"thermres": 0.02,
 					"cost": 172800,
 					"symbol": "Int_GuardianHullReinforcement_Size3_Class2",
@@ -19976,6 +20756,7 @@
 					"eddbID": 0,
 					"power": 0.9,
 					"hullreinforcement": 288,
+					"causres": 0.05,
 					"thermres": 0.02,
 					"cost": 57600,
 					"symbol": "Int_GuardianHullReinforcement_Size3_Class1",
@@ -19989,6 +20770,7 @@
 					"eddbID": 0,
 					"power": 1.24,
 					"hullreinforcement": 413,
+					"causres": 0.05,
 					"thermres": 0.02,
 					"cost": 414720,
 					"id": "2R",
@@ -20003,6 +20785,7 @@
 					"eddbID": 0,
 					"power": 1.13,
 					"hullreinforcement": 375,
+					"causres": 0.05,
 					"thermres": 0.02,
 					"cost": 138240,
 					"id": "2B",
@@ -20017,6 +20800,7 @@
 					"eddbID": 0,
 					"power": 1.46,
 					"hullreinforcement": 488,
+					"causres": 0.05,
 					"thermres": 0.02,
 					"cost": 995330,
 					"id": "2C",
@@ -20031,6 +20815,7 @@
 					"eddbID": 0,
 					"power": 1.35,
 					"hullreinforcement": 450,
+					"causres": 0.05,
 					"thermres": 0.02,
 					"cost": 331778,
 					"id": "2D",
@@ -22144,11 +22929,11 @@
 						},
 						"features": {
 							"integrity": [
-								0,
+								-0.03,
 								-0.03
 							],
 							"optmass": [
-								0,
+								-0.03,
 								-0.03
 							],
 							"optmul": [
@@ -22156,11 +22941,11 @@
 								0.12
 							],
 							"power": [
-								0,
+								0.04,
 								0.04
 							],
 							"thermload": [
-								0,
+								0.2,
 								0.2
 							]
 						},
@@ -22173,11 +22958,11 @@
 						},
 						"features": {
 							"integrity": [
-								-0.03,
+								-0.06,
 								-0.06
 							],
 							"optmass": [
-								-0.03,
+								-0.05,
 								-0.05
 							],
 							"optmul": [
@@ -22185,11 +22970,11 @@
 								0.19
 							],
 							"power": [
-								0.04,
+								0.06,
 								0.06
 							],
 							"thermload": [
-								0.2,
+								0.3,
 								0.3
 							]
 						},
@@ -22203,11 +22988,11 @@
 						},
 						"features": {
 							"integrity": [
-								-0.06,
+								-0.09,
 								-0.09
 							],
 							"optmass": [
-								-0.05,
+								-0.08,
 								-0.08
 							],
 							"optmul": [
@@ -22215,11 +23000,11 @@
 								0.26
 							],
 							"power": [
-								0.06,
+								0.08,
 								0.08
 							],
 							"thermload": [
-								0.3,
+								0.4,
 								0.4
 							]
 						},
@@ -22233,11 +23018,11 @@
 						},
 						"features": {
 							"integrity": [
-								-0.09,
+								-0.12,
 								-0.12
 							],
 							"optmass": [
-								-0.08,
+								-0.1,
 								-0.1
 							],
 							"optmul": [
@@ -22245,11 +23030,11 @@
 								0.33
 							],
 							"power": [
-								0.08,
+								0.1,
 								0.1
 							],
 							"thermload": [
-								0.4,
+								0.5,
 								0.5
 							]
 						},
@@ -22263,11 +23048,11 @@
 						},
 						"features": {
 							"integrity": [
-								-0.12,
+								-0.15,
 								-0.15
 							],
 							"optmass": [
-								-0.1,
+								-0.13,
 								-0.13
 							],
 							"optmul": [
@@ -22275,11 +23060,11 @@
 								0.4
 							],
 							"power": [
-								0.1,
+								0.12,
 								0.12
 							],
 							"thermload": [
-								0.5,
+								0.6,
 								0.6
 							]
 						},
@@ -22306,7 +23091,7 @@
 								0.3
 							],
 							"mass": [
-								0,
+								0.05,
 								0.05
 							],
 							"thermload": [
@@ -22327,7 +23112,7 @@
 								0.5
 							],
 							"mass": [
-								0.05,
+								0.1,
 								0.1
 							],
 							"thermload": [
@@ -22349,7 +23134,7 @@
 								0.7
 							],
 							"mass": [
-								0.1,
+								0.15,
 								0.15
 							],
 							"thermload": [
@@ -22371,7 +23156,7 @@
 								0.9
 							],
 							"mass": [
-								0.15,
+								0.2,
 								0.2
 							],
 							"thermload": [
@@ -22393,7 +23178,7 @@
 								1.1
 							],
 							"mass": [
-								0.2,
+								0.25,
 								0.25
 							],
 							"thermload": [
@@ -22420,7 +23205,7 @@
 						},
 						"features": {
 							"optmass": [
-								0,
+								-0.02,
 								-0.02
 							],
 							"optmul": [
@@ -22441,11 +23226,11 @@
 						},
 						"features": {
 							"integrity": [
-								0,
+								-0.04,
 								-0.04
 							],
 							"optmass": [
-								-0.02,
+								-0.04,
 								-0.04
 							],
 							"optmul": [
@@ -22453,7 +23238,7 @@
 								0.13
 							],
 							"power": [
-								0,
+								0.04,
 								0.04
 							],
 							"thermload": [
@@ -22471,11 +23256,11 @@
 						},
 						"features": {
 							"integrity": [
-								-0.04,
+								-0.08,
 								-0.08
 							],
 							"optmass": [
-								-0.04,
+								-0.06,
 								-0.06
 							],
 							"optmul": [
@@ -22483,7 +23268,7 @@
 								0.18
 							],
 							"power": [
-								0.04,
+								0.08,
 								0.08
 							],
 							"thermload": [
@@ -22501,11 +23286,11 @@
 						},
 						"features": {
 							"integrity": [
-								-0.08,
+								-0.12,
 								-0.12
 							],
 							"optmass": [
-								-0.06,
+								-0.08,
 								-0.08
 							],
 							"optmul": [
@@ -22513,7 +23298,7 @@
 								0.23
 							],
 							"power": [
-								0.08,
+								0.12,
 								0.12
 							],
 							"thermload": [
@@ -22531,11 +23316,11 @@
 						},
 						"features": {
 							"integrity": [
-								-0.12,
+								-0.16,
 								-0.16
 							],
 							"optmass": [
-								-0.08,
+								-0.1,
 								-0.1
 							],
 							"optmul": [
@@ -22543,7 +23328,7 @@
 								0.28
 							],
 							"power": [
-								0.12,
+								0.16,
 								0.16
 							],
 							"thermload": [
@@ -23080,7 +23865,7 @@
 						},
 						"features": {
 							"facinglimit": [
-								-0.1,
+								-0.01,
 								-0.01
 							],
 							"mass": [
@@ -24994,7 +25779,7 @@
 								0.2
 							],
 							"angle": [
-								-0.12,
+								-0.15,
 								-0.15
 							],
 							"range": [
@@ -27773,7 +28558,7 @@
 								0.2
 							],
 							"angle": [
-								-0.12,
+								-0.15,
 								-0.15
 							],
 							"range": [
@@ -28341,7 +29126,7 @@
 								0.2
 							],
 							"angle": [
-								0,
+								-0.1,
 								-0.1
 							],
 							"range": [
@@ -28362,7 +29147,7 @@
 								0.4
 							],
 							"angle": [
-								-0.1,
+								-0.15,
 								-0.15
 							],
 							"range": [
@@ -28384,7 +29169,7 @@
 								0.6
 							],
 							"angle": [
-								-0.15,
+								-0.2,
 								-0.2
 							],
 							"range": [
@@ -28406,7 +29191,7 @@
 								0.8
 							],
 							"angle": [
-								-0.2,
+								-0.25,
 								-0.25
 							],
 							"range": [
@@ -28428,7 +29213,7 @@
 								1
 							],
 							"angle": [
-								-0.25,
+								-0.3,
 								-0.3
 							],
 							"range": [
@@ -29008,7 +29793,7 @@
 								0.2
 							],
 							"angle": [
-								-0.12,
+								-0.15,
 								-0.15
 							],
 							"range": [
@@ -31760,7 +32545,7 @@
 						},
 						"features": {
 							"clip": [
-								0,
+								-0.03,
 								-0.03
 							],
 							"damage": [
@@ -31768,11 +32553,11 @@
 								0.3
 							],
 							"distdraw": [
-								0,
+								0.15,
 								0.15
 							],
 							"thermload": [
-								0,
+								0.03,
 								0.03
 							]
 						},
@@ -31785,7 +32570,7 @@
 						},
 						"features": {
 							"clip": [
-								-0.03,
+								-0.06,
 								-0.06
 							],
 							"damage": [
@@ -31793,11 +32578,11 @@
 								0.4
 							],
 							"distdraw": [
-								0.15,
+								0.2,
 								0.2
 							],
 							"thermload": [
-								0.03,
+								0.06,
 								0.06
 							]
 						},
@@ -31811,7 +32596,7 @@
 						},
 						"features": {
 							"clip": [
-								-0.06,
+								-0.09,
 								-0.09
 							],
 							"damage": [
@@ -31819,11 +32604,11 @@
 								0.5
 							],
 							"distdraw": [
-								0.2,
+								0.25,
 								0.25
 							],
 							"thermload": [
-								0.06,
+								0.09,
 								0.09
 							]
 						},
@@ -31837,7 +32622,7 @@
 						},
 						"features": {
 							"clip": [
-								-0.09,
+								-0.12,
 								-0.12
 							],
 							"damage": [
@@ -31845,11 +32630,11 @@
 								0.6
 							],
 							"distdraw": [
-								0.25,
+								0.3,
 								0.3
 							],
 							"thermload": [
-								0.09,
+								0.12,
 								0.12
 							]
 						},
@@ -31863,7 +32648,7 @@
 						},
 						"features": {
 							"clip": [
-								-0.12,
+								-0.15,
 								-0.15
 							],
 							"damage": [
@@ -31871,11 +32656,11 @@
 								0.7
 							],
 							"distdraw": [
-								0.3,
+								0.35,
 								0.35
 							],
 							"thermload": [
-								0.12,
+								0.15,
 								0.15
 							]
 						},
@@ -32326,7 +33111,7 @@
 				"name": "burstrof",
 				"type": "numeric",
 				"method": "overwrite",
-				"higherbetter": false
+				"higherbetter": true
 			},
 			"clip": {
 				"id": 4,
@@ -32536,7 +33321,7 @@
 				"name": "rof",
 				"type": "percentage",
 				"method": "multiplicative",
-				"higherbetter": false
+				"higherbetter": true
 			},
 			"angle": {
 				"id": 46,
@@ -39741,6 +40526,22 @@
 					"range",
 					"scantime"
 				]
+			},
+			"tbem": {
+				"blueprints": {},
+				"modifications": []
+			},
+			"tbrfl": {
+				"blueprints": {},
+				"modifications": []
+			},
+			"dtl": {
+				"blueprints": {},
+				"modifications": []
+			},
+			"mahr": {
+				"blueprints": {},
+				"modifications": []
 			}
 		},
 		"specials": {
diff --git a/modifications/blueprints.json b/modifications/blueprints.json
index b468055..28edbb1 100644
--- a/modifications/blueprints.json
+++ b/modifications/blueprints.json
@@ -1959,11 +1959,11 @@
         },
         "features": {
           "integrity": [
-            0,
+            -0.03,
             -0.03
           ],
           "optmass": [
-            0,
+            -0.03,
             -0.03
           ],
           "optmul": [
@@ -1971,11 +1971,11 @@
             0.12
           ],
           "power": [
-            0,
+            0.04,
             0.04
           ],
           "thermload": [
-            0,
+            0.2,
             0.2
           ]
         },
@@ -1988,11 +1988,11 @@
         },
         "features": {
           "integrity": [
-            -0.03,
+            -0.06,
             -0.06
           ],
           "optmass": [
-            -0.03,
+            -0.05,
             -0.05
           ],
           "optmul": [
@@ -2000,11 +2000,11 @@
             0.19
           ],
           "power": [
-            0.04,
+            0.06,
             0.06
           ],
           "thermload": [
-            0.2,
+            0.3,
             0.3
           ]
         },
@@ -2018,11 +2018,11 @@
         },
         "features": {
           "integrity": [
-            -0.06,
+            -0.09,
             -0.09
           ],
           "optmass": [
-            -0.05,
+            -0.08,
             -0.08
           ],
           "optmul": [
@@ -2030,11 +2030,11 @@
             0.26
           ],
           "power": [
-            0.06,
+            0.08,
             0.08
           ],
           "thermload": [
-            0.3,
+            0.4,
             0.4
           ]
         },
@@ -2048,11 +2048,11 @@
         },
         "features": {
           "integrity": [
-            -0.09,
+            -0.12,
             -0.12
           ],
           "optmass": [
-            -0.08,
+            -0.1,
             -0.1
           ],
           "optmul": [
@@ -2060,11 +2060,11 @@
             0.33
           ],
           "power": [
-            0.08,
+            0.1,
             0.1
           ],
           "thermload": [
-            0.4,
+            0.5,
             0.5
           ]
         },
@@ -2078,11 +2078,11 @@
         },
         "features": {
           "integrity": [
-            -0.12,
+            -0.15,
             -0.15
           ],
           "optmass": [
-            -0.1,
+            -0.13,
             -0.13
           ],
           "optmul": [
@@ -2090,11 +2090,11 @@
             0.4
           ],
           "power": [
-            0.1,
+            0.12,
             0.12
           ],
           "thermload": [
-            0.5,
+            0.6,
             0.6
           ]
         },
@@ -2121,7 +2121,7 @@
             0.3
           ],
           "mass": [
-            0,
+            0.05,
             0.05
           ],
           "thermload": [
@@ -2142,7 +2142,7 @@
             0.5
           ],
           "mass": [
-            0.05,
+            0.1,
             0.1
           ],
           "thermload": [
@@ -2164,7 +2164,7 @@
             0.7
           ],
           "mass": [
-            0.1,
+            0.15,
             0.15
           ],
           "thermload": [
@@ -2186,7 +2186,7 @@
             0.9
           ],
           "mass": [
-            0.15,
+            0.2,
             0.2
           ],
           "thermload": [
@@ -2208,7 +2208,7 @@
             1.1
           ],
           "mass": [
-            0.2,
+            0.25,
             0.25
           ],
           "thermload": [
@@ -2235,7 +2235,7 @@
         },
         "features": {
           "optmass": [
-            0,
+            -0.02,
             -0.02
           ],
           "optmul": [
@@ -2256,11 +2256,11 @@
         },
         "features": {
           "integrity": [
-            0,
+            -0.04,
             -0.04
           ],
           "optmass": [
-            -0.02,
+            -0.04,
             -0.04
           ],
           "optmul": [
@@ -2268,7 +2268,7 @@
             0.13
           ],
           "power": [
-            0,
+            0.04,
             0.04
           ],
           "thermload": [
@@ -2286,11 +2286,11 @@
         },
         "features": {
           "integrity": [
-            -0.04,
+            -0.08,
             -0.08
           ],
           "optmass": [
-            -0.04,
+            -0.06,
             -0.06
           ],
           "optmul": [
@@ -2298,7 +2298,7 @@
             0.18
           ],
           "power": [
-            0.04,
+            0.08,
             0.08
           ],
           "thermload": [
@@ -2316,11 +2316,11 @@
         },
         "features": {
           "integrity": [
-            -0.08,
+            -0.12,
             -0.12
           ],
           "optmass": [
-            -0.06,
+            -0.08,
             -0.08
           ],
           "optmul": [
@@ -2328,7 +2328,7 @@
             0.23
           ],
           "power": [
-            0.08,
+            0.12,
             0.12
           ],
           "thermload": [
@@ -2346,11 +2346,11 @@
         },
         "features": {
           "integrity": [
-            -0.12,
+            -0.16,
             -0.16
           ],
           "optmass": [
-            -0.08,
+            -0.1,
             -0.1
           ],
           "optmul": [
@@ -2358,7 +2358,7 @@
             0.28
           ],
           "power": [
-            0.12,
+            0.16,
             0.16
           ],
           "thermload": [
@@ -2895,7 +2895,7 @@
         },
         "features": {
           "facinglimit": [
-            -0.1,
+            -0.01,
             -0.01
           ],
           "mass": [
@@ -4809,7 +4809,7 @@
             0.2
           ],
           "angle": [
-            -0.12,
+            -0.15,
             -0.15
           ],
           "range": [
@@ -7588,7 +7588,7 @@
             0.2
           ],
           "angle": [
-            -0.12,
+            -0.15,
             -0.15
           ],
           "range": [
@@ -8156,7 +8156,7 @@
             0.2
           ],
           "angle": [
-            0,
+            -0.1,
             -0.1
           ],
           "range": [
@@ -8177,7 +8177,7 @@
             0.4
           ],
           "angle": [
-            -0.1,
+            -0.15,
             -0.15
           ],
           "range": [
@@ -8199,7 +8199,7 @@
             0.6
           ],
           "angle": [
-            -0.15,
+            -0.2,
             -0.2
           ],
           "range": [
@@ -8221,7 +8221,7 @@
             0.8
           ],
           "angle": [
-            -0.2,
+            -0.25,
             -0.25
           ],
           "range": [
@@ -8243,7 +8243,7 @@
             1
           ],
           "angle": [
-            -0.25,
+            -0.3,
             -0.3
           ],
           "range": [
@@ -8823,7 +8823,7 @@
             0.2
           ],
           "angle": [
-            -0.12,
+            -0.15,
             -0.15
           ],
           "range": [
@@ -11575,7 +11575,7 @@
         },
         "features": {
           "clip": [
-            0,
+            -0.03,
             -0.03
           ],
           "damage": [
@@ -11583,11 +11583,11 @@
             0.3
           ],
           "distdraw": [
-            0,
+            0.15,
             0.15
           ],
           "thermload": [
-            0,
+            0.03,
             0.03
           ]
         },
@@ -11600,7 +11600,7 @@
         },
         "features": {
           "clip": [
-            -0.03,
+            -0.06,
             -0.06
           ],
           "damage": [
@@ -11608,11 +11608,11 @@
             0.4
           ],
           "distdraw": [
-            0.15,
+            0.2,
             0.2
           ],
           "thermload": [
-            0.03,
+            0.06,
             0.06
           ]
         },
@@ -11626,7 +11626,7 @@
         },
         "features": {
           "clip": [
-            -0.06,
+            -0.09,
             -0.09
           ],
           "damage": [
@@ -11634,11 +11634,11 @@
             0.5
           ],
           "distdraw": [
-            0.2,
+            0.25,
             0.25
           ],
           "thermload": [
-            0.06,
+            0.09,
             0.09
           ]
         },
@@ -11652,7 +11652,7 @@
         },
         "features": {
           "clip": [
-            -0.09,
+            -0.12,
             -0.12
           ],
           "damage": [
@@ -11660,11 +11660,11 @@
             0.6
           ],
           "distdraw": [
-            0.25,
+            0.3,
             0.3
           ],
           "thermload": [
-            0.09,
+            0.12,
             0.12
           ]
         },
@@ -11678,7 +11678,7 @@
         },
         "features": {
           "clip": [
-            -0.12,
+            -0.15,
             -0.15
           ],
           "damage": [
@@ -11686,11 +11686,11 @@
             0.7
           ],
           "distdraw": [
-            0.3,
+            0.35,
             0.35
           ],
           "thermload": [
-            0.12,
+            0.15,
             0.15
           ]
         },
diff --git a/modifications/modifications.json b/modifications/modifications.json
index 5e38baa..b4bd9b2 100644
--- a/modifications/modifications.json
+++ b/modifications/modifications.json
@@ -3,7 +3,7 @@
     "boot": {"id": 1, "name": "boot", "type": "percentage", "method": "multiplicative", "higherbetter": false},
     "brokenregen": {"id": 2, "name": "brokenregen", "type": "percentage", "method": "multiplicative", "higherbetter": true},
     "burst": {"id": 3, "name": "burst", "type": "numeric", "method": "overwrite", "higherbetter": true},
-    "burstrof": {"id": 41, "name": "burstrof", "type": "numeric", "method": "overwrite", "higherbetter": false},
+    "burstrof": {"id": 41, "name": "burstrof", "type": "numeric", "method": "overwrite", "higherbetter": true},
     "clip": {"id": 4, "name": "clip", "type": "percentage", "method": "multiplicative", "higherbetter": true},
     "damage": {"id": 5, "name": "damage", "type": "percentage", "method": "multiplicative", "higherbetter": true},
     "damagedist": {"id": 40, "name": "damage", "type": "object", "hidden": true, "method": "overwrite"},
@@ -33,7 +33,7 @@
     "ranget": {"id": 26, "name": "ranget", "type": "percentage", "method": "multiplicative", "higherbetter": true},
     "regen": {"id": 27, "name": "regen", "type": "percentage", "method": "multiplicative", "higherbetter": true},
     "reload": {"id": 28, "name": "reload", "type": "percentage", "method": "multiplicative", "higherbetter": false},
-    "rof": {"id": 29, "name": "rof", "type": "percentage", "method": "multiplicative", "higherbetter": false},
+    "rof": {"id": 29, "name": "rof", "type": "percentage", "method": "multiplicative", "higherbetter": true},
     "angle": {"id": 46, "name": "angle", "type": "percentage", "method": "multiplicative", "higherbetter": true},
     "scanrate": {"id": 49, "name": "scanrate", "type": "percentage", "method": "multiplicative", "higherbetter": true},
     "scantime": {"id": 48, "name": "scantime", "type": "percentage", "method": "multiplicative", "higherbetter": false},
diff --git a/modules/hardpoints/enzyme_missile_rack.json b/modules/hardpoints/enzyme_missile_rack.json
index 0a5eb4e..73aaadf 100644
--- a/modules/hardpoints/enzyme_missile_rack.json
+++ b/modules/hardpoints/enzyme_missile_rack.json
@@ -6,7 +6,7 @@
       "grp": "tbem",
       "id": "xt",
       "eddbID": 0,
-      "edID": 0,
+      "edID": 128833995,
       "mount": "F",
       "cost": 480501,
       "mass": 4,
diff --git a/modules/hardpoints/guardian_plasma_charger.json b/modules/hardpoints/guardian_plasma_charger.json
index 6a26d72..d478025 100644
--- a/modules/hardpoints/guardian_plasma_charger.json
+++ b/modules/hardpoints/guardian_plasma_charger.json
@@ -68,12 +68,12 @@
       "grp": "gpc",
       "id": "xu",
       "eddbID": 0,
-      "edID": 0,
+      "edID": 128834783,
       "mount": "F",
       "cost": 1423301,
       "mass": 8,
       "integrity": 51,
-      "power": 1.39,
+      "power": 3.10,
       "damage": 3.4,
       "distdraw": 2.42,
       "thermload": 6.2,
@@ -106,7 +106,7 @@
         "A": 1
       },
       "distdraw": 2.6,
-      "edID": 0,
+      "edID": 128834784,
       "eddbID": 0,
       "falloff": 1000,
       "grp": "gpc",
diff --git a/modules/hardpoints/guardian_shard_cannon.json b/modules/hardpoints/guardian_shard_cannon.json
index 0cfd8fa..e88dd0f 100644
--- a/modules/hardpoints/guardian_shard_cannon.json
+++ b/modules/hardpoints/guardian_shard_cannon.json
@@ -105,7 +105,7 @@
       "grp": "gsc",
       "id": "xx",
       "eddbID": 0,
-      "edID": 0,
+      "edID": 128834779,
       "mount": "T",
       "cost": 5865026,
       "mass": 8,
diff --git a/modules/hardpoints/remote_release_flechette_launcher.json b/modules/hardpoints/remote_release_flechette_launcher.json
index 476f5b9..fbb0894 100644
--- a/modules/hardpoints/remote_release_flechette_launcher.json
+++ b/modules/hardpoints/remote_release_flechette_launcher.json
@@ -6,7 +6,7 @@
       "grp": "tbrfl",
       "id": "xy",
       "eddbID": 0,
-      "edID": 0,
+      "edID": 128833996,
       "mount": "F",
       "cost": 353761,
       "mass": 4,
@@ -15,7 +15,7 @@
       "damage": 13,
       "distdraw": 0.24,
       "thermload": 3.6,
-      "piercing": 70,
+      "piercing": 80,
       "shotspeed": 550,
       "rof": 0.5,
       "clip": 1,
@@ -35,7 +35,7 @@
       "grp": "tbrfl",
       "id": "yF",
       "eddbID": 0,
-      "edID": 0,
+      "edID": 128833997,
       "mount": "T",
       "cost": 1279200,
       "mass": 4,
diff --git a/modules/hardpoints/shock_cannon.json b/modules/hardpoints/shock_cannon.json
index 3465814..d2410bd 100644
--- a/modules/hardpoints/shock_cannon.json
+++ b/modules/hardpoints/shock_cannon.json
@@ -1,5 +1,38 @@
 {
   "tbsc": [
+    {
+      "rating": "C",
+      "class": 3,
+      "grp": "tbsc",
+      "id": "yG",
+      "eddbID": 0,
+      "edID": 128834780,
+      "mount": "F",
+      "cost": 1015750,
+      "mass": 8,
+      "integrity": 64,
+      "power": 0.89,
+      "damage": 18.1,
+      "distdraw": 0.92,
+      "thermload": 2.7,
+      "piercing": 60,
+      "range": 3000,
+      "shotspeed": 1200,
+      "rof": 10,
+      "roundspershot": 0,
+      "clip": 16,
+      "ammo": 240,
+      "reload": 6,
+      "breachdmg": 12.7,
+      "breachmin": 0.4,
+      "breachmax": 0.8,
+      "jitter": 0,
+      "symbol": "Hpt_PlasmaShockCannon_Fixed_Large",
+      "damagedist": {
+        "K": 1
+      },
+      "falloff": 2500
+    },
     {
       "rating": "C",
       "class": 3,
@@ -19,17 +52,17 @@
       "falloff": 2500,
       "integrity": 64,
       "mount": "G",
-      "piercing": 95,
+      "piercing": 60,
       "power": 0.89,
       "range": 3000,
       "rof": 10,
       "shotspeed": 1200,
       "thermload": 3.1,
-      "cost": 1015750,
+      "cost": 2249050,
       "reload": 6,
       "id": "2N",
-      "edID": 128834780,
-      "symbol": "Hpt_PlasmaShockCannon_Fixed_Large"
+      "edID": 128834781,
+      "symbol": "Hpt_PlasmaShockCannon_Gimbal_Large"
     },
     {
       "rating": "D",
@@ -38,7 +71,7 @@
       "symbol": "Hpt_PlasmaShockCannon_Turret_Large",
       "id": "xz",
       "eddbID": 0,
-      "edID": 0,
+      "edID": 128834782,
       "mount": "T",
       "cost": 6050201,
       "mass": 8,
@@ -98,7 +131,7 @@
       "symbol": "Hpt_PlasmaShockCannon_Fixed_Medium",
       "id": "y0",
       "eddbID": 0,
-      "edID": 128834003,
+      "edID": 128834002,
       "class": 2,
       "rating": "D",
       "mount": "F",
@@ -123,6 +156,39 @@
         "K": 1
       },
       "falloff": 2500
+    },
+    {
+      "rating": "E",
+      "class": 2,
+      "grp": "tbsc",
+      "id": "0",
+      "eddbID": 0,
+      "edID": 128834004,
+      "mount": "T",
+      "cost": 1359200,
+      "mass": 4,
+      "integrity": 51,
+      "power": 0.5,
+      "damage": 9.0,
+      "distdraw": 0.39,
+      "thermload": 1.2,
+      "piercing": 40,
+      "range": 3000,
+      "shotspeed": 1200,
+      "rof": 10,
+      "roundspershot": 0,
+      "clip": 16,
+      "ammo": 240,
+      "reload": 6,
+      "breachdmg": 6.3,
+      "breachmin": 0.4,
+      "breachmax": 0.8,
+      "jitter": 0,
+      "symbol": "Hpt_PlasmaShockCannon_Turret_Medium",
+      "damagedist": {
+        "K": 1
+      },
+      "falloff": 2500
     }
   ]
 }
diff --git a/modules/index.js b/modules/index.js
index 58329b7..b386273 100644
--- a/modules/index.js
+++ b/modules/index.js
@@ -72,6 +72,7 @@ module.exports = {
     ss: require('./internal/surface_scanner').ss,
     rpl: require('./internal/repair_limpet_controller').rpl,
     rcpl: require('./internal/recon_limpet_controllers').rcpl,
+    rsl: require('./internal/research_limpet_controller.json').rsl,
     gsrp: require('./internal/guardian_shield_reinforcement_package').gsrp,
     gfsb: require('./internal/guardian_fsd_booster').gfsb,
     ghrp: require('./internal/guardian_hull_reinforcement_package').ghrp,
diff --git a/modules/internal/cargo_rack.json b/modules/internal/cargo_rack.json
index 6e79a05..d59fee3 100644
--- a/modules/internal/cargo_rack.json
+++ b/modules/internal/cargo_rack.json
@@ -128,7 +128,7 @@
       "cargo": 16,
       "class": 4,
       "cost": 94330,
-      "edID": 128681992,
+      "edID": 128833944,
       "eddbID": 1552,
       "grp": "cr",
       "id": "0W",
@@ -137,4 +137,4 @@
       "symbol": "Int_CorrosionProofCargoRack_Size4_Class1"
     }
   ]
-}
\ No newline at end of file
+}
diff --git a/modules/internal/decontamination_limpet_controller.json b/modules/internal/decontamination_limpet_controller.json
index 2e674ac..ecc85c1 100644
--- a/modules/internal/decontamination_limpet_controller.json
+++ b/modules/internal/decontamination_limpet_controller.json
@@ -3,7 +3,7 @@
     {
       "class": 1,
       "cost": 3600,
-      "edID": 0,
+      "edID": 128793941,
       "eddbID": 0,
       "grp": "dtl",
       "id": "y1",
@@ -17,7 +17,7 @@
     {
       "class": 3,
       "cost": 16201,
-      "edID": 0,
+      "edID": 128793942,
       "eddbID": 0,
       "grp": "dtl",
       "id": "y2",
@@ -31,7 +31,7 @@
     {
       "class": 5,
       "cost": 145801,
-      "edID": 0,
+      "edID": 128793943,
       "eddbID": 0,
       "grp": "dtl",
       "id": "y3",
@@ -45,7 +45,7 @@
     {
       "class": 7,
       "cost": 1312201,
-      "edID": 0,
+      "edID": 128793944,
       "eddbID": 0,
       "grp": "dtl",
       "id": "y4",
diff --git a/modules/internal/guardian_hull_reinforcement_package.json b/modules/internal/guardian_hull_reinforcement_package.json
index 7f5fd60..81e350a 100644
--- a/modules/internal/guardian_hull_reinforcement_package.json
+++ b/modules/internal/guardian_hull_reinforcement_package.json
@@ -9,6 +9,7 @@
       "eddbID": 0,
       "power": 0.56,
       "hullreinforcement": 138,
+      "causres": 0.05,
       "thermres": 0.02,
       "cost": 30000,
       "symbol": "Int_GuardianHullReinforcement_Size1_Class2",
@@ -23,6 +24,7 @@
       "eddbID": 0,
       "power": 0.45,
       "hullreinforcement": 100,
+      "causres": 0.05,
       "thermres": 0.02,
       "cost": 10000,
       "symbol": "Int_GuardianHullReinforcement_Size1_Class1",
@@ -37,6 +39,7 @@
       "eddbID": 0,
       "power": 0.79,
       "hullreinforcement": 238,
+      "causres": 0.05,
       "thermres": 0.02,
       "cost": 72000,
       "symbol": "Int_GuardianHullReinforcement_Size2_Class2",
@@ -51,6 +54,7 @@
       "eddbID": 0,
       "power": 0.68,
       "hullreinforcement": 188,
+      "causres": 0.05,
       "thermres": 0.02,
       "cost": 24000,
       "symbol": "Int_GuardianHullReinforcement_Size2_Class1",
@@ -65,6 +69,7 @@
       "eddbID": 0,
       "power": 1.01,
       "hullreinforcement": 325,
+      "causres": 0.05,
       "thermres": 0.02,
       "cost": 172800,
       "symbol": "Int_GuardianHullReinforcement_Size3_Class2",
@@ -79,6 +84,7 @@
       "eddbID": 0,
       "power": 0.9,
       "hullreinforcement": 288,
+      "causres": 0.05,
       "thermres": 0.02,
       "cost": 57600,
       "symbol": "Int_GuardianHullReinforcement_Size3_Class1",
@@ -92,6 +98,7 @@
       "eddbID": 0,
       "power": 1.24,
       "hullreinforcement": 413,
+      "causres": 0.05,
       "thermres": 0.02,
       "cost": 414720,
       "id": "2R",
@@ -106,6 +113,7 @@
       "eddbID": 0,
       "power": 1.13,
       "hullreinforcement": 375,
+      "causres": 0.05,
       "thermres": 0.02,
       "cost": 138240,
       "id": "2B",
@@ -120,6 +128,7 @@
       "eddbID": 0,
       "power": 1.46,
       "hullreinforcement": 488,
+      "causres": 0.05,
       "thermres": 0.02,
       "cost": 995330,
       "id": "2C",
@@ -134,6 +143,7 @@
       "eddbID": 0,
       "power": 1.35,
       "hullreinforcement": 450,
+      "causres": 0.05,
       "thermres": 0.02,
       "cost": 331778,
       "id": "2D",
diff --git a/modules/internal/meta_alloy_hull_reinforcement_package.json b/modules/internal/meta_alloy_hull_reinforcement_package.json
index b8c439c..ca5c3c3 100644
--- a/modules/internal/meta_alloy_hull_reinforcement_package.json
+++ b/modules/internal/meta_alloy_hull_reinforcement_package.json
@@ -4,7 +4,7 @@
       "hullreinforcement": 72,
       "class": 1,
       "cost": 7501,
-      "edID": 0,
+      "edID": 128793117,
       "eddbID": 0,
       "explres": 0,
       "grp": "mahr",
@@ -20,7 +20,7 @@
       "hullreinforcement": 99,
       "class": 1,
       "cost": 22501,
-      "edID": 0,
+      "edID": 128793118,
       "eddbID": 0,
       "explres": 0,
       "grp": "mahr",
@@ -36,7 +36,7 @@
       "hullreinforcement": 135,
       "class": 2,
       "cost": 18000,
-      "edID": 0,
+      "edID": 128793119,
       "eddbID": 0,
       "explres": 0,
       "grp": "mahr",
@@ -52,7 +52,7 @@
       "hullreinforcement": 171,
       "class": 2,
       "cost": 54000,
-      "edID": 0,
+      "edID": 128793120,
       "eddbID": 0,
       "explres": 0,
       "grp": "mahr",
@@ -68,7 +68,7 @@
       "hullreinforcement": 207,
       "class": 3,
       "cost": 42000,
-      "edID": 0,
+      "edID": 128793121,
       "eddbID": 0,
       "explres": 0,
       "grp": "mahr",
@@ -84,7 +84,7 @@
       "hullreinforcement": 234,
       "class": 3,
       "cost": 126000,
-      "edID": 0,
+      "edID": 128793122,
       "eddbID": 0,
       "explres": 0,
       "grp": "mahr",
@@ -100,7 +100,7 @@
       "hullreinforcement": 270,
       "class": 4,
       "cost": 97501,
-      "edID": 0,
+      "edID": 128793123,
       "eddbID": 0,
       "explres": 0,
       "grp": "mahr",
@@ -116,7 +116,7 @@
       "hullreinforcement": 297,
       "class": 4,
       "cost": 292501,
-      "edID": 0,
+      "edID": 128793124,
       "eddbID": 0,
       "explres": 0,
       "grp": "mahr",
@@ -132,7 +132,7 @@
       "hullreinforcement": 324,
       "class": 5,
       "cost": 225001,
-      "edID": 0,
+      "edID": 128793125,
       "eddbID": 0,
       "explres": 0,
       "grp": "mahr",
@@ -148,7 +148,7 @@
       "hullreinforcement": 351,
       "class": 5,
       "cost": 675001,
-      "edID": 0,
+      "edID": 128793126,
       "eddbID": 0,
       "explres": 0,
       "grp": "mahr",
diff --git a/modules/internal/research_limpet_controller.json b/modules/internal/research_limpet_controller.json
new file mode 100644
index 0000000..435d652
--- /dev/null
+++ b/modules/internal/research_limpet_controller.json
@@ -0,0 +1,20 @@
+{
+  "rsl": [
+    {
+      "rating": "E",
+      "class": 1,
+      "grp": "rsl",
+      "id": "0",
+      "eddbID": 1617,
+      "edID": 128793116,
+      "cost": 1749600,
+      "mass": 1.3,
+      "maximum": 1,
+      "power": 0.4,
+      "range": 2000,
+      "symbol": "Int_DroneControl_UnkVesselResearch",
+      "time": 300,
+      "integrity": 20
+    }
+  ]
+}
diff --git a/ships/alliance_challenger.json b/ships/alliance_challenger.json
index e1cc525..b507606 100644
--- a/ships/alliance_challenger.json
+++ b/ships/alliance_challenger.json
@@ -15,7 +15,7 @@
       "hardness": 65,
       "hullMass": 450,
       "masslock": 13,
-      "pipSpeed": 0.0875,
+      "pipSpeed": 0.088709677419355,
       "pitch": 32,
       "roll": 90,
       "yaw": 16,
diff --git a/ships/alliance_crusader.json b/ships/alliance_crusader.json
new file mode 100644
index 0000000..13c8207
--- /dev/null
+++ b/ships/alliance_crusader.json
@@ -0,0 +1,51 @@
+{
+  "alliance_crusader": {
+    "edID": 128816581,
+    "eddbID": 0,
+    "properties": {
+      "name": "Alliance Crusader",
+      "manufacturer": "Lakon",
+      "class": 2,
+      "hullCost": 22866341,
+      "speed": 180,
+      "boost": 300,
+      "boostEnergy": 19,
+      "baseShieldStrength": 200,
+      "baseArmour": 300,
+      "hardness": 65,
+      "hullMass": 500,
+	  "masslock": 13,
+	  "fighterHangars": true,
+      "pipSpeed": 0.15833333333333,
+      "pitch": 32,
+      "roll": 80,
+      "yaw": 16,
+      "crew": 3
+    },
+    "retailCost": 19382252,
+    "requirements": {
+      "horizons": true
+    },
+    "bulkheads": [
+      { "id": "CI", "edID": 128816583, "eddbID": 1640, "grp": "bh", "cost": 0, "mass": 0, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 0.8 },
+      { "id": "CJ", "edID": 128816584, "eddbID": 1641, "grp": "bh", "cost": 6803170, "mass": 40, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 1.52 },
+      { "id": "CK", "edID": 128816585, "eddbID": 1642, "grp": "bh", "cost": 15307134, "mass": 78, "explres": -0.4, "kinres": -0.2, "thermres": 0, "hullboost": 2.5 },
+      { "id": "CL", "edID": 128816586, "eddbID": 1643, "grp": "bh", "cost": 36175859, "mass": 78, "explres": -0.5, "kinres": -0.75, "thermres": 0.5, "hullboost": 2.5  },
+      { "id": "CM", "edID": 128816587, "eddbID": 1644, "grp": "bh", "cost": 40087682, "mass": 78, "explres": 0.2, "kinres": 0.25, "thermres": -0.4, "hullboost": 2.5 }
+    ],
+    "slots": {
+      "standard": [6, 6, 5, 5, 6, 4, 4],
+      "hardpoints": [3, 2, 2, 1, 1, 1, 0, 0, 0, 0],
+      "internal": [6, 5, 3, 3, 2, 2,
+        { "class": 4, "name": "Military", "eligible": { "hr": 1, "scb": 1, "mrp": 1, "gsrp": 1, "gmrp": 1, "ghrp": 1 } },
+        { "class": 4, "name": "Military", "eligible": { "hr": 1, "scb": 1, "mrp": 1, "gsrp": 1, "gmrp": 1, "ghrp": 1 } },
+        { "class": 4, "name": "Military", "eligible": { "hr": 1, "scb": 1, "mrp": 1, "gsrp": 1, "gmrp": 1, "ghrp": 1 } }
+      ]
+    },
+    "defaults": {
+      "standard": ["6E", "6E", "5E", "5E", "6E", "4E", "4C"],
+      "hardpoints": [17, 0, 17, 0, 0, 0, 0, 0, 0, 0],
+      "internal": ["04", "4e", "02", "", "2h", "", "", ""]
+    }
+  }
+}
diff --git a/ships/index.js b/ships/index.js
index b4b6fca..80904f8 100644
--- a/ships/index.js
+++ b/ships/index.js
@@ -2,6 +2,7 @@ module.exports = {
   adder: require('./adder').adder,
   alliance_chieftain: require('./alliance_chieftain').alliance_chieftain,
   alliance_challenger: require('./alliance_challenger').alliance_challenger,
+  alliance_crusader: require('./alliance_crusader').alliance_crusader,
   anaconda: require('./anaconda').anaconda,
   asp: require('./asp').asp,
   asp_scout: require('./asp_scout').asp_scout,