diff --git a/addons/jam/CfgMagazineWells.hpp b/addons/jam/CfgMagazineWells.hpp
index 2f9bf883c..7598e5d7c 100644
--- a/addons/jam/CfgMagazineWells.hpp
+++ b/addons/jam/CfgMagazineWells.hpp
@@ -1,60 +1,73 @@
 class CfgMagazineWells {
-    #include "magwells_556x45.hpp"
-    #include "magwells_545x39.hpp"
-    #include "magwells_580x42.hpp"
-    #include "magwells_65x39.hpp"
-    #include "magwells_762x39.hpp"
-    #include "magwells_762x51.hpp"
-    #include "magwells_762x54.hpp"
-    #include "magwells_77x58.hpp"
-    #include "magwells_792x57.hpp"
-    #include "magwells_145x114.hpp"
-    #include "magwells_303B.hpp"
-    #include "magwells_3006.hpp"
-
-    #include "magwells_762x25.hpp"
-    #include "magwells_8x22.hpp"
-    #include "magwells_9x19.hpp"
-    #include "magwells_22LR.hpp"
-    #include "magwells_32ACP.hpp"
-    #include "magwells_357SIG.hpp"
-    #include "magwells_40SW.hpp"
-    #include "magwells_45ACP.hpp"
-
-    #include "magwells_10gauge.hpp"
-    #include "magwells_12gauge.hpp"
-    #include "magwells_16gauge.hpp"
-    #include "magwells_20gauge.hpp"
-
-    class CBA_762x38R_Nagant {};    // Nagant M1895 Revolver
-    class CBA_763x25_C96 {};        // Mauser C-96 in 7.63x25mm
-    class CBA_765x21_C96 {};        // Mauser C-96 in 7.65x21mm
-    class CBA_10x25_MP5 {};         // H&K MP5/10 10mm Auto
-    class CBA_38_200_Webley {};     // Webley Revolver in .38/200
-    class CBA_455_Webley {};        // Webley Revolver in .455 Webley
-
-    class CBA_68x43_ACR {};         // 6.8mm Remington SPC
-    class CBA_75x55_STGW57 {};      // SIG SG 510-1, Stgw. 57
-    class CBA_762x35_STANAG {};     // .300 Blackout
-    class CBA_792x33_StG {};        // StG44
-    class CBA_9x39_VSS {};          // Vintorez, Val
-    class CBA_11mm_Vickers {};      // Vickers machine gun in 11mm Vickers
-    class CBA_300WM_AI {};          // AI .300 Winchester Magnum
-    class CBA_338LM_AI {};          // AI .338 Lapua Magnum
-    class CBA_50BMG_M107 {};        // M82, M107, G82
-
-    class CBA_35mm_Type10 {};       // Japanese Type 10 Flare Pistol
 
+    // Rifle calibre magwells, ordered lexicographically in metric and imperial groups
+    #include "magwells_11x59R.hpp"      // 11x59mmR Gras | 11mm Vickers
+    #include "magwells_145x114.hpp"     // 14.5x114mm
+    #include "magwells_545x39.hpp"      // 5.45x39mm
+    #include "magwells_556x45.hpp"      // 5.56x45mm | .223
+    #include "magwells_580x42.hpp"      // 5.8x42mm
+    #include "magwells_65C.hpp"         // 6.5mm Creedmoor | 6.5 Creedmoor | 6,5 Creedmoor | 6.5 CM | 6.5 CRDMR
+    #include "magwells_65G.hpp"         // 6.5mm Grendel | 6.5x39mm Grendel
+    #include "magwells_65x39.hpp"       // 6.5x39mm Caseless
+    #include "magwells_68SPC.hpp"       // 6.8mm Remington SPC | 6.8 SPC | 6.8x43mm
+    #include "magwells_75x55.hpp"       // 7.5x55mm Swiss | 7.5x55mm Schmidt–Rubin
+    #include "magwells_762x39.hpp"      // 7.62x39mm | 7.62 Soviet | .30 Russian Short
+    #include "magwells_762x51.hpp"      // 7.62x51mm | .308
+    #include "magwells_762x54.hpp"      // 7.62x54mmR
+    #include "magwells_77x58.hpp"       // 7.7x58mm Arisaka | Type 99 rimless 7.7 mm | 7.7mm Japanese
+    #include "magwells_792x33.hpp"      // 7.92x33mm Kurz | 7.92 x 33 kurz | 7.9mm Kurz | 7.9 Kurz | 7.9mmK | 8x33 Polte
+    #include "magwells_792x57.hpp"      // 7.92x57mm Mauser | 8mm Mauser | 8x57mm | 8 x 57 IS
+    #include "magwells_9x39.hpp"        // 9x39mm
+
+    #include "magwells_3006.hpp"        // .30-06 Springfield | 7.62x63mm
+    #include "magwells_300BLK.hpp"      // .300 AAC Blackout | 300 BLK | .300 Blackout | 7.62x35mm
+    #include "magwells_300WM.hpp"       // .300 Winchester Magnum | .300 Win Mag | 300WM
+    #include "magwells_303B.hpp"        // .303 British | 7.7x56mmR
+    #include "magwells_338LM.hpp"       // .338 Lapua Magnum
+    #include "magwells_408CT.hpp"       // .408 Cheyenne Tactical | 408 Chey Tac | 10.36x77mm
+    #include "magwells_50BMG.hpp"       // .50 BMG | .50 Browning Machine Gun | 12.7x99mm NATO
+
+    // Pistol calibre magwells, ordered lexicographically in metric and imperial groups
+    #include "magwells_10mmAuto.hpp"    // 10mm Auto | 10mm Automatic | 10x25mm
+    #include "magwells_762x25.hpp"      // 7.62x25mm Tokarev
+    #include "magwells_762x38R.hpp"     // 7.62x38mmR | 7.62 mm Nagant
+    #include "magwells_763x25.hpp"      // 7.63x25mm Mauser | .30 Mauser Automatic
+    #include "magwells_765x21.hpp"      // 7.65x21mm Parabellum | 7,65 Parabellum | 7.65mm Luger | .30 Luger
+    #include "magwells_8x22.hpp"        // 8x22mm Nambu
+    #include "magwells_9x18.hpp"        // 9x18mm Makarov | 9mm Makarov | 9x18mm PM
+    #include "magwells_9x19.hpp"        // 9x19mm Parabellum | 9mm Luger
+
+    #include "magwells_22LR.hpp"        // .22 LR | .22 Long Rifle | 5.6x15mmR
+    #include "magwells_32ACP.hpp"       // .32 ACP | .32 Automatic | 7.65x17mmSR Browning | 7.65 mm Browning Short
+    #include "magwells_357Mag.hpp"      // .375 Magnum | .357 S&W Magnum | 9x33mmR
+    #include "magwells_357SIG.hpp"      // .357 SIG
+    #include "magwells_380ACP.hpp"      // .380 ACP | .380 Auto | 9mm Browning | 9mm Corto | 9mm Kurz | 9mm Short | 9x17mm | 9 mm Browning Court
+    #include "magwells_38Spec.hpp"      // .38 Smith & Wesson Special | .38 Special | .38 Spl | .38 Spc | 9x29.5mmR | 9.1x29mmR
+    #include "magwells_38_200.hpp"      // .38/200 | 9x20mmR
+    #include "magwells_40SW.hpp"        // .40 S&W
+    #include "magwells_455W.hpp"        // .455 Webley | .455 Eley | .455 Colt
+    #include "magwells_45ACP.hpp"       // .45 ACP | .45 Automatic Colt Pistol | .45 Auto | 11.43x23mm
+    #include "magwells_45GAP.hpp"       // .45 GAP | .45 "GAP" | .45 Glock Auto Pistol
+
+    // Shotgun calibre magwells, ordered lexicographically
+    #include "magwells_10gauge.hpp"     // 10 Gauge
+    #include "magwells_12gauge.hpp"     // 12 Gauge
+    #include "magwells_16gauge.hpp"     // 16 Gauge
+    #include "magwells_20gauge.hpp"     // 20 Gauge
+
+
+    // Grenade/Flare Launchers, ordered lexicographically
+    #include "magwells_35mm.hpp"
     #include "magwells_40mm.hpp"
 
+    // AT and AA Launchers, ordered lexicographically
     class CBA_Bazooka {};       // M1, M1A1 Bazooka
+    class CBA_Panzerschreck {}; // Panzerschreck RPzB 54
+    class CBA_PIAT {};          // PIAT
 
     class CBA_RPG7 {
         BI_rockets[] = {
             "RPG7_F"
         };
     };
-
-    class CBA_PIAT {};          // PIAT
-    class CBA_Panzerschreck {}; // Panzerschreck RPzB 54
 };
