diff --git a/ChangeLog.md b/ChangeLog.md
index 29fc824..6814088 100644
--- a/ChangeLog.md
+++ b/ChangeLog.md
@@ -1,3 +1,6 @@
 #2.2.x
   * Add distributor draw modifier to shield generators
   * Remove modifiers for sensors
+  * Add initial loadout passenger cabins for Beluga
+  * Add initial loadout passenger cabins for Orca
+  * Update costs and initial loadouts for Keelback and Type-7
diff --git a/dist/index.js b/dist/index.js
index 6799d5f..a903760 100644
--- a/dist/index.js
+++ b/dist/index.js
@@ -470,7 +470,7 @@ module.exports = {
       defaults: {
         standard: [ "6E", "7E", "7E", "8E", "6E", "5E", "7C" ],
         hardpoints: [ 17, 17, 0, 0, 0, 0, 0, 0, 0, 0, 0 ],
-        internal: [ "4j", "04", "6dbusiness", "6dbusiness", "4dbusiness", "4dbusiness", "02", "01", 0, 0, "2h" ]
+        internal: [ "4j", "04", "mi", "mi", "mg", "mg", "02", "01", 0, 0, "2h" ]
       }
     },
     cobra_mk_iii: {
@@ -1773,7 +1773,7 @@ module.exports = {
         name: "Keelback",
         manufacturer: "Lakon",
         class: 2,
-        hullCost: 2951180,
+        hullCost: 2943880,
         speed: 200,
         boost: 300,
         boostEnergy: 10,
@@ -1785,7 +1785,7 @@ module.exports = {
         pipSpeed: .1375,
         fighterHangars: true
       },
-      retailCost: 3126150,
+      retailCost: 3126160,
       bulkheads: [ {
         id: "cb",
         edID: 128672271,
@@ -1860,7 +1860,7 @@ module.exports = {
         name: "Orca",
         manufacturer: "Saud Kruger",
         class: 3,
-        hullCost: 47798080,
+        hullCost: 47790590,
         speed: 300,
         boost: 380,
         boostEnergy: 16,
@@ -1872,7 +1872,7 @@ module.exports = {
         pipSpeed: .08375,
         luxuryCabins: true
       },
-      retailCost: 48539890,
+      retailCost: 48539900,
       bulkheads: [ {
         id: "BM",
         edID: 128049328,
@@ -1957,7 +1957,7 @@ module.exports = {
       defaults: {
         standard: [ "5E", "6E", "5E", "6E", "5E", "4E", "5C" ],
         hardpoints: [ 0, 17, 17, 0, 0, 0, 0 ],
-        internal: [ "6e economy", "4e economy", "03", "4e", "02", 0, 0, "2h" ]
+        internal: [ "me", "mc", "03", "4e", "02", 0, 0, "2h" ]
       }
     },
     python: {
@@ -2225,7 +2225,7 @@ module.exports = {
         name: "Type-7 Transporter",
         manufacturer: "Lakon",
         class: 3,
-        hullCost: 16881510,
+        hullCost: 16780510,
         speed: 180,
         boost: 300,
         boostEnergy: 10,
@@ -2236,7 +2236,7 @@ module.exports = {
         masslock: 10,
         pipSpeed: .16625
       },
-      retailCost: 17472250,
+      retailCost: 17472260,
       bulkheads: [ {
         id: "Bs",
         edID: 128049298,
@@ -4234,7 +4234,7 @@ module.exports = {
       ls: [ {
         boot: 1,
         class: 8,
-        cost: 0,
+        cost: 697590,
         edID: 128064173,
         eddbID: 1031,
         grp: "ls",
@@ -4247,7 +4247,7 @@ module.exports = {
       }, {
         boot: 1,
         class: 8,
-        cost: 0,
+        cost: 1743970,
         edID: 128064174,
         eddbID: 1032,
         grp: "ls",
@@ -4260,7 +4260,7 @@ module.exports = {
       }, {
         boot: 1,
         class: 8,
-        cost: 0,
+        cost: 4359900,
         edID: 128064175,
         eddbID: 1033,
         grp: "ls",
@@ -4273,7 +4273,7 @@ module.exports = {
       }, {
         boot: 1,
         class: 8,
-        cost: 0,
+        cost: 10899770,
         edID: 128064176,
         eddbID: 1034,
         grp: "ls",
@@ -4286,7 +4286,7 @@ module.exports = {
       }, {
         boot: 1,
         class: 8,
-        cost: 0,
+        cost: 27249400,
         edID: 128064177,
         eddbID: 1035,
         grp: "ls",
diff --git a/dist/index.json b/dist/index.json
index 6b003ec..2f92f0a 100644
--- a/dist/index.json
+++ b/dist/index.json
@@ -765,10 +765,10 @@
 				"internal": [
 					"4j",
 					"04",
-					"6dbusiness",
-					"6dbusiness",
-					"4dbusiness",
-					"4dbusiness",
+					"mi",
+					"mi",
+					"mg",
+					"mg",
 					"02",
 					"01",
 					0,
@@ -2895,7 +2895,7 @@
 				"name": "Keelback",
 				"manufacturer": "Lakon",
 				"class": 2,
-				"hullCost": 2951180,
+				"hullCost": 2943880,
 				"speed": 200,
 				"boost": 300,
 				"boostEnergy": 10,
@@ -2907,7 +2907,7 @@
 				"pipSpeed": 0.1375,
 				"fighterHangars": true
 			},
-			"retailCost": 3126150,
+			"retailCost": 3126160,
 			"bulkheads": [
 				{
 					"id": "cb",
@@ -3034,7 +3034,7 @@
 				"name": "Orca",
 				"manufacturer": "Saud Kruger",
 				"class": 3,
-				"hullCost": 47798080,
+				"hullCost": 47790590,
 				"speed": 300,
 				"boost": 380,
 				"boostEnergy": 16,
@@ -3046,7 +3046,7 @@
 				"pipSpeed": 0.08375,
 				"luxuryCabins": true
 			},
-			"retailCost": 48539890,
+			"retailCost": 48539900,
 			"bulkheads": [
 				{
 					"id": "BM",
@@ -3179,8 +3179,8 @@
 					0
 				],
 				"internal": [
-					"6e economy",
-					"4e economy",
+					"me",
+					"mc",
 					"03",
 					"4e",
 					"02",
@@ -3609,7 +3609,7 @@
 				"name": "Type-7 Transporter",
 				"manufacturer": "Lakon",
 				"class": 3,
-				"hullCost": 16881510,
+				"hullCost": 16780510,
 				"speed": 180,
 				"boost": 300,
 				"boostEnergy": 10,
@@ -3620,7 +3620,7 @@
 				"masslock": 10,
 				"pipSpeed": 0.16625
 			},
-			"retailCost": 17472250,
+			"retailCost": 17472260,
 			"bulkheads": [
 				{
 					"id": "Bs",
@@ -5993,7 +5993,7 @@
 				{
 					"boot": 1,
 					"class": 8,
-					"cost": 0,
+					"cost": 697590,
 					"edID": 128064173,
 					"eddbID": 1031,
 					"grp": "ls",
@@ -6007,7 +6007,7 @@
 				{
 					"boot": 1,
 					"class": 8,
-					"cost": 0,
+					"cost": 1743970,
 					"edID": 128064174,
 					"eddbID": 1032,
 					"grp": "ls",
@@ -6021,7 +6021,7 @@
 				{
 					"boot": 1,
 					"class": 8,
-					"cost": 0,
+					"cost": 4359900,
 					"edID": 128064175,
 					"eddbID": 1033,
 					"grp": "ls",
@@ -6035,7 +6035,7 @@
 				{
 					"boot": 1,
 					"class": 8,
-					"cost": 0,
+					"cost": 10899770,
 					"edID": 128064176,
 					"eddbID": 1034,
 					"grp": "ls",
@@ -6049,7 +6049,7 @@
 				{
 					"boot": 1,
 					"class": 8,
-					"cost": 0,
+					"cost": 27249400,
 					"edID": 128064177,
 					"eddbID": 1035,
 					"grp": "ls",
diff --git a/modules/standard/life_support.json b/modules/standard/life_support.json
index d75de9e..48f2182 100644
--- a/modules/standard/life_support.json
+++ b/modules/standard/life_support.json
@@ -3,7 +3,7 @@
     {
       "boot": 1,
       "class": 8,
-      "cost": 0,
+      "cost": 697590,
       "edID": 128064173,
       "eddbID": 1031,
       "grp": "ls",
@@ -17,7 +17,7 @@
     {
       "boot": 1,
       "class": 8,
-      "cost": 0,
+      "cost": 1743970,
       "edID": 128064174,
       "eddbID": 1032,
       "grp": "ls",
@@ -31,7 +31,7 @@
     {
       "boot": 1,
       "class": 8,
-      "cost": 0,
+      "cost": 4359900,
       "edID": 128064175,
       "eddbID": 1033,
       "grp": "ls",
@@ -45,7 +45,7 @@
     {
       "boot": 1,
       "class": 8,
-      "cost": 0,
+      "cost": 10899770,
       "edID": 128064176,
       "eddbID": 1034,
       "grp": "ls",
@@ -59,7 +59,7 @@
     {
       "boot": 1,
       "class": 8,
-      "cost": 0,
+      "cost": 27249400,
       "edID": 128064177,
       "eddbID": 1035,
       "grp": "ls",
diff --git a/ships/beluga.json b/ships/beluga.json
index 45f44d3..1e2a2e9 100755
--- a/ships/beluga.json
+++ b/ships/beluga.json
@@ -42,7 +42,7 @@
     "defaults": {
       "standard": ["6E", "7E", "7E", "8E", "6E", "5E", "7C"],
       "hardpoints": [17, 17, 0, 0, 0, 0, 0, 0, 0, 0, 0],
-      "internal": ["4j", "04", "6dbusiness", "6dbusiness", "4dbusiness", "4dbusiness", "02", "01", 0, 0, "2h"]
+      "internal": ["4j", "04", "mi", "mi", "mg", "mg", "02", "01", 0, 0, "2h"]
     }
   }
 }
diff --git a/ships/keelback.json b/ships/keelback.json
index 3688fd9..8a17ac3 100644
--- a/ships/keelback.json
+++ b/ships/keelback.json
@@ -6,7 +6,7 @@
       "name": "Keelback",
       "manufacturer": "Lakon",
       "class": 2,
-      "hullCost": 2951180,
+      "hullCost": 2943880,
       "speed": 200,
       "boost": 300,
       "boostEnergy": 10,
@@ -18,7 +18,7 @@
       "pipSpeed": 0.1375,
       "fighterHangars": true
     },
-    "retailCost": 3126150,
+    "retailCost": 3126160,
     "bulkheads": [
       { "id": "cb", "edID": 128672271, "eddbID": 1513, "grp": "bh", "cost": 0, "mass": 0, "explres": -0.4, "kinres": -0.2, "thermres": 0.2, "hullboost": 0.8 },
       { "id": "cc", "edID": 128672272, "eddbID": 1514, "grp": "bh", "cost": 1250460, "mass": 12, "explres": -0.4, "kinres": 0.2, "thermres": 0, "hullboost": 1.52 },
diff --git a/ships/orca.json b/ships/orca.json
index 3d6ca9f..a1c1a1e 100755
--- a/ships/orca.json
+++ b/ships/orca.json
@@ -6,7 +6,7 @@
       "name": "Orca",
       "manufacturer": "Saud Kruger",
       "class": 3,
-      "hullCost": 47798080,
+      "hullCost": 47790590,
       "speed": 300,
       "boost": 380,
       "boostEnergy": 16,
@@ -18,7 +18,7 @@
       "pipSpeed": 0.08375,
       "luxuryCabins": true
     },
-    "retailCost": 48539890,
+    "retailCost": 48539900,
     "bulkheads": [
       { "id": "BM", "edID": 128049328, "eddbID": 798, "grp": "bh", "cost": 0, "mass": 0, "explres": -0.4, "kinres": -0.2, "thermres": 0.2, "hullboost": 0.8 },
       { "id": "BN", "edID": 128049329, "eddbID": 799, "grp": "bh", "cost": 19415950, "mass": 21, "explres": -0.4, "kinres": 0.2, "thermres": 0, "hullboost": 1.52 },
@@ -38,7 +38,7 @@
     "defaults": {
       "standard": ["5E", "6E", "5E", "6E", "5E", "4E", "5C"],
       "hardpoints": [0, 17, 17, 0, 0, 0, 0],
-      "internal": ["6e economy", "4e economy", "03", "4e", "02", 0, 0, "2h"]
+      "internal": ["me", "mc", "03", "4e", "02", 0, 0, "2h"]
     }
   }
 }
diff --git a/ships/type_7_transport.json b/ships/type_7_transport.json
index 0dae4c0..f9ae3a0 100755
--- a/ships/type_7_transport.json
+++ b/ships/type_7_transport.json
@@ -6,7 +6,7 @@
       "name": "Type-7 Transporter",
       "manufacturer": "Lakon",
       "class": 3,
-      "hullCost": 16881510,
+      "hullCost": 16780510,
       "speed": 180,
       "boost": 300,
       "boostEnergy": 10,
@@ -17,7 +17,7 @@
       "masslock": 10,
       "pipSpeed": 0.16625
     },
-    "retailCost": 17472250,
+    "retailCost": 17472260,
     "bulkheads": [
       { "id": "Bs", "edID": 128049298, "eddbID": 773, "grp": "bh", "cost": 0, "mass": 0, "explres": -0.4, "kinres": -0.2, "thermres": 0.2, "hullboost": 0.8 },
       { "id": "Bt", "edID": 128049299, "eddbID": 774, "grp": "bh", "cost": 6988900, "mass": 32, "explres": -0.4, "kinres": 0.2, "thermres": 0, "hullboost": 1.52 },