diff --git a/scripts/unitPayloads.lua b/scripts/unitPayloads.lua
index 04e85aef..b4ffcb58 100644
--- a/scripts/unitPayloads.lua
+++ b/scripts/unitPayloads.lua
@@ -3409,15 +3409,15 @@ Olympus.unitPayloads = {
             ["pylon_2"] = { ["CLSID"] = "{F14-300gal}" },
             ["pylon_1B"] = { ["CLSID"] = "{SHOULDER AIM-7F}" },
             ["pylon_1A"] = { ["CLSID"] = "{LAU-138 wtip - AIM-9L}" } },
-        ["AIM-54A-MK47*2, AIM-7F*1, AIM-9L*4, XT*2"] = { ["pylon_8A"] = { ["CLSID"] = "{LAU-138 wtip - AIM-9L}" },
-            ["pylon_8B"] = { ["CLSID"] = "{LAU-7 - AIM-9L}" },
-            ["pylon_7"] = { ["CLSID"] = "{F14-300gal}" },
-            ["pylon_6"] = { ["CLSID"] = "{AIM_54A_Mk47}" },
-            ["pylon_3"] = { ["CLSID"] = "{AIM_54A_Mk47}" },
-            ["pylon_2"] = { ["CLSID"] = "{F14-300gal}" },
-            ["pylon_1B"] = { ["CLSID"] = "{LAU-7 - AIM-9L}" },
-            ["pylon_1A"] = { ["CLSID"] = "{LAU-138 wtip - AIM-9L}" },
-            ["pylon_4"] = { ["CLSID"] = "{BELLY AIM-7F}" } },
+        ["AIM-54A-MK47*2, AIM-7F*1, AIM-9L*4, XT*2"] = { [1] = { ["CLSID"] = "{LAU-138 wtip - AIM-9L}" },
+            [2] = { ["CLSID"] = "{LAU-7 - AIM-9L}" },
+            [3] = { ["CLSID"] = "{F14-300gal}" },
+            [4] = { ["CLSID"] = "{AIM_54A_Mk47}" },
+            [7] = { ["CLSID"] = "{AIM_54A_Mk47}" },
+            [8] = { ["CLSID"] = "{F14-300gal}" },
+            [9] = { ["CLSID"] = "{LAU-7 - AIM-9L}" },
+            [10] = { ["CLSID"] = "{LAU-138 wtip - AIM-9L}" },
+            [5] = { ["CLSID"] = "{BELLY AIM-7F}" } },
         ["AIM-54A-MK47*4, AIM-9L*4, XT*2"] = { ["pylon_8A"] = { ["CLSID"] = "{LAU-138 wtip - AIM-9L}" },
             ["pylon_8B"] = { ["CLSID"] = "{LAU-7 - AIM-9L}" },
             ["pylon_7"] = { ["CLSID"] = "{F14-300gal}" },
@@ -3448,16 +3448,16 @@ Olympus.unitPayloads = {
             ["pylon_2"] = { ["CLSID"] = "{F14-300gal}" },
             ["pylon_1B"] = { ["CLSID"] = "{LAU-7 - AIM-9M}" },
             ["pylon_1A"] = { ["CLSID"] = "{LAU-138 wtip - AIM-9M}" } },
-        ["AIM-7F*4, AIM-9L*4, XT*2"] = { ["pylon_6"] = { ["CLSID"] = "{BELLY AIM-7F}" },
-            ["pylon_3"] = { ["CLSID"] = "{BELLY AIM-7F}" },
-            ["pylon_8A"] = { ["CLSID"] = "{LAU-138 wtip - AIM-9L}" },
-            ["pylon_8B"] = { ["CLSID"] = "{LAU-7 - AIM-9L}" },
-            ["pylon_7"] = { ["CLSID"] = "{F14-300gal}" },
-            ["pylon_4"] = { ["CLSID"] = "{BELLY AIM-7F}" },
-            ["pylon_5"] = { ["CLSID"] = "{BELLY AIM-7F}" },
-            ["pylon_2"] = { ["CLSID"] = "{F14-300gal}" },
-            ["pylon_1B"] = { ["CLSID"] = "{LAU-7 - AIM-9L}" },
-            ["pylon_1A"] = { ["CLSID"] = "{LAU-138 wtip - AIM-9L}" } },
+        ["AIM-7F*4, AIM-9L*4, XT*2"] = { [7] = { ["CLSID"] = "{BELLY AIM-7F}" },
+            [4] = { ["CLSID"] = "{BELLY AIM-7F}" },
+            [10] = { ["CLSID"] = "{LAU-138 wtip - AIM-9L}" },
+            [9] = { ["CLSID"] = "{LAU-7 - AIM-9L}" },
+            [8] = { ["CLSID"] = "{F14-300gal}" },
+            [5] = { ["CLSID"] = "{BELLY AIM-7F}" },
+            [6] = { ["CLSID"] = "{BELLY AIM-7F}" },
+            [3] = { ["CLSID"] = "{F14-300gal}" },
+            [2] = { ["CLSID"] = "{LAU-7 - AIM-9L}" },
+            [1] = { ["CLSID"] = "{LAU-138 wtip - AIM-9L}" } },
         ["BDU-33*14"] = { ["pylon_3"] = { ["CLSID"] = "{MAK79_BDU33 4}" },
             ["pylon_6"] = { ["CLSID"] = "{MAK79_BDU33 4}" },
             ["pylon_4"] = { ["CLSID"] = "{MAK79_BDU33 3L}" },
@@ -3537,14 +3537,14 @@ Olympus.unitPayloads = {
             ["pylon_2"] = { ["CLSID"] = "{F14-300gal}" },
             ["pylon_1B"] = { ["CLSID"] = "{SHOULDER AIM-7F}" },
             ["pylon_1A"] = { ["CLSID"] = "{LAU-138 wtip - AIM-9L}" } },
-        ["AIM-7M*1, AIM-9M*2, XT*2, GBU-12*2, LANTIRN"] = { ["pylon_8A"] = { ["CLSID"] = "{LAU-138 wtip - AIM-9M}" },
-            ["pylon_8B"] = { ["CLSID"] = "{F14-LANTIRN-TP}" },
-            ["pylon_7"] = { ["CLSID"] = "{F14-300gal}" },
-            ["pylon_6"] = { ["CLSID"] = "{BRU-32 GBU-12}" },
-            ["pylon_3"] = { ["CLSID"] = "{BRU-32 GBU-12}" },
-            ["pylon_2"] = { ["CLSID"] = "{F14-300gal}" },
-            ["pylon_1B"] = { ["CLSID"] = "{SHOULDER AIM-7M}" },
-            ["pylon_1A"] = { ["CLSID"] = "{LAU-138 wtip - AIM-9M}" } },
+        ["AIM-7M*1, AIM-9M*2, XT*2, GBU-12*2, LANTIRN"] = { [9] = { ["CLSID"] = "{LAU-138 wtip - AIM-9M}" },
+            [10] = { ["CLSID"] = "{F14-LANTIRN-TP}" },
+            [8] = { ["CLSID"] = "{F14-300gal}" },
+            [7] = { ["CLSID"] = "{BRU-32 GBU-12}" },
+            [4] = { ["CLSID"] = "{BRU-32 GBU-12}" },
+            [3] = { ["CLSID"] = "{F14-300gal}" },
+            [2] = { ["CLSID"] = "{SHOULDER AIM-7M}" },
+            [1] = { ["CLSID"] = "{LAU-138 wtip - AIM-9M}" } },
         ["AIM-7M*1, AIM-9M*2, XT*2, GBU-24*1, LANTIRN"] = { ["pylon_8A"] = { ["CLSID"] = "{LAU-138 wtip - AIM-9M}" },
             ["pylon_8B"] = { ["CLSID"] = "{F14-LANTIRN-TP}" },
             ["pylon_7"] = { ["CLSID"] = "{F14-300gal}" },
@@ -3777,16 +3777,16 @@ Olympus.unitPayloads = {
             ["pylon_2"] = { ["CLSID"] = "{F14-300gal}" },
             ["pylon_1B"] = { ["CLSID"] = "{SHOULDER AIM_54C_Mk47 L}" },
             ["pylon_1A"] = { ["CLSID"] = "{LAU-138 wtip - AIM-9M}" } },
-        ["AIM-7M*6, AIM-9M*2, XT*2"] = { ["pylon_6"] = { ["CLSID"] = "{BELLY AIM-7M}" },
-            ["pylon_3"] = { ["CLSID"] = "{BELLY AIM-7M}" },
-            ["pylon_8A"] = { ["CLSID"] = "{LAU-138 wtip - AIM-9M}" },
-            ["pylon_8B"] = { ["CLSID"] = "{SHOULDER AIM-7M}" },
-            ["pylon_7"] = { ["CLSID"] = "{F14-300gal}" },
-            ["pylon_4"] = { ["CLSID"] = "{BELLY AIM-7M}" },
-            ["pylon_5"] = { ["CLSID"] = "{BELLY AIM-7M}" },
-            ["pylon_2"] = { ["CLSID"] = "{F14-300gal}" },
-            ["pylon_1B"] = { ["CLSID"] = "{SHOULDER AIM-7M}" },
-            ["pylon_1A"] = { ["CLSID"] = "{LAU-138 wtip - AIM-9M}" } },
+        ["AIM-7M*6, AIM-9M*2, XT*2"] = { [7] = { ["CLSID"] = "{BELLY AIM-7M}" },
+            [4] = { ["CLSID"] = "{BELLY AIM-7M}" },
+            [9] = { ["CLSID"] = "{LAU-138 wtip - AIM-9M}" },
+            [10] = { ["CLSID"] = "{SHOULDER AIM-7M}" },
+            [8] = { ["CLSID"] = "{F14-300gal}" },
+            [5] = { ["CLSID"] = "{BELLY AIM-7M}" },
+            [6] = { ["CLSID"] = "{BELLY AIM-7M}" },
+            [3] = { ["CLSID"] = "{F14-300gal}" },
+            [2] = { ["CLSID"] = "{SHOULDER AIM-7M}" },
+            [1] = { ["CLSID"] = "{LAU-138 wtip - AIM-9M}" } },
         ["AIM-7M*6, AIM-9L*2, XT*2"] = { ["pylon_6"] = { ["CLSID"] = "{BELLY AIM-7M}" },
             ["pylon_3"] = { ["CLSID"] = "{BELLY AIM-7M}" },
             ["pylon_8A"] = { ["CLSID"] = "{LAU-138 wtip - AIM-9L}" },
@@ -3951,15 +3951,15 @@ Olympus.unitPayloads = {
             ["pylon_1B"] = { ["CLSID"] = "{SHOULDER AIM-7M}" },
             ["pylon_1A"] = { ["CLSID"] = "{LAU-138 wtip - AIM-9M}" },
             ["pylon_4"] = { ["CLSID"] = "{BELLY AIM-7M}" } },
-        ["AIM-54C-MK47*2, AIM-7M*3, AIM-9M*2, XT*2"] = { ["pylon_8A"] = { ["CLSID"] = "{LAU-138 wtip - AIM-9M}" },
-            ["pylon_8B"] = { ["CLSID"] = "{SHOULDER AIM-7M}" },
-            ["pylon_7"] = { ["CLSID"] = "{F14-300gal}" },
-            ["pylon_6"] = { ["CLSID"] = "{AIM_54C_Mk47}" },
-            ["pylon_3"] = { ["CLSID"] = "{AIM_54C_Mk47}" },
-            ["pylon_2"] = { ["CLSID"] = "{F14-300gal}" },
-            ["pylon_1B"] = { ["CLSID"] = "{SHOULDER AIM-7M}" },
-            ["pylon_1A"] = { ["CLSID"] = "{LAU-138 wtip - AIM-9M}" },
-            ["pylon_4"] = { ["CLSID"] = "{BELLY AIM-7M}" } },
+        ["AIM-54C-MK47*2, AIM-7M*3, AIM-9M*2, XT*2"] = { [10] = { ["CLSID"] = "{LAU-138 wtip - AIM-9M}" },
+            [9] = { ["CLSID"] = "{SHOULDER AIM-7M}" },
+            [8] = { ["CLSID"] = "{F14-300gal}" },
+            [7] = { ["CLSID"] = "{AIM_54C_Mk47}" },
+            [4] = { ["CLSID"] = "{AIM_54C_Mk47}" },
+            [3] = { ["CLSID"] = "{F14-300gal}" },
+            [2] = { ["CLSID"] = "{SHOULDER AIM-7M}" },
+            [1] = { ["CLSID"] = "{LAU-138 wtip - AIM-9M}" },
+            [5] = { ["CLSID"] = "{BELLY AIM-7M}" } },
         ["BDU-33*14"] = { ["pylon_3"] = { ["CLSID"] = "{MAK79_BDU33 4}" },
             ["pylon_6"] = { ["CLSID"] = "{MAK79_BDU33 4}" },
             ["pylon_4"] = { ["CLSID"] = "{MAK79_BDU33 3L}" },
@@ -4039,14 +4039,14 @@ Olympus.unitPayloads = {
             ["pylon_2"] = { ["CLSID"] = "{F14-300gal}" },
             ["pylon_1B"] = { ["CLSID"] = "{SHOULDER AIM-7M}" },
             ["pylon_1A"] = { ["CLSID"] = "{LAU-138 wtip - AIM-9M}" } },
-        ["AIM-7M*1, AIM-9M*2, XT*2, GBU-12*2, LANTIRN"] = { ["pylon_8A"] = { ["CLSID"] = "{LAU-138 wtip - AIM-9M}" },
-            ["pylon_8B"] = { ["CLSID"] = "{F14-LANTIRN-TP}" },
-            ["pylon_7"] = { ["CLSID"] = "{F14-300gal}" },
-            ["pylon_6"] = { ["CLSID"] = "{BRU-32 GBU-12}" },
-            ["pylon_3"] = { ["CLSID"] = "{BRU-32 GBU-12}" },
-            ["pylon_2"] = { ["CLSID"] = "{F14-300gal}" },
-            ["pylon_1B"] = { ["CLSID"] = "{SHOULDER AIM-7M}" },
-            ["pylon_1A"] = { ["CLSID"] = "{LAU-138 wtip - AIM-9M}" } },
+        ["AIM-7M*1, AIM-9M*2, XT*2, GBU-12*2, LANTIRN"] = { [10] = { ["CLSID"] = "{LAU-138 wtip - AIM-9M}" },
+            [9] = { ["CLSID"] = "{F14-LANTIRN-TP}" },
+            [8] = { ["CLSID"] = "{F14-300gal}" },
+            [7] = { ["CLSID"] = "{BRU-32 GBU-12}" },
+            [4] = { ["CLSID"] = "{BRU-32 GBU-12}" },
+            [3] = { ["CLSID"] = "{F14-300gal}" },
+            [2] = { ["CLSID"] = "{SHOULDER AIM-7M}" },
+            [1] = { ["CLSID"] = "{LAU-138 wtip - AIM-9M}" } },
         ["AIM-7M*1, AIM-9M*2, XT*2, GBU-24*1, LANTIRN"] = { ["pylon_8A"] = { ["CLSID"] = "{LAU-138 wtip - AIM-9M}" },
             ["pylon_8B"] = { ["CLSID"] = "{F14-LANTIRN-TP}" },
             ["pylon_7"] = { ["CLSID"] = "{F14-300gal}" },
@@ -7610,24 +7610,6 @@ Olympus.unitPayloads = {
             [2] = { ["CLSID"] = "{51F9AAE5-964F-4D21-83FB-502E3BFE5F8A}" } },
         ["GBU-27*2"] = { [1] = { ["CLSID"] = "{EF0A9419-01D6-473B-99A3-BEBDB923B14D}" },
             [2] = { ["CLSID"] = "{EF0A9419-01D6-473B-99A3-BEBDB923B14D}" } } },
-    ["F-14A"] = { ["AIM-9*2"] = { [12] = { ["CLSID"] = "{6CEB49FC-DED8-4DED-B053-E1F033FF72D3}" },
-        [1] = { ["CLSID"] = "{6CEB49FC-DED8-4DED-B053-E1F033FF72D3}" } },
-        ["AIM-54C*6,AIM-9*2"] = { [1] = { ["CLSID"] = "{6CEB49FC-DED8-4DED-B053-E1F033FF72D3}" },
-            [2] = { ["CLSID"] = "{7575BA0B-7294-4844-857B-031A144B2595}" },
-            [4] = { ["CLSID"] = "{7575BA0B-7294-4844-857B-031A144B2595}" },
-            [5] = { ["CLSID"] = "{7575BA0B-7294-4844-857B-031A144B2595}" },
-            [8] = { ["CLSID"] = "{7575BA0B-7294-4844-857B-031A144B2595}" },
-            [9] = { ["CLSID"] = "{7575BA0B-7294-4844-857B-031A144B2595}" },
-            [11] = { ["CLSID"] = "{7575BA0B-7294-4844-857B-031A144B2595}" },
-            [12] = { ["CLSID"] = "{6CEB49FC-DED8-4DED-B053-E1F033FF72D3}" } },
-        ["AIM-54C*4,AIM-9*2,AIM-7*2"] = { [1] = { ["CLSID"] = "{6CEB49FC-DED8-4DED-B053-E1F033FF72D3}" },
-            [2] = { ["CLSID"] = "{8D399DDA-FF81-4F14-904D-099B34FE7918}" },
-            [4] = { ["CLSID"] = "{7575BA0B-7294-4844-857B-031A144B2595}" },
-            [5] = { ["CLSID"] = "{7575BA0B-7294-4844-857B-031A144B2595}" },
-            [8] = { ["CLSID"] = "{7575BA0B-7294-4844-857B-031A144B2595}" },
-            [9] = { ["CLSID"] = "{7575BA0B-7294-4844-857B-031A144B2595}" },
-            [11] = { ["CLSID"] = "{8D399DDA-FF81-4F14-904D-099B34FE7918}" },
-            [12] = { ["CLSID"] = "{6CEB49FC-DED8-4DED-B053-E1F033FF72D3}" } } },
     ["F-15C"] = { ["AIM-120B*4, AIM-7M*2, AIM-9M*2, Fuel*3"] = { [2] = { ["CLSID"] = "{E1F29B21-F291-4589-9FD8-3272EEC69506}" },
         [6] = { ["CLSID"] = "{E1F29B21-F291-4589-9FD8-3272EEC69506}" },
         [10] = { ["CLSID"] = "{E1F29B21-F291-4589-9FD8-3272EEC69506}" },