diff --git a/A3A/addons/core/Templates/Templates/IFA/IFA_AI_ALLIES.sqf b/A3A/addons/core/Templates/Templates/IFA/IFA_AI_ALLIES.sqf
index 8d7b420846..61ec17ca8d 100644
--- a/A3A/addons/core/Templates/Templates/IFA/IFA_AI_ALLIES.sqf
+++ b/A3A/addons/core/Templates/Templates/IFA/IFA_AI_ALLIES.sqf
@@ -270,8 +270,8 @@ _militiaLoadoutData set ["slWeapons", [
 ["LIB_Sten_Mk5", "LIB_ACC_No4_Mk2_Bayo", "", "", [], [], ""]
 ]];
 _militiaLoadoutData set ["rifles", [
-["LIB_LeeEnfield_No4", "LIB_ACC_No4_Mk2_Bayo", "", "", [], [], ""],
-["LIB_LeeEnfield_No1", "LIB_ACC_P1903_Bayo", "", "", [], [], ""]
+["LIB_LeeEnfield_No4", "LIB_ACC_No4_Mk2_Bayo", "", "", [], [], ""]
+//["LIB_LeeEnfield_No1", "LIB_ACC_P1903_Bayo", "", "", [], [], ""] //Moving to desert templates
 ]];
 _militiaLoadoutData set ["carbines", ["LIB_M1_Carbine", "LIB_LeeEnfield_No4"]];
 _militiaLoadoutData set ["grenadeLaunchers", [
diff --git a/A3A/addons/core/Templates/Templates/IFA/IFA_AI_WEH.sqf b/A3A/addons/core/Templates/Templates/IFA/IFA_AI_WEH.sqf
index bb2507744e..46c3f9f83c 100644
--- a/A3A/addons/core/Templates/Templates/IFA/IFA_AI_WEH.sqf
+++ b/A3A/addons/core/Templates/Templates/IFA/IFA_AI_WEH.sqf
@@ -31,9 +31,9 @@
 ["vehiclesAPCs", []] call _fnc_saveToTemplate;                  // armed with enclosed turret, armoured, with 6-8 passengers
 ["vehiclesIFVs", []] call _fnc_saveToTemplate;                  // capable of surviving multiple rockets, cannon armed, with 6-8 passengers
 
-//Some shenanigans to ensure the player doesn't only face Tigers
-["vehiclesLightTanks", ["LIB_StuG_III_G_WS"]] call _fnc_saveToTemplate;
+["vehiclesLightTanks", ["LIB_StuG_III_G_WS"]] call _fnc_saveToTemplate; //Add Panzer 4 without shield, needs to be added to configs
 
+//Some shenanigans to ensure the player doesn't only face Tigers/King tigers
 private _mediumTanks = [
 "LIB_T34_76_captured3","LIB_T34_76_captured","LIB_StuG_III_G_WS",
 "LIB_StuG_III_G","LIB_StuG_III_G","LIB_StuG_III_G",
diff --git a/A3A/addons/core/Templates/Templates/IFA/IFA_CIV_Common.sqf b/A3A/addons/core/Templates/Templates/IFA/IFA_CIV_Common.sqf
index ac903ce6b2..709ff2b8da 100644
--- a/A3A/addons/core/Templates/Templates/IFA/IFA_CIV_Common.sqf
+++ b/A3A/addons/core/Templates/Templates/IFA/IFA_CIV_Common.sqf
@@ -19,6 +19,7 @@
 
 ["vehiclesCivBoat", ["B_Boat_Transport_01_F", 0.2]] call _fnc_saveToTemplate;             //this line determines civilian boats -- Example: ["vehiclesCivBoat", ["C_Boat_Civil_01_F"]] -- Array, can contain multiple assets
 
+//Do we want vehicles of these kinds in this modset?
 ["vehiclesCivRepair", [
     "LIB_Zis6_Parm", 0.0375
 ]] call _fnc_saveToTemplate;            //this line determines civilian repair vehicles
diff --git a/A3A/addons/core/Templates/Templates/IFA/IFA_REB_AK.sqf b/A3A/addons/core/Templates/Templates/IFA/IFA_REB_AK.sqf
index ad13f7c15b..f50e59e314 100644
--- a/A3A/addons/core/Templates/Templates/IFA/IFA_REB_AK.sqf
+++ b/A3A/addons/core/Templates/Templates/IFA/IFA_REB_AK.sqf
@@ -15,9 +15,9 @@
 // All of bellow are optional overrides.
 ["diveGear", [""]] call _fnc_saveToTemplate;
 ["flyGear", ["U_LIB_US_Bomber_Pilot"]] call _fnc_saveToTemplate;
-["vehiclesCivSupply", ["LIB_OpelBlitz_Ambulance_w"]] call _fnc_saveToTemplate;
+["vehiclesCivSupply", ["LIB_OpelBlitz_Ambulance_w"]] call _fnc_saveToTemplate; //We should create a inert "box truck" version
 
-["surrenderCrate", "LIB_Lone_Big_Box"] call _fnc_saveToTemplate; //WIP
+["surrenderCrate", "LIB_Lone_Big_Box"] call _fnc_saveToTemplate;
 
 //////////////////////////
 //       Vehicles       //
@@ -25,7 +25,7 @@
 
 ["vehiclesBasic", ["LIB_Willys_MB"]] call _fnc_saveToTemplate;
 ["vehiclesLightUnarmed", ["LIB_GazM1_SOV"]] call _fnc_saveToTemplate;
-["vehiclesLightArmed", ["LIB_UK_Willys_MB_M1919"]] call _fnc_saveToTemplate;
+["vehiclesLightArmed", ["LIB_UK_Willys_MB_M1919"]] call _fnc_saveToTemplate;  //replace with a version in plain green
 ["vehiclesTruck", ["LIB_Zis5v"]] call _fnc_saveToTemplate;
 ["vehiclesAT", []] call _fnc_saveToTemplate;
 ["vehiclesAA", ["LIB_Zis5v_61K"]] call _fnc_saveToTemplate;
diff --git a/A3A/addons/core/Templates/Templates/IFA/IFA_REB_FFI.sqf b/A3A/addons/core/Templates/Templates/IFA/IFA_REB_FFI.sqf
index ae7ce739f6..79dae03b72 100644
--- a/A3A/addons/core/Templates/Templates/IFA/IFA_REB_FFI.sqf
+++ b/A3A/addons/core/Templates/Templates/IFA/IFA_REB_FFI.sqf
@@ -15,9 +15,9 @@
 // All of bellow are optional overrides.
 ["diveGear", [""]] call _fnc_saveToTemplate;
 ["flyGear", ["U_LIB_US_Bomber_Pilot"]] call _fnc_saveToTemplate;
-["vehiclesCivSupply", ["LIB_OpelBlitz_Ambulance_w"]] call _fnc_saveToTemplate;
+["vehiclesCivSupply", ["LIB_OpelBlitz_Ambulance_w"]] call _fnc_saveToTemplate; //We should create a inert "box truck" version
 
-["surrenderCrate", "LIB_BasicWeaponsBox_GER"] call _fnc_saveToTemplate; //WIP
+["surrenderCrate", "LIB_BasicWeaponsBox_GER"] call _fnc_saveToTemplate;
 
 //////////////////////////
 //       Vehicles       //
@@ -25,9 +25,9 @@
 
 ["vehiclesBasic", ["LIB_Willys_MB"]] call _fnc_saveToTemplate;
 ["vehiclesLightUnarmed", ["LIB_GazM1_FFI"]] call _fnc_saveToTemplate;
-["vehiclesLightArmed", ["LIB_UK_Willys_MB_M1919"]] call _fnc_saveToTemplate;
+["vehiclesLightArmed", ["LIB_UK_Willys_MB_M1919"]] call _fnc_saveToTemplate;  //replace with a version in plain green
 ["vehiclesTruck", ["LIB_CIV_FFI_CitC4_5"]] call _fnc_saveToTemplate;
-["vehiclesAT", ["LIB_Zis5v_61K"]] call _fnc_saveToTemplate;
+["vehiclesAT", ["LIB_Zis5v_61K"]] call _fnc_saveToTemplate; //Remove maybe
 ["vehiclesAA", []] call _fnc_saveToTemplate;
 
 ["vehiclesBoat", ["LIB_LCA"]] call _fnc_saveToTemplate;
diff --git a/A3A/addons/core/Templates/Templates/IFA/IFA_Reb_Vehicle_Attributes.sqf b/A3A/addons/core/Templates/Templates/IFA/IFA_Reb_Vehicle_Attributes.sqf
index 2b0b2be932..eb966dd265 100644
--- a/A3A/addons/core/Templates/Templates/IFA/IFA_Reb_Vehicle_Attributes.sqf
+++ b/A3A/addons/core/Templates/Templates/IFA/IFA_Reb_Vehicle_Attributes.sqf
@@ -3,6 +3,7 @@
     //Cars
     ["LIB_Willys_MB", ["rebCost", 200]],
     ["LIB_UK_Willys_MB_M1919", ["rebCost", 1000]],
+    ["LIB_GazM1", ["rebCost", 400]],
     ["LIB_GazM1_dirty", ["rebCost", 400]],
     ["LIB_Zis5v_61K", ["rebCost", 2000]], //Alternatively we'd make this not purchable?