diff --git a/addons/jam/magwells_10mmAuto.hpp b/addons/jam/magwells_10mmAuto.hpp
new file mode 100644
index 000000000..9d2ba1a11
--- /dev/null
+++ b/addons/jam/magwells_10mmAuto.hpp
@@ -0,0 +1,3 @@
+    class CBA_10mmAuto_Glock_Cpct {};    // Compact Glock in 10mm Auto (Glock 29)
+    class CBA_10mmAuto_Glock_Full {};    // Fullsize Glock in 10mm Auto (Glock 20, 40)
+    class CBA_10mmAuto_MP5 {};           // H&K MP5/10 10mm Auto
diff --git a/addons/jam/magwells_11x59R.hpp b/addons/jam/magwells_11x59R.hpp
new file mode 100644
index 000000000..4bfaa5aaf
--- /dev/null
+++ b/addons/jam/magwells_11x59R.hpp
@@ -0,0 +1 @@
+    class CBA_11mm_Vickers {};      // Vickers machine gun in 11mm Vickers
diff --git a/addons/jam/magwells_12gauge.hpp b/addons/jam/magwells_12gauge.hpp
index 71b719e6c..18436001a 100644
--- a/addons/jam/magwells_12gauge.hpp
+++ b/addons/jam/magwells_12gauge.hpp
@@ -8,4 +8,5 @@
     class CBA_12g_2rnds {};         // 2 loose rounds
     class CBA_12g_1rnd {};          // 1 loose round
 
-    class CBA_12g_SAIGA {};
+    class CBA_12g_SAIGA {};         // Saiga Stick Magazines
+    class CBA_12g_SAIGA_XL {};      // Saiga Drum Magazines
diff --git a/addons/jam/magwells_3006.hpp b/addons/jam/magwells_3006.hpp
index e3e66b8af..de5fe2ea3 100644
--- a/addons/jam/magwells_3006.hpp
+++ b/addons/jam/magwells_3006.hpp
@@ -1,5 +1,5 @@
-    class CBA_3006_BAR {};          // M1918 BAR
-    class CBA_3006_Garand {};       // M1 Garand
-    class CBA_3006_Spring {};       // M1903 Springfield
-    class CBA_3006_Belt {};         // M1917/M1919 Browning Machine Gun
-    class CBA_3006_Vickers {};      // Vickers machine gun in .30-06
+    class CBA_3006_BAR {};          // M1918 BAR
+    class CBA_3006_Belt {};         // M1917/M1919 Browning Machine Gun
+    class CBA_3006_Garand {};       // M1 Garand
+    class CBA_3006_Spring {};       // M1903 Springfield
+    class CBA_3006_Vickers {};      // Vickers machine gun in .30-06
\ No newline at end of file
diff --git a/addons/jam/magwells_300BLK.hpp b/addons/jam/magwells_300BLK.hpp
new file mode 100644
index 000000000..12fa13ae3
--- /dev/null
+++ b/addons/jam/magwells_300BLK.hpp
@@ -0,0 +1,6 @@
+    class CBA_300BLK_STANAG {};         // .300 Blackout in a normal STANAG mag
+    class CBA_300BLK_STANAG_L {};       // .300 Blackout in a long STANAG mag
+    class CBA_300BLK_STANAG_XL {};      // .300 Blackout in a drum or XL stick mag
+    class CBA_300BLK_STANAG_2D {};      // .300 Blackout in a twin-drum mag
+    class CBA_300BLK_STANAG_2D_XL {};   // .300 Blackout in a XL twin-drum mag
+    class CBA_762x35_STANAG {};         // .300 Blackout
diff --git a/addons/jam/magwells_300WM.hpp b/addons/jam/magwells_300WM.hpp
new file mode 100644
index 000000000..3bda524af
--- /dev/null
+++ b/addons/jam/magwells_300WM.hpp
@@ -0,0 +1 @@
+    class CBA_300WM_AI {};          // AI .300 Winchester Magnum
diff --git a/addons/jam/magwells_303B.hpp b/addons/jam/magwells_303B.hpp
index 6b25320e2..63f05954d 100644
--- a/addons/jam/magwells_303B.hpp
+++ b/addons/jam/magwells_303B.hpp
@@ -1,4 +1,4 @@
-    class CBA_303B_LeeEn {};        // Lee Enfield
     class CBA_303B_BREN {};         // BREN gun
+    class CBA_303B_LeeEn {};        // Lee Enfield
     class CBA_303B_Maxim {};        // Maxim gun in .303 British
     class CBA_303B_Vickers {};      // Vickers machine gun in .303 British (might be the same as the Maxim belt in .303)
diff --git a/addons/jam/magwells_32ACP.hpp b/addons/jam/magwells_32ACP.hpp
index 6c5dab839..a2f153358 100644
--- a/addons/jam/magwells_32ACP.hpp
+++ b/addons/jam/magwells_32ACP.hpp
@@ -1,3 +1,8 @@
+    class CBA_32ACP_CZ82 {};        // CZ 83
+    class CBA_32ACP_P83 {};         // FB P-83 Wanad
+    class CBA_32ACP_PA63 {};        // FEG PA-63
+    class CBA_32ACP_PM63 {};        // FB PM-63 RAK
     class CBA_32ACP_PP {};          // Walther PP in .32 ACP (7.65x17mm Browning)
     class CBA_32ACP_PPK {};         // Walther PPK in .32 ACP (7.65x17mm Browning)
+    class CBA_32ACP_Vz61 {};        // Škorpion (vz. 61), M84
     class CBA_32ACP_Welrod {};      // Welrod pistol in .32 ACP (7.65x17mm Browning)
diff --git a/addons/jam/magwells_338LM.hpp b/addons/jam/magwells_338LM.hpp
new file mode 100644
index 000000000..dabc4dbcd
--- /dev/null
+++ b/addons/jam/magwells_338LM.hpp
@@ -0,0 +1 @@
+    class CBA_338LM_AI {};          // AI .338 Lapua Magnum
diff --git a/addons/jam/magwells_357Mag.hpp b/addons/jam/magwells_357Mag.hpp
new file mode 100644
index 000000000..977788e5a
--- /dev/null
+++ b/addons/jam/magwells_357Mag.hpp
@@ -0,0 +1,6 @@
+    class CBA_357_Clip_6rnds {};        // 6 round .357 Magnum moon clip
+    class CBA_357_Clip_5rnds {};        // 5 round .357 Magnum moon clip
+
+    class CBA_357_6rnds {};             // 6 loose rounds of .357 Magnum
+    class CBA_357_5rnds {};             // 5 loose rounds of .357 Magnum
+    
diff --git a/addons/jam/magwells_357SIG.hpp b/addons/jam/magwells_357SIG.hpp
index ecd31731c..9913c8e86 100644
--- a/addons/jam/magwells_357SIG.hpp
+++ b/addons/jam/magwells_357SIG.hpp
@@ -1,3 +1,6 @@
-    class CBA_357SIG_P226 {};       // SIG P226
-    class CBA_357SIG_P229 {};       // SIG P229
-    class CBA_357SIG_P239 {};       // SIG P239
+    class CBA_375SIG_Glock_SubC {};     // Subcompact Glock in 375SIGmm (Glock 33)
+    class CBA_375SIG_Glock_Cpct {};     // Compact Glock in 375SIGmm (Glock 32)
+    class CBA_375SIG_Glock_Full {};     // Fullsize Glock in 375SIGmm (Glock 31)
+    class CBA_357SIG_P226 {};           // SIG P226
+    class CBA_357SIG_P229 {};           // SIG P229
+    class CBA_357SIG_P239 {};           // SIG P239
diff --git a/addons/jam/magwells_35mm.hpp b/addons/jam/magwells_35mm.hpp
new file mode 100644
index 000000000..2538f14df
--- /dev/null
+++ b/addons/jam/magwells_35mm.hpp
@@ -0,0 +1 @@
+    class CBA_35mm_Type10 {};       // Japanese Type 10 Flare Pistol
diff --git a/addons/jam/magwells_380ACP.hpp b/addons/jam/magwells_380ACP.hpp
index cceb96bcb..2f9974e91 100644
--- a/addons/jam/magwells_380ACP.hpp
+++ b/addons/jam/magwells_380ACP.hpp
@@ -1,2 +1,15 @@
-    class CBA_380ACP_PP {};         // Walther PP in .380 ACP (9x17mm/9mm Short/9mm Browning)
-    class CBA_380ACP_PPK {};        // Walther PPK in .380 ACP (9x17mm/9mm Short/9mm Browning)
+    class CBA_380ACP_CZ82 {};           // CZ 83
+    class CBA_380ACP_Fort12 {};         // Fort-12
+    class CBA_380ACP_Glock_Slim {};     // Slimline Glock in .380 ACP (Glock 42)
+    class CBA_380ACP_Glock_SubC {};     // Subcompact Glock in .380 ACP (Glock 28)
+    class CBA_380ACP_Glock_Cpct {};     // Compact Glock in .380 ACP (Glock 25)
+    class CBA_380ACP_Ots01 {};          // OTs-01 Kobalt
+    class CBA_380ACP_P83 {};            // FB P-83 Wanad
+    class CBA_380ACP_PA63 {};           // FEG PA-63
+    class CBA_380ACP_PM {};             // Makarov PM in .380 ACP
+    class CBA_380ACP_PM63 {};           // FB PM-63 RAK
+    class CBA_380ACP_PMM {};            // Makarov PMM in .380 ACP
+    class CBA_380ACP_PP {};             // Walther PP in .380 ACP
+    class CBA_380ACP_PP19 {};           // PP-19 Bizon-2-02
+    class CBA_380ACP_PPK {};            // Walther PPK in .380 ACP
+    class CBA_380ACP_Vz64 {};           // Škorpion (vz. 64, vz. 83)
diff --git a/addons/jam/magwells_38Spec.hpp b/addons/jam/magwells_38Spec.hpp
new file mode 100644
index 000000000..abe20d323
--- /dev/null
+++ b/addons/jam/magwells_38Spec.hpp
@@ -0,0 +1,5 @@
+    class CBA_38_Special_Clip_6rnds {}; // 6 round .38 Special moon clip
+    class CBA_38_Special_Clip_5rnds {}; // 5 round .38 Special moon clip
+
+    class CBA_38_Special_6rnds {};      // 6 loose rounds of .38 Special
+    class CBA_38_Special_5rnds {};      // 5 loose rounds of .38 Special
diff --git a/addons/jam/magwells_38_200.hpp b/addons/jam/magwells_38_200.hpp
new file mode 100644
index 000000000..25d27cf4e
--- /dev/null
+++ b/addons/jam/magwells_38_200.hpp
@@ -0,0 +1 @@
+    class CBA_38_200_Webley {};     // Webley Revolver in .38/200
diff --git a/addons/jam/magwells_408CT.hpp b/addons/jam/magwells_408CT.hpp
new file mode 100644
index 000000000..b36debe13
--- /dev/null
+++ b/addons/jam/magwells_408CT.hpp
@@ -0,0 +1 @@
+    class CBA_408CT_Inter {};           // CheyTac Intervention in .408 Chey Tac
diff --git a/addons/jam/magwells_40SW.hpp b/addons/jam/magwells_40SW.hpp
index cffe63265..ff94c8726 100644
--- a/addons/jam/magwells_40SW.hpp
+++ b/addons/jam/magwells_40SW.hpp
@@ -1,3 +1,6 @@
+    class CBA_40SW_Glock_SubC {};   // Subcompact Glock in .40 S&W (Glock 27)
+    class CBA_40SW_Glock_Cpct {};   // Compact Glock in .40 S&W (Glock 23)
+    class CBA_40SW_Glock_Full {};   // Fullsize Glock in .40 S&W (Glock 22, 24, 35)
     class CBA_40SW_P226 {};         // SIG P226 .40 S&W
     class CBA_40SW_P229 {};         // SIG P229 .40 S&W
     class CBA_40SW_P239 {};         // SIG P239 .40 S&W
diff --git a/addons/jam/magwells_40mm.hpp b/addons/jam/magwells_40mm.hpp
index 852d1f13f..030aa9ac9 100644
--- a/addons/jam/magwells_40mm.hpp
+++ b/addons/jam/magwells_40mm.hpp
@@ -1,21 +1,3 @@
-    class CBA_40mm_M203 {
-        BI_grenades[] = {
-            "1Rnd_HE_Grenade_shell",
-            "1Rnd_Smoke_Grenade_shell",
-            "1Rnd_SmokeRed_Grenade_shell",
-            "1Rnd_SmokeGreen_Grenade_shell",
-            "1Rnd_SmokeYellow_Grenade_shell",
-            "1Rnd_SmokePurple_Grenade_shell",
-            "1Rnd_SmokeBlue_Grenade_shell",
-            "1Rnd_SmokeOrange_Grenade_shell",
-            "UGL_FlareWhite_F",
-            "UGL_FlareGreen_F",
-            "UGL_FlareRed_F",
-            "UGL_FlareYellow_F",
-            "UGL_FlareCIR_F"
-        };
-    };
-
     class CBA_40mm_3GL {
         BI_grenades[] = {
             "3Rnd_HE_Grenade_shell",
@@ -36,3 +18,21 @@
 
     class CBA_40mm_EGLM {};     // for longer grenades that can only fit side breech-loading
     class CBA_40mm_GP {};       // GP-25, GP-30
+
+    class CBA_40mm_M203 {
+        BI_grenades[] = {
+            "1Rnd_HE_Grenade_shell",
+            "1Rnd_Smoke_Grenade_shell",
+            "1Rnd_SmokeRed_Grenade_shell",
+            "1Rnd_SmokeGreen_Grenade_shell",
+            "1Rnd_SmokeYellow_Grenade_shell",
+            "1Rnd_SmokePurple_Grenade_shell",
+            "1Rnd_SmokeBlue_Grenade_shell",
+            "1Rnd_SmokeOrange_Grenade_shell",
+            "UGL_FlareWhite_F",
+            "UGL_FlareGreen_F",
+            "UGL_FlareRed_F",
+            "UGL_FlareYellow_F",
+            "UGL_FlareCIR_F"
+        };
+    };
diff --git a/addons/jam/magwells_455W.hpp b/addons/jam/magwells_455W.hpp
new file mode 100644
index 000000000..75fd9efee
--- /dev/null
+++ b/addons/jam/magwells_455W.hpp
@@ -0,0 +1 @@
+    class CBA_455_Webley {};        // Webley Revolver in .455 Webley
diff --git a/addons/jam/magwells_45ACP.hpp b/addons/jam/magwells_45ACP.hpp
index 597053598..c9f8d5caa 100644
--- a/addons/jam/magwells_45ACP.hpp
+++ b/addons/jam/magwells_45ACP.hpp
@@ -1,7 +1,10 @@
-    class CBA_45ACP_1911 {};        // Colt M1911
-    class CBA_45ACP_C96 {};         // Mauser C-96 in .45 ACP
-    class CBA_45ACP_Delisle {};     // De Lisle Carbine
-    class CBA_45ACP_Grease {};      // Grease Gun
+    class CBA_45ACP_1911 {};            // Colt M1911
+    class CBA_45ACP_C96 {};             // Mauser C-96 in .45 ACP
+    class CBA_45ACP_Delisle {};         // De Lisle Carbine
+    class CBA_45ACP_Glock_Slim {};      // Slimline Glock in .45 ACP (Glock 36)
+    class CBA_45ACP_Glock_Cpct {};      // Compact Glock in .45 ACP (Glock 29)
+    class CBA_45ACP_Glock_Full {};      // Fullsize Glock in .45 ACP (Glock 21, 41)
+    class CBA_45ACP_Grease {};          // Grease Gun
+    class CBA_45ACP_Reising {};         // M50/M55 Reising
     class CBA_45ACP_Thompson_Stick {};  // Thompson stick magazines
     class CBA_45ACP_Thompson_Drum {};   // Thompson drum magazines
-    class CBA_45ACP_Reising {};     // M50/M55 Reising
diff --git a/addons/jam/magwells_45GAP.hpp b/addons/jam/magwells_45GAP.hpp
new file mode 100644
index 000000000..8c5b811b7
--- /dev/null
+++ b/addons/jam/magwells_45GAP.hpp
@@ -0,0 +1,3 @@
+    class CBA_45GAP_Glock_SubC {};      // Subcompact Glock in .45 GAP (Glock 39)
+    class CBA_45GAP_Glock_Cpct {};      // Compact Glock in .45 GAP (Glock 38)
+    class CBA_45GAP_Glock_Full {};      // Fullsize Glock in .45 GAP (Glock 37)
diff --git a/addons/jam/magwells_50BMG.hpp b/addons/jam/magwells_50BMG.hpp
new file mode 100644
index 000000000..3e36f884b
--- /dev/null
+++ b/addons/jam/magwells_50BMG.hpp
@@ -0,0 +1 @@
+    class CBA_50BMG_M107 {};        // M82, M107, G82
diff --git a/addons/jam/magwells_545x39.hpp b/addons/jam/magwells_545x39.hpp
index 718bfb131..4c242af6c 100644
--- a/addons/jam/magwells_545x39.hpp
+++ b/addons/jam/magwells_545x39.hpp
@@ -1,4 +1,4 @@
-    class CBA_545x39_AK {
+    class CBA_545x39_AK {       // Standard AK-74 magazines
         BI_mags[] = {
             "30Rnd_545x39_Mag_F",
             "30Rnd_545x39_Mag_Green_F",
diff --git a/addons/jam/magwells_556x45.hpp b/addons/jam/magwells_556x45.hpp
index 2b1ebea9c..f9a44c3e8 100644
--- a/addons/jam/magwells_556x45.hpp
+++ b/addons/jam/magwells_556x45.hpp
@@ -1,3 +1,6 @@
+    class CBA_556x45_G36 {};            // H&K G36
+    class CBA_556x45_HK33 {};           // H&K 33/53/93
+
     class CBA_556x45_MINIMI {
         BI_boxes[] = {
             "200Rnd_556x45_Box_F",
@@ -7,6 +10,10 @@
         };
     };
 
+    class CBA_556x45_TYPE97 {};         // QBZ-97 Stick Mags
+    class CBA_556x45_TYPE97_XL {};      // QBB-97 LSW Drums
+    class CBA_556x45_SG550 {};
+
     class CBA_556x45_STANAG {
         BI_mags[] = {
             "30Rnd_556x45_Stanag",
@@ -18,18 +25,15 @@
         };
     };
 
-    class CBA_556x45_STANAG_L {};           // Magpul PMAG 40, Surefire MAG5-60
-    class CBA_556x45_STANAG_XL {};          // Surefire MAG5-100
+    class CBA_556x45_STANAG_L {};       // Magpul PMAG 40, Surefire MAG5-60
+    class CBA_556x45_STANAG_XL {};      // Surefire MAG5-100
     class CBA_556x45_STANAG_2D {};          // twin-drum 100rnd Beta C-MAG
 
-    class CBA_556x45_STANAG_2D_XL {         // twin-drum 150rnd Armatac SAW-MAG
+    class CBA_556x45_STANAG_2D_XL {     // twin-drum 150rnd Armatac SAW-MAG
         BI_mags[] = {
             "150Rnd_556x45_Drum_Mag_F",
             "150Rnd_556x45_Drum_Mag_Tracer_F"
         };
     };
 
-    class CBA_556x45_STEYR {};        // AUG
-    class CBA_556x45_HK33 {};         // H&K 33/53/93
-    class CBA_556x45_G36 {};
-    class CBA_556x45_SG550 {};
+    class CBA_556x45_STEYR {};          // Steyr AUG
diff --git a/addons/jam/magwells_580x42.hpp b/addons/jam/magwells_580x42.hpp
index 5a96e66e3..d5b7de3b2 100644
--- a/addons/jam/magwells_580x42.hpp
+++ b/addons/jam/magwells_580x42.hpp
@@ -1,8 +1,11 @@
-    class CBA_580x42_TYPE95 {
+    class CBA_580x42_TYPE95 {           // QBZ-95 Stick Mags
         BI_mags[] = {
             "30Rnd_580x42_Mag_F",
             "30Rnd_580x42_Mag_Tracer_F"
         };
+    };
+
+    class CBA_580x42_TYPE95_XL {        // QBB-95 LSW Drums
         BI_drums[] = {
             "100Rnd_580x42_Mag_F",
             "100Rnd_580x42_Mag_Tracer_F"
diff --git a/addons/jam/magwells_65C.hpp b/addons/jam/magwells_65C.hpp
new file mode 100644
index 000000000..9024af1b5
--- /dev/null
+++ b/addons/jam/magwells_65C.hpp
@@ -0,0 +1 @@
+    class CBA_65C_AR10 {};       // AR-10 in 6.5 Creedmoor standard mag (20 rounds)
diff --git a/addons/jam/magwells_65G.hpp b/addons/jam/magwells_65G.hpp
new file mode 100644
index 000000000..1dbbc8366
--- /dev/null
+++ b/addons/jam/magwells_65G.hpp
@@ -0,0 +1,5 @@
+    class CBA_65G_STANAG {};            // 6.5mm Grendel in a normal STANAG mag
+    class CBA_65G_STANAG_L {};          // 6.5mm Grendel in a long STANAG mag
+    class CBA_65G_STANAG_XL {};         // 6.5mm Grendel in a drum or XL stick mag
+    class CBA_65G_STANAG_2D {};         // 6.5mm Grendel in a twin-drum mag
+    class CBA_65G_STANAG_2D_XL {};      // 6.5mm Grendel in a XL twin-drum mag
diff --git a/addons/jam/magwells_68SPC.hpp b/addons/jam/magwells_68SPC.hpp
new file mode 100644
index 000000000..9f1bddac4
--- /dev/null
+++ b/addons/jam/magwells_68SPC.hpp
@@ -0,0 +1,6 @@
+    class CBA_68SPC_STANAG {};          // 6.8 SPC in a normal STANAG mag
+    class CBA_68SPC_STANAG_2D {};       // 6.8 SPC in a twin-drum mag
+    class CBA_68SPC_STANAG_2D_XL {};    // 6.8 SPC in a XL twin-drum mag
+    class CBA_68SPC_STANAG_L {};        // 6.8 SPC in a long STANAG mag
+    class CBA_68SPC_STANAG_XL {};       // 6.8 SPC in a drum or XL stick mag
+    class CBA_68x43_ACR {};             // 6.8mm Remington SPC
diff --git a/addons/jam/magwells_75x55.hpp b/addons/jam/magwells_75x55.hpp
new file mode 100644
index 000000000..b3af913e9
--- /dev/null
+++ b/addons/jam/magwells_75x55.hpp
@@ -0,0 +1 @@
+    class CBA_75x55_STGW57 {};      // SIG SG 510-1, Stgw. 57
diff --git a/addons/jam/magwells_762x25.hpp b/addons/jam/magwells_762x25.hpp
index 61848b2c1..0e2e2dfaa 100644
--- a/addons/jam/magwells_762x25.hpp
+++ b/addons/jam/magwells_762x25.hpp
@@ -1,6 +1,10 @@
-    class CBA_762x25_TT {};         // TT-30, TT-33 Tokarev
+    class CBA_762x25_CZ52 {};       // CZ 52, vz. 52, CZ 482
+    class CBA_762x25_Ots27 {};      // OTs-27 Berdysh
+    class CBA_762x25_PM63 {};       // FB PM-63 RAK
+    class CBA_762x25_PP19 {};       // PP-19 Bizon-2-07
+    class CBA_762x25_PPD_Drum {};   // PPD-40 drum magazines
+    class CBA_762x25_PPD_Stick {};  // PPD-40 stick magazines
     class CBA_762x25_PPS {};        // PPS-43
-    class CBA_762x25_PPSh_Stick {}; // PPSh-41 stick magazines
     class CBA_762x25_PPSh_Drum {};  // PPSh-41 drum magazines
-    class CBA_762x25_PPD_Stick {};  // PPD-40 stick magazines
-    class CBA_762x25_PPD_Drum {};   // PPD-40 drum magazines
+    class CBA_762x25_PPSh_Stick {}; // PPSh-41 stick magazines
+    class CBA_762x25_TT {};         // TT-30, TT-33 Tokarev
diff --git a/addons/jam/magwells_762x38R.hpp b/addons/jam/magwells_762x38R.hpp
new file mode 100644
index 000000000..bb9c93346
--- /dev/null
+++ b/addons/jam/magwells_762x38R.hpp
@@ -0,0 +1 @@
+    class CBA_762x38R_Nagant {};    // Nagant M1895 Revolver
diff --git a/addons/jam/magwells_762x39.hpp b/addons/jam/magwells_762x39.hpp
index c7c219b7c..33aeb6e8c 100644
--- a/addons/jam/magwells_762x39.hpp
+++ b/addons/jam/magwells_762x39.hpp
@@ -1,4 +1,4 @@
-    class CBA_762x39_AK {
+    class CBA_762x39_AK {               // Standard AK-47/AKM magazines
         BI_mags[] = {
             "30Rnd_762x39_Mag_F",
             "30Rnd_762x39_Mag_Green_F",
@@ -7,4 +7,10 @@
         };
     };
 
-    class CBA_762x39_RPK {};   // 40/45rnd RPK
+    class CBA_762x39_RPK {};            // 40/45/75rnd RPK magazines
+
+    class CBA_762x39_STANAG {};         // 762x39mm in a normal STANAG mag
+    class CBA_762x39_STANAG_L {};       // 762x39mm in a long STANAG mag
+    class CBA_762x39_STANAG_XL {};      // 762x39mm in a drum or XL stick mag
+    class CBA_762x39_STANAG_2D {};      // 762x39mm in a twin-drum mag
+    class CBA_762x39_STANAG_2D_XL {};   // 762x39mm in a XL twin-drum mag
diff --git a/addons/jam/magwells_762x51.hpp b/addons/jam/magwells_762x51.hpp
index 9e5ac8ab1..edba95a66 100644
--- a/addons/jam/magwells_762x51.hpp
+++ b/addons/jam/magwells_762x51.hpp
@@ -1,24 +1,30 @@
-    class CBA_762x51_M14 {
-        BI_mags[] = {
-            "20Rnd_762x51_Mag"
-        };
-    };
 
-    class CBA_762x51_HK417 {
+    class CBA_762x51_AR10 {};       // AR-10 standard mag (20 rounds)
+    class CBA_762x51_AR10_L {};     // AR-10 long mag (25 rounds)
+    class CBA_762x51_AR10_XL {};    // AR-10 drum mag (X-Products 50 round)
+    class CBA_762x51_FAL {};        // FN FAL
+    class CBA_762x51_G3 {};         // H&K G3
+
+    class CBA_762x51_HK417 {        // H&K 417
         BI_mags[] = {
             "20Rnd_762x51_Mag"
         };
     };
 
-    class CBA_762x51_SR25 {};       // M110, SIG716
-    class CBA_762x51_SCAR {};
-    class CBA_762x51_FAL {};
-    class CBA_762x51_G3 {};
-    class CBA_762x51_SIGAMT {};    // SIG 510-4, AMT
-
-    class CBA_762x51_LINKS {
+    class CBA_762x51_LINKS {        // M13 Links for M60, M240, MG3 (DM60)
         BI_belts[] = {
             "150Rnd_762x51_Box",
             "150Rnd_762x51_Box_Tracer"
         };
     };
+
+    class CBA_762x51_M14 {          // M14
+        BI_mags[] = {
+            "20Rnd_762x51_Mag"
+        };
+    };
+
+    class CBA_762x51_MG3 {};        // MG3 DM1 belts
+    class CBA_762x51_SCAR {};       // SCAR-H
+    class CBA_762x51_SIGAMT {};     // SIG 510-4, AMT
+    class CBA_762x51_SR25 {};       // M110, SIG716
diff --git a/addons/jam/magwells_762x54.hpp b/addons/jam/magwells_762x54.hpp
index d28491b47..8a04d3ab5 100644
--- a/addons/jam/magwells_762x54.hpp
+++ b/addons/jam/magwells_762x54.hpp
@@ -1,18 +1,20 @@
-    class CBA_762x54R_SVD {
-        BI_mags[] = {
-            "10Rnd_762x54_Mag"
-        };
-    };
+    class CBA_762x54R_DPM {};       // DPM LMG
+    class CBA_762x54R_DT {};        // DT LMG
 
-    class CBA_762x54R_LINKS {
+    class CBA_762x54R_LINKS {       // Links for PK, PKM, and similar
         BI_belts[] = {
             "150Rnd_762x54_Box",
             "150Rnd_762x54_Box_Tracer"
         };
     };
 
+    class CBA_762x54R_Maxim {};     // Maxim gun in 7.62x54R
     class CBA_762x54R_Mosin {};     // M91/30, M38, M44 Mosin
+
+    class CBA_762x54R_SVD {         // SVD
+        BI_mags[] = {
+            "10Rnd_762x54_Mag"
+        };
+    };
+
     class CBA_762x54R_SVT {};       // SVT
-    class CBA_762x54R_DPM {};       // DPM
-    class CBA_762x54R_DT {};        // DT
-    class CBA_762x54R_Maxim {};     // Maxim gun in 7.62x54R
diff --git a/addons/jam/magwells_763x25.hpp b/addons/jam/magwells_763x25.hpp
new file mode 100644
index 000000000..1f81a2de7
--- /dev/null
+++ b/addons/jam/magwells_763x25.hpp
@@ -0,0 +1 @@
+    class CBA_763x25_C96 {};        // Mauser C-96 in 7.63x25mm
diff --git a/addons/jam/magwells_765x21.hpp b/addons/jam/magwells_765x21.hpp
new file mode 100644
index 000000000..63a31376f
--- /dev/null
+++ b/addons/jam/magwells_765x21.hpp
@@ -0,0 +1 @@
+    class CBA_765x21_C96 {};        // Mauser C-96 in 7.65x21mm
diff --git a/addons/jam/magwells_792x33.hpp b/addons/jam/magwells_792x33.hpp
new file mode 100644
index 000000000..ab3460694
--- /dev/null
+++ b/addons/jam/magwells_792x33.hpp
@@ -0,0 +1 @@
+    class CBA_792x33_StG {};        // StG44
diff --git a/addons/jam/magwells_792x57.hpp b/addons/jam/magwells_792x57.hpp
index f29655eb5..1e8b06c05 100644
--- a/addons/jam/magwells_792x57.hpp
+++ b/addons/jam/magwells_792x57.hpp
@@ -2,5 +2,5 @@
     class CBA_792x57_G43 {};        // G43, G41
     class CBA_792x57_K98 {};        // K98, G98
     class CBA_792x57_LINKS {};      // MG42, MG34
-    class CBA_792x57_TROMMEL {};    // MG34 Patronentrommel 34
     class CBA_792x57_MG08 {};       // MG08
+    class CBA_792x57_TROMMEL {};    // MG34 Patronentrommel 34
diff --git a/addons/jam/magwells_8x22.hpp b/addons/jam/magwells_8x22.hpp
index 6270fcce9..2c78d3da9 100644
--- a/addons/jam/magwells_8x22.hpp
+++ b/addons/jam/magwells_8x22.hpp
@@ -1,3 +1,3 @@
-    class CBA_8x22_TypeB {};        // Japanese Type B Nambu
-    class CBA_8x22_Type14 {};       // Japanese Type 14 Nambu
     class CBA_8x22_Type100 {};      // Japanese Type 100 SMG
+    class CBA_8x22_Type14 {};       // Japanese Type 14 Nambu
+    class CBA_8x22_TypeB {};        // Japanese Type B Nambu
diff --git a/addons/jam/magwells_9x18.hpp b/addons/jam/magwells_9x18.hpp
new file mode 100644
index 000000000..1240fd119
--- /dev/null
+++ b/addons/jam/magwells_9x18.hpp
@@ -0,0 +1,17 @@
+    class CBA_9x18_APS {};      // Stechkin automatic pistol (APS)
+    class CBA_9x18_Fort12 {};   // Fort-12
+    class CBA_9x18_GPP9M {};    // Grand Power K100 P9M
+    class CBA_9x18_Ots01 {};    // OTs-01 Kobalt
+    class CBA_9x18_Ots02 {};    // OTs-01 Kiparis
+    class CBA_9x18_Ots27 {};    // OTs-27 Berdysh
+    class CBA_9x18_Ots33 {};    // OTs-33 Pernach
+    class CBA_9x18_P64 {};      // FB P-64 CZAK
+    class CBA_9x18_P83 {};      // FB P-83 Wanad
+    class CBA_9x18_PA63 {};     // FEG PA-63
+    class CBA_9x18_PM {};       // Makarov PM
+    class CBA_9x18_PM63 {};     // FB PM-63 RAK
+    class CBA_9x18_PM84 {};     // FB PM-84 Glauberyt
+    class CBA_9x18_PMM {};      // Makarov PMM
+    class CBA_9x18_PP19 {};     // PP-19 Bizon-1
+    class CBA_9x18_PP91 {};     // PP-91 KEDR
+    class CBA_9x18_Vz65 {};     // Škorpion (vz. 65)
diff --git a/addons/jam/magwells_9x19.hpp b/addons/jam/magwells_9x19.hpp
index 1d59fd7cc..ffbe0fde5 100644
--- a/addons/jam/magwells_9x19.hpp
+++ b/addons/jam/magwells_9x19.hpp
@@ -1,13 +1,28 @@
+    class CBA_9x19_C96 {};          // Mauser C-96 in 9x19mm
+    class CBA_9x19_CZ82 {};         // CZ 82, Vz. 82, CZ 83
+    class CBA_9x19_GPK199 {};       // Grand Power K100
+    class CBA_9x19_GSh18 {};        // GSh-18
+    class CBA_9x19_Glock_Slim {};   // Slimline Glock in 9x19mm (Glock 43)
+    class CBA_9x19_Glock_SubC {};   // Subcompact Glock in 9x19mm (Glock 26)
+    class CBA_9x19_Glock_Cpct {};   // Compact Glock in 9x19mm (Glock 19, 46)
+    class CBA_9x19_Glock_Full {};   // Fullsize Glock in 9x19mm (Glock 17, 18, 34, 45)
+    class CBA_9x19_HiPower {};      // Browning HiPower
+    class CBA_9x19_MP40 {};         // MP40, MP38
+    class CBA_9x19_MP443 {};        // MP-443 Grach
     class CBA_9x19_MP5 {};          // H&K MP5
-    class CBA_9x19_STEYR {};        // AUG SMG, MPi, TMP
+    class CBA_9x19_Ots27 {};        // OTs-27 Berdysh
+    class CBA_9x19_P08 {};          // Luger P08
     class CBA_9x19_P226 {};         // SIG P226
     class CBA_9x19_P228 {};         // SIG P228
     class CBA_9x19_P239 {};         // SIG P239
-    class CBA_9x19_MP40 {};         // MP40, MP38
-    class CBA_9x19_STEN {};         // STEN
-    class CBA_9x19_C96 {};          // Mauser C-96 in 9x19mm
-    class CBA_9x19_HiPower {};      // Browning HiPower
-    class CBA_9x19_P08 {};          // Luger P08
     class CBA_9x19_P38 {};          // Walther P38
+    class CBA_9x19_PM63 {};         // FB PM-63 RAK
+    class CBA_9x19_PM84 {};         // FB PM-84 Glauberyt
+    class CBA_9x19_PP19 {};         // PP-19 Bizon-2-01
+    class CBA_9x19_STEN {};         // STEN
+    class CBA_9x19_STEYR {};        // AUG SMG, MPi, TMP
+    class CBA_9x19_TT {};           // TT-33 Tokarev in 9x19mm (M48, Tokagypt 58, Type 54)
     class CBA_9x19_Vis {};          // wz. 35 Vis (Radom)
+    class CBA_9x19_Vityaz {};       // Vityaz-SN
+    class CBA_9x19_Vz68 {};         // Škorpion (vz. 68)
     class CBA_9x19_Welrod {};       // Welrod pistol in 9x19mm
diff --git a/addons/jam/magwells_9x39.hpp b/addons/jam/magwells_9x39.hpp
new file mode 100644
index 000000000..730228879
--- /dev/null
+++ b/addons/jam/magwells_9x39.hpp
@@ -0,0 +1 @@
+    class CBA_9x39_VSS {};          // Vintorez, Val