diff --git a/Arrow.json b/Arrow.json
index 88ab2b06..87688552 100644
--- a/Arrow.json
+++ b/Arrow.json
@@ -839,9 +839,9 @@
           "name": "S2 Missiles",
           "mounts": "2",
           "component_size": "2",
-          "size": "3",
+          "size": "2",
           "details": "",
-          "quantity": "2",
+          "quantity": "1",
           "manufacturer": null,
           "component_class": "RSIWeapon"
         },
@@ -850,9 +850,9 @@
           "name": "S2 Missiles",
           "mounts": "2",
           "component_size": "2",
-          "size": "2",
+          "size": "3",
           "details": "",
-          "quantity": "1",
+          "quantity": "2",
           "manufacturer": null,
           "component_class": "RSIWeapon"
         }
diff --git a/Asgard.json b/Asgard.json
index cdbc1ce3..1dc47b80 100644
--- a/Asgard.json
+++ b/Asgard.json
@@ -823,22 +823,22 @@
         {
           "type": "weapons",
           "name": "S3 Weapon",
-          "mounts": "4",
+          "mounts": "1",
           "component_size": "3",
           "size": "3",
           "details": "",
-          "quantity": "1",
+          "quantity": "2",
           "manufacturer": null,
           "component_class": "RSIWeapon"
         },
         {
           "type": "weapons",
           "name": "S3 Weapon",
-          "mounts": "1",
+          "mounts": "4",
           "component_size": "3",
           "size": "3",
           "details": "",
-          "quantity": "2",
+          "quantity": "1",
           "manufacturer": null,
           "component_class": "RSIWeapon"
         }
diff --git a/Carrack Expedition.json b/Carrack Expedition.json
index 2fba0de3..59b22580 100644
--- a/Carrack Expedition.json	
+++ b/Carrack Expedition.json	
@@ -852,17 +852,6 @@
     "RSIWeapon": {
       "weapons": [],
       "turrets": [
-        {
-          "type": "turrets",
-          "name": "S4 Weapon",
-          "mounts": "1",
-          "component_size": "4",
-          "size": "4",
-          "details": "Manned (Bottom)",
-          "quantity": "2",
-          "manufacturer": null,
-          "component_class": "RSIWeapon"
-        },
         {
           "type": "turrets",
           "name": "S4 Weapon",
@@ -884,6 +873,17 @@
           "quantity": "2",
           "manufacturer": null,
           "component_class": "RSIWeapon"
+        },
+        {
+          "type": "turrets",
+          "name": "S4 Weapon",
+          "mounts": "1",
+          "component_size": "4",
+          "size": "4",
+          "details": "Manned (Bottom)",
+          "quantity": "2",
+          "manufacturer": null,
+          "component_class": "RSIWeapon"
         }
       ],
       "missiles": [],
diff --git a/Carrack.json b/Carrack.json
index 00b34cf9..ddeef078 100644
--- a/Carrack.json
+++ b/Carrack.json
@@ -852,6 +852,17 @@
     "RSIWeapon": {
       "weapons": [],
       "turrets": [
+        {
+          "type": "turrets",
+          "name": "S4 Weapon",
+          "mounts": "1",
+          "component_size": "4",
+          "size": "4",
+          "details": "Manned (Bottom)",
+          "quantity": "2",
+          "manufacturer": null,
+          "component_class": "RSIWeapon"
+        },
         {
           "type": "turrets",
           "name": "S4 Weapon",
@@ -873,17 +884,6 @@
           "quantity": "2",
           "manufacturer": null,
           "component_class": "RSIWeapon"
-        },
-        {
-          "type": "turrets",
-          "name": "S4 Weapon",
-          "mounts": "1",
-          "component_size": "4",
-          "size": "4",
-          "details": "Manned (Bottom)",
-          "quantity": "2",
-          "manufacturer": null,
-          "component_class": "RSIWeapon"
         }
       ],
       "missiles": [],
diff --git a/Caterpillar Best In Show Edition 2949.json b/Caterpillar Best In Show Edition 2949.json
index b6e83f52..edd4e630 100644
--- a/Caterpillar Best In Show Edition 2949.json	
+++ b/Caterpillar Best In Show Edition 2949.json	
@@ -703,9 +703,9 @@
         {
           "type": "fuel_intakes",
           "name": "Fuel Intake",
-          "mounts": "1",
-          "component_size": "S",
-          "size": "S",
+          "mounts": "2",
+          "component_size": "L",
+          "size": "L",
           "details": "",
           "quantity": "1",
           "manufacturer": "TBD",
@@ -714,9 +714,9 @@
         {
           "type": "fuel_intakes",
           "name": "Fuel Intake",
-          "mounts": "2",
-          "component_size": "L",
-          "size": "L",
+          "mounts": "1",
+          "component_size": "S",
+          "size": "S",
           "details": "",
           "quantity": "1",
           "manufacturer": "TBD",
@@ -741,8 +741,8 @@
           "type": "quantum_drives",
           "name": "Quantum Drive",
           "mounts": "1",
-          "component_size": "S",
-          "size": "S",
+          "component_size": "L",
+          "size": "L",
           "details": "",
           "quantity": "1",
           "manufacturer": "TBD",
@@ -752,8 +752,8 @@
           "type": "quantum_drives",
           "name": "Quantum Drive",
           "mounts": "1",
-          "component_size": "L",
-          "size": "L",
+          "component_size": "S",
+          "size": "S",
           "details": "",
           "quantity": "1",
           "manufacturer": "TBD",
@@ -778,8 +778,8 @@
           "type": "quantum_fuel_tanks",
           "name": "Quantum Fuel Tank",
           "mounts": "1",
-          "component_size": "S",
-          "size": "S",
+          "component_size": "L",
+          "size": "L",
           "details": "",
           "quantity": "1",
           "manufacturer": null,
@@ -789,8 +789,8 @@
           "type": "quantum_fuel_tanks",
           "name": "Quantum Fuel Tank",
           "mounts": "1",
-          "component_size": "L",
-          "size": "L",
+          "component_size": "S",
+          "size": "S",
           "details": "",
           "quantity": "1",
           "manufacturer": null,
diff --git a/Corsair.json b/Corsair.json
index 00b90df0..dc0534a9 100644
--- a/Corsair.json
+++ b/Corsair.json
@@ -647,8 +647,8 @@
           "type": "computers",
           "name": "Computer",
           "mounts": "1",
-          "component_size": "S",
-          "size": "S",
+          "component_size": "M",
+          "size": "M",
           "details": "",
           "quantity": "1",
           "manufacturer": "TBD",
@@ -658,8 +658,8 @@
           "type": "computers",
           "name": "Computer",
           "mounts": "1",
-          "component_size": "M",
-          "size": "M",
+          "component_size": "S",
+          "size": "S",
           "details": "",
           "quantity": "1",
           "manufacturer": "TBD",
diff --git a/F7C-M Super Hornet Mk I.json b/F7C-M Super Hornet Mk I.json
index bc0c8fb1..79a6e0ec 100644
--- a/F7C-M Super Hornet Mk I.json	
+++ b/F7C-M Super Hornet Mk I.json	
@@ -857,7 +857,7 @@
           "name": "S2 Weapon",
           "mounts": "1",
           "component_size": "2",
-          "size": "3",
+          "size": "2",
           "details": "Remote",
           "quantity": "2",
           "manufacturer": null,
@@ -868,7 +868,7 @@
           "name": "S2 Weapon",
           "mounts": "1",
           "component_size": "2",
-          "size": "2",
+          "size": "3",
           "details": "Remote",
           "quantity": "2",
           "manufacturer": null,