diff --git a/addons/advanced_ballistics/XEH_postInit.sqf b/addons/advanced_ballistics/XEH_postInit.sqf
index 9d0dd0ee4b..f61fdb3188 100644
--- a/addons/advanced_ballistics/XEH_postInit.sqf
+++ b/addons/advanced_ballistics/XEH_postInit.sqf
@@ -24,22 +24,6 @@ if (!hasInterface) exitWith {};
 
     // Register Perframe Handler
     [LINKFUNC(handleFirePFH), GVAR(simulationInterval)] call CBA_fnc_addPerFrameHandler;
-
-    //Add warnings for missing compat PBOs (only if AB is on)
-    {
-        _x params ["_modPBO", "_compatPBO"];
-        if ([_modPBO] call EFUNC(common,isModLoaded) && {!([_compatPBO] call EFUNC(common,isModLoaded))}) then {
-            WARNING_2("Weapon Mod [%1] missing ace compat pbo [%2] (from @ace\optionals)",_modPBO,_compatPBO);
-        };
-    } forEach [
-        ["RH_acc","ace_compat_rh_acc"],
-        ["RH_de_cfg","ace_compat_rh_de"],
-        ["RH_m4_cfg","ace_compat_rh_m4"],
-        ["RH_PDW","ace_compat_rh_pdw"],
-        ["RKSL_PMII","ace_compat_rksl_pm_ii"],
-        ["iansky_opt","ace_compat_sma3_iansky"],
-        ["R3F_Armes","ace_compat_r3f"]
-    ];
 }] call CBA_fnc_addEventHandler;
 
 #ifdef DEBUG_MODE_FULL
diff --git a/addons/advanced_ballistics/functions/fnc_handleFired.sqf b/addons/advanced_ballistics/functions/fnc_handleFired.sqf
index b41fd7a7c0..ff2fe85ae4 100644
--- a/addons/advanced_ballistics/functions/fnc_handleFired.sqf
+++ b/addons/advanced_ballistics/functions/fnc_handleFired.sqf
@@ -19,7 +19,7 @@
 //IGNORE_PRIVATE_WARNING ["_unit", "_weapon", "_muzzle", "_mode", "_ammo", "_magazine", "_projectile", "_vehicle", "_gunner", "_turret"];
 TRACE_10("firedEH:",_unit,_weapon,_muzzle,_mode,_ammo,_magazine,_projectile,_vehicle,_gunner,_turret);
 
-if (!(_ammo isKindOf "BulletBase")) exitWith {};
+if !(_ammo isKindOf "BulletBase") exitWith {};
 if (!alive _projectile) exitWith {};
 if (underwater _unit) exitWith {};
 
diff --git a/addons/advanced_ballistics/functions/fnc_readAmmoDataFromConfig.sqf b/addons/advanced_ballistics/functions/fnc_readAmmoDataFromConfig.sqf
index 125c3677b8..5190786924 100644
--- a/addons/advanced_ballistics/functions/fnc_readAmmoDataFromConfig.sqf
+++ b/addons/advanced_ballistics/functions/fnc_readAmmoDataFromConfig.sqf
@@ -40,7 +40,7 @@ if (_transonicStabilityCoef == 0) then {
     _transonicStabilityCoef = 0.5;
 };
 private _dragModel = getNumber(_ammoConfig >> "ACE_dragModel");
-if (!(_dragModel in [1, 2, 5, 6, 7, 8])) then {
+if !(_dragModel in [1, 2, 5, 6, 7, 8]) then {
     _dragModel = 1;
 };
 private _ballisticCoefficients = getArray(_ammoConfig >> "ACE_ballisticCoefficients");
diff --git a/addons/advanced_ballistics/initSettings.inc.sqf b/addons/advanced_ballistics/initSettings.inc.sqf
index 957044f343..28a1d6d826 100644
--- a/addons/advanced_ballistics/initSettings.inc.sqf
+++ b/addons/advanced_ballistics/initSettings.inc.sqf
@@ -5,7 +5,9 @@ private _category = format ["ACE %1", localize LSTRING(DisplayName)];
     [LSTRING(enabled_DisplayName), LSTRING(enabled_Description)],
     _category,
     false,
-    1
+    1,
+    {[QGVAR(enabled), _this] call EFUNC(common,cbaSettings_settingChanged)},
+    true // Needs mission restart
 ] call CBA_fnc_addSetting;
 
 [
@@ -45,5 +47,7 @@ private _category = format ["ACE %1", localize LSTRING(DisplayName)];
     [LSTRING(simulationInterval_DisplayName), LSTRING(simulationInterval_Description)],
     _category,
     [0, 0.2, 0.05, 2],
-    1
+    1,
+    {[QGVAR(simulationInterval), _this] call EFUNC(common,cbaSettings_settingChanged)},
+    true // Needs mission restart
 ] call CBA_fnc_addSetting;
diff --git a/addons/advanced_fatigue/XEH_PREP.hpp b/addons/advanced_fatigue/XEH_PREP.hpp
index 4ee00e3ce4..22bb99617a 100644
--- a/addons/advanced_fatigue/XEH_PREP.hpp
+++ b/addons/advanced_fatigue/XEH_PREP.hpp
@@ -9,3 +9,4 @@ PREP(handleStaminaBar);
 PREP(mainLoop);
 PREP(moduleSettings);
 PREP(removeDutyFactor);
+PREP(renderDebugLines);
diff --git a/addons/advanced_fatigue/XEH_postInit.sqf b/addons/advanced_fatigue/XEH_postInit.sqf
index f5aa7432f0..519d218b8c 100644
--- a/addons/advanced_fatigue/XEH_postInit.sqf
+++ b/addons/advanced_fatigue/XEH_postInit.sqf
@@ -2,6 +2,10 @@
 
 if (!hasInterface) exitWith {};
 
+#ifdef DEBUG_MODE_FULL
+call FUNC(renderDebugLines);
+#endif
+
 // recheck weapon inertia after weapon swap, change of attachments or switching unit
 ["weapon", {[ACE_player] call FUNC(getWeaponInertia)}, true] call CBA_fnc_addPlayerEventHandler;
 ["loadout", {[ACE_player] call FUNC(getWeaponInertia)}, true] call CBA_fnc_addPlayerEventHandler;
@@ -33,25 +37,23 @@ if (!hasInterface) exitWith {};
     GVAR(ppeBlackout) ppEffectCommit 0.4;
 
     // - GVAR updating and initialization -----------------------------------------
-    ["unit", LINKFUNC(handlePlayerChanged), true] call CBA_fnc_addPlayerEventHandler;
+    ["unit", LINKFUNC(handlePlayerChanged)] call CBA_fnc_addPlayerEventHandler;
 
     ["visibleMap", {
         params ["", "_visibleMap"]; // command visibleMap is updated one frame later
-        private _staminaBarContainer = uiNamespace getVariable [QGVAR(staminaBarContainer), controlNull];
-        _staminaBarContainer ctrlShow ((!_visibleMap) && {(vehicle ACE_player) == ACE_player});
+        (uiNamespace getVariable [QGVAR(staminaBarContainer), controlNull]) ctrlShow (!_visibleMap && isNull objectParent ACE_player);
     }, true] call CBA_fnc_addPlayerEventHandler;
     ["vehicle", {
-        private _staminaBarContainer = uiNamespace getVariable [QGVAR(staminaBarContainer), controlNull];
-        _staminaBarContainer ctrlShow ((!visibleMap) && {(vehicle ACE_player) == ACE_player});
+        (uiNamespace getVariable [QGVAR(staminaBarContainer), controlNull]) ctrlShow (!visibleMap && isNull objectParent ACE_player);
     }, true] call CBA_fnc_addPlayerEventHandler;
 
     // - Duty factors -------------------------------------------------------------
-    if (GVAR(medicalLoaded)) then {
+    if (GETEGVAR(medical,enabled,false)) then {
         [QEGVAR(medical,pain), { // 0->1.0, 0.5->1.05, 1->1.1
-            linearConversion [0, 1, (_this getVariable [QEGVAR(medical,pain), 0]), 1, 1.1, true];
+            linearConversion [0, 1, _this getVariable [QEGVAR(medical,pain), 0], 1, 1.1, true];
         }] call FUNC(addDutyFactor);
         [QEGVAR(medical,bloodVolume), { // 6->1.0, 5->1.167, 4->1.33
-            linearConversion [6, 0, (_this getVariable [QEGVAR(medical,bloodVolume), 6]), 1, 2, true];
+            linearConversion [6, 0, _this getVariable [QEGVAR(medical,bloodVolume), 6], 1, 2, true];
         }] call FUNC(addDutyFactor);
     };
     if (["ace_dragging"] call EFUNC(common,isModLoaded)) then {
@@ -62,7 +64,7 @@ if (!hasInterface) exitWith {};
     // Weather has an off switch, Dragging & Medical don't.
     if (missionNamespace getVariable [QEGVAR(weather,enabled), false]) then {
         [QEGVAR(weather,temperature), { // 35->1, 45->2
-            linearConversion [35, 45, (missionNamespace getVariable [QEGVAR(weather,currentTemperature), 25]), 1, 2, true];
+            linearConversion [35, 45, missionNamespace getVariable [QEGVAR(weather,currentTemperature), 25], 1, 2, true];
         }] call FUNC(addDutyFactor);
     };
 
diff --git a/addons/advanced_fatigue/XEH_preInit.sqf b/addons/advanced_fatigue/XEH_preInit.sqf
index 9f58e44fdf..643b7b0be0 100644
--- a/addons/advanced_fatigue/XEH_preInit.sqf
+++ b/addons/advanced_fatigue/XEH_preInit.sqf
@@ -13,6 +13,5 @@ GVAR(dutyList) = createHashMap;
 GVAR(setAnimExclusions) = [];
 GVAR(inertia) = 0;
 GVAR(inertiaCache) = createHashMap;
-GVAR(medicalLoaded) = ["ace_medical"] call EFUNC(common,isModLoaded);
 
 ADDON = true;
diff --git a/addons/advanced_fatigue/functions/fnc_getAnimDuty.sqf b/addons/advanced_fatigue/functions/fnc_getAnimDuty.sqf
index e992816e9b..50e052d5f8 100644
--- a/addons/advanced_fatigue/functions/fnc_getAnimDuty.sqf
+++ b/addons/advanced_fatigue/functions/fnc_getAnimDuty.sqf
@@ -1,7 +1,7 @@
 #include "..\script_component.hpp"
 /*
  * Author: BaerMitUmlaut
- * Calculates the duty of the current animation.
+ * Calculates the duty ('postureWeight') of the current animation.
  *
  * Arguments:
  * 0: Unit <OBJECT>
diff --git a/addons/advanced_fatigue/functions/fnc_getMetabolicCosts.sqf b/addons/advanced_fatigue/functions/fnc_getMetabolicCosts.sqf
index cc07d9e004..36048cee04 100644
--- a/addons/advanced_fatigue/functions/fnc_getMetabolicCosts.sqf
+++ b/addons/advanced_fatigue/functions/fnc_getMetabolicCosts.sqf
@@ -1,54 +1,74 @@
 #include "..\script_component.hpp"
 /*
- * Author: BaerMitUmlaut
- * Calculates the current metabolic costs for a unit.
+ * Author: BaerMitUmlaut, ulteq
+ * Calculates the current metabolic costs.
  * Calculation is done according to the Pandolf/Wojtowicz formulas.
  *
  * Arguments:
- * 0: Unit <OBJECT>
- * 1: Speed <NUMBER>
+ * 0: Duty of animation
+ * 1: Mass of unit <NUMBER>
+ * 2: Terrain gradient <NUMBER>
+ * 3: Terrain factor <NUMBER>
+ * 4: Speed <NUMBER>
  *
  * Return Value:
  * Metabolic cost <NUMBER>
  *
  * Example:
- * [player, 3.3] call ace_advanced_fatigue_fnc_getMetabolicCosts
+ * [1, 840, 20, 1, 4] call ace_advanced_fatigue_fnc_getMetabolicCosts
  *
  * Public: No
  */
-params ["_unit", "_velocity"];
 
-private _gearMass = ((_unit getVariable [QEGVAR(movement,totalLoad), loadAbs _unit]) / 22.046) * GVAR(loadFactor);
-
-private _terrainAngle = asin (1 - ((surfaceNormal getPosASL _unit) select 2));
-private _terrainGradient = (_terrainAngle / 45 min 1) * 5 * GVAR(terrainGradientFactor);
-private _duty = GVAR(animDuty);
-
-{
-    if (_x isEqualType 0) then {
-        _duty = _duty * _x;
-    } else {
-        _duty = _duty * (_unit call _x);
-    };
-} forEach (values GVAR(dutyList));
-
-if (GVAR(isSwimming)) then {
-    _terrainGradient = 0;
-};
+params ["_duty", "_gearMass", "_terrainGradient", "_terrainFactor", "_speed"];
 
 // Metabolic cost for walking and running is different
-if (_velocity > 2) then {
+if (_speed > 2) then {
     // Running
+    #ifdef DEBUG_MODE_FULL
+    private _baseline = 2.1 * SIM_BODYMASS + 4 * (SIM_BODYMASS + _gearMass) * ((_gearMass / SIM_BODYMASS) ^ 2) + (SIM_BODYMASS + _gearMass) * 0.9 * (_speed ^ 2);
+    private _graded = 2.1 * SIM_BODYMASS + 4 * (SIM_BODYMASS + _gearMass) * ((_gearMass / SIM_BODYMASS) ^ 2) + _terrainFactor * (SIM_BODYMASS + _gearMass) * (0.9 * (_speed ^ 2) + 0.66 * _speed * _terrainGradient);
+    private _terrainImpact = abs ((_graded / _baseline) - 1);
+    hintSilent format ["FwdAngle: %1 | SideAngle: %2 \n TerrainFactor: %3 | TerrainGradient: %4 \n TerrainImpact: %5 \n Speed: %6 | CarriedLoad: %7 \n Duty: %8 | Work: %9",
+        _fwdAngle toFixed 1,
+        _sideAngle toFixed 1,
+        _terrainFactor toFixed 2,
+        _terrainGradient toFixed 1,
+        _terrainImpact toFixed 2,
+        _speed toFixed 2,
+        _gearMass toFixed 1,
+        _duty toFixed 2,
+        round (_graded * BIOMECH_EFFICIENCY * _duty)
+    ];
+    #endif
+
     (
-        2.10 * SIM_BODYMASS
+        2.1 * SIM_BODYMASS
         + 4 * (SIM_BODYMASS + _gearMass) * ((_gearMass / SIM_BODYMASS) ^ 2)
-        + (SIM_BODYMASS + _gearMass) * (0.9 * (_velocity ^ 2) + 0.66 * _velocity * _terrainGradient)
-    ) * 0.23 * _duty
+        + _terrainFactor * (SIM_BODYMASS + _gearMass) * (0.9 * (_speed ^ 2) + 0.66 * _speed * _terrainGradient)
+    ) * BIOMECH_EFFICIENCY * _duty
 } else {
     // Walking
+    #ifdef DEBUG_MODE_FULL
+    private _baseline = 1.05 * SIM_BODYMASS + 2 * (SIM_BODYMASS + _gearMass) * ((_gearMass / SIM_BODYMASS) ^ 2) + (SIM_BODYMASS + _gearMass) * 1.15 * (_speed ^ 2);
+    private _graded = 1.05 * SIM_BODYMASS + 2 * (SIM_BODYMASS + _gearMass) * ((_gearMass / SIM_BODYMASS) ^ 2) + _terrainFactor * (SIM_BODYMASS + _gearMass) * (1.15 * (_speed ^ 2) + 0.66 * _speed * _terrainGradient);
+    private _terrainImpact = abs ((_graded / _baseline) - 1);
+    hintSilent format ["FwdAngle: %1 | SideAngle: %2 \n TerrainFactor: %3 | TerrainGradient: %4 \n TerrainImpact: %5 \n Speed: %6 | CarriedLoad: %7 \n Duty: %8 | Work: %9",
+        _fwdAngle toFixed 1,
+        _sideAngle toFixed 1,
+        _terrainFactor toFixed 2,
+        _terrainGradient toFixed 1,
+        _terrainImpact toFixed 2,
+        _speed toFixed 2,
+        _gearMass toFixed 1,
+        _duty toFixed 2,
+        round (_graded * BIOMECH_EFFICIENCY * _duty)
+    ];
+    #endif
+
     (
         1.05 * SIM_BODYMASS
         + 2 * (SIM_BODYMASS + _gearMass) * ((_gearMass / SIM_BODYMASS) ^ 2)
-        + (SIM_BODYMASS + _gearMass) * (1.15 * (_velocity ^ 2) + 0.66 * _velocity * _terrainGradient)
-    ) * 0.23 * _duty
+        + _terrainFactor * (SIM_BODYMASS + _gearMass) * (1.15 * (_speed ^ 2) + 0.66 * _speed * _terrainGradient)
+    ) * BIOMECH_EFFICIENCY * _duty
 };
diff --git a/addons/advanced_fatigue/functions/fnc_handleEffects.sqf b/addons/advanced_fatigue/functions/fnc_handleEffects.sqf
index 13c1fefc62..d948823354 100644
--- a/addons/advanced_fatigue/functions/fnc_handleEffects.sqf
+++ b/addons/advanced_fatigue/functions/fnc_handleEffects.sqf
@@ -1,44 +1,44 @@
 #include "..\script_component.hpp"
 /*
- * Author: BaerMitUmlaut
+ * Author: BaerMitUmlaut, ulteq
  * Handles any audible, visual and physical effects of fatigue.
  *
  * Arguments:
  * 0: Unit <OBJECT>
  * 1: Fatigue <NUMBER>
- * 2: Speed <NUMBER>
- * 3: Overexhausted <BOOL>
+ * 2: Overexhausted <BOOL>
+ * 3: Forward Angle <NUMBER>
+ * 4: Side Angle <NUMBER>
  *
  * Return Value:
  * None
  *
  * Example:
- * [_player, 0.5, 3.3, true] call ace_advanced_fatigue_fnc_handleEffects
+ * [_player, 0.5, 3.3, true, 0, 0] call ace_advanced_fatigue_fnc_handleEffects
  *
  * Public: No
  */
-params ["_unit", "_fatigue", "_speed", "_overexhausted"];
 
-#ifdef DEBUG_MODE_FULL
-    systemChat str _fatigue;
-    systemChat str vectorMagnitude velocity _unit;
-#endif
+params ["_unit", "_fatigue", "_overexhausted", "_fwdAngle", "_sideAngle"];
 
 // - Audible effects ----------------------------------------------------------
 GVAR(lastBreath) = GVAR(lastBreath) + 1;
+
 if (_fatigue > 0.4 && {GVAR(lastBreath) > (_fatigue * -10 + 9)} && {!underwater _unit}) then {
     if (!isGameFocused) exitWith {};
+
     switch (true) do {
         case (_fatigue < 0.6): {
-            playSound (QGVAR(breathLow) + str(floor random 6));
+            playSound (QGVAR(breathLow) + str (floor random 6));
         };
         case (_fatigue < 0.85): {
-            playSound (QGVAR(breathMid) + str(floor random 6));
+            playSound (QGVAR(breathMid) + str (floor random 6));
         };
         default {
-            playSound (QGVAR(breathMax) + str(floor random 6));
+            playSound (QGVAR(breathMax) + str (floor random 6));
         };
     };
+
     GVAR(lastBreath) = 0;
 };
 
@@ -62,31 +62,35 @@ if (GVAR(isSwimming)) exitWith {
     if (GVAR(setAnimExclusions) isEqualTo []) then {
         _unit setAnimSpeedCoef linearConversion [0.7, 0.9, _fatigue, 1, 0.5, true];
     };
-    if ((isSprintAllowed _unit) && {_fatigue > 0.7}) then {
+
+    if (isSprintAllowed _unit && _fatigue > 0.7) then { // small checks like these are faster without lazy eval
         [_unit, "blockSprint", QUOTE(ADDON), true] call EFUNC(common,statusEffect_set);
     } else {
-        if ((!isSprintAllowed _unit) && {_fatigue < 0.7}) then {
+        if (!isSprintAllowed _unit && _fatigue < 0.7) then {
             [_unit, "blockSprint", QUOTE(ADDON), false] call EFUNC(common,statusEffect_set);
         };
     };
 };
-if ((getAnimSpeedCoef _unit) != 1) then {
-    if (GVAR(setAnimExclusions) isEqualTo []) then {
-        TRACE_1("reset",getAnimSpeedCoef _unit);
-        _unit setAnimSpeedCoef 1;
-    };
+
+// If other components are setting setAnimSpeedCoef, do not change animSpeedCoef
+if (getAnimSpeedCoef _unit != 1 && {GVAR(setAnimExclusions) isEqualTo []}) then {
+    TRACE_1("reset",getAnimSpeedCoef _unit);
+    _unit setAnimSpeedCoef 1;
 };
 
-if (_overexhausted) then {
+if (!isForcedWalk _unit && _fatigue >= 1) then { // small checks like these are faster without lazy eval
     [_unit, "forceWalk", QUOTE(ADDON), true] call EFUNC(common,statusEffect_set);
+    [_unit, "blockSprint", QUOTE(ADDON), true] call EFUNC(common,statusEffect_set);
 } else {
-    if (isForcedWalk _unit && {_fatigue < 0.7}) then {
+    if (isForcedWalk _unit && _fatigue < 0.7) then {
         [_unit, "forceWalk", QUOTE(ADDON), false] call EFUNC(common,statusEffect_set);
+        [_unit, "blockSprint", QUOTE(ADDON), false] call EFUNC(common,statusEffect_set);
     } else {
-        if ((isSprintAllowed _unit) && {_fatigue > 0.7}) then {
+        // Forward angle is the slope of the terrain, side angle simulates the unevenness/roughness of the terrain
+        if (isSprintAllowed _unit && {_fatigue > 0.7 || abs _fwdAngle > 20 || abs _sideAngle > 20}) then {
             [_unit, "blockSprint", QUOTE(ADDON), true] call EFUNC(common,statusEffect_set);
         } else {
-            if ((!isSprintAllowed _unit) && {_fatigue < 0.6}) then {
+            if (!isSprintAllowed _unit && _fatigue < 0.6 && abs _fwdAngle < 20 && abs _sideAngle < 20) then {
                 [_unit, "blockSprint", QUOTE(ADDON), false] call EFUNC(common,statusEffect_set);
             };
         };
diff --git a/addons/advanced_fatigue/functions/fnc_handlePlayerChanged.sqf b/addons/advanced_fatigue/functions/fnc_handlePlayerChanged.sqf
index a119b35862..82c9c90a56 100644
--- a/addons/advanced_fatigue/functions/fnc_handlePlayerChanged.sqf
+++ b/addons/advanced_fatigue/functions/fnc_handlePlayerChanged.sqf
@@ -1,7 +1,7 @@
 #include "..\script_component.hpp"
 /*
- * Author: BaerMitUmlaut
- * Handles switching units (once on init and afterwards via Zeus).
+ * Author: BaerMitUmlaut, ulteq
+ * Handles switching units (once on init and afterwards via Zeus). Also handles CBA setting change for performance factor.
  *
  * Arguments:
  * 0: New Unit <OBJECT>
@@ -15,20 +15,24 @@
  *
  * Public: No
  */
+
 params ["_newUnit", "_oldUnit"];
+
 TRACE_2("unit changed",_newUnit,_oldUnit);
 
-if !(isNull _oldUnit) then {
+if (!isNull _oldUnit) then {
+    TRACE_1("remove old",_oldUnit getVariable QGVAR(animHandler));
+
     _oldUnit enableStamina true;
     _oldUnit removeEventHandler ["AnimChanged", _oldUnit getVariable [QGVAR(animHandler), -1]];
     _oldUnit setVariable [QGVAR(animHandler), nil];
-    TRACE_1("remove old",_oldUnit getVariable QGVAR(animHandler));
 
     _oldUnit setVariable [QGVAR(ae1Reserve), GVAR(ae1Reserve)];
     _oldUnit setVariable [QGVAR(ae2Reserve), GVAR(ae2Reserve)];
     _oldUnit setVariable [QGVAR(anReserve), GVAR(anReserve)];
     _oldUnit setVariable [QGVAR(anFatigue), GVAR(anFatigue)];
     _oldUnit setVariable [QGVAR(muscleDamage), GVAR(muscleDamage)];
+    _oldUnit setVariable [QGVAR(respiratoryRate), GVAR(respiratoryRate)];
 };
 
 _newUnit enableStamina false;
@@ -38,6 +42,7 @@ if (_newUnit getVariable [QGVAR(animHandler), -1] == -1) then {
     private _animHandler = _newUnit addEventHandler ["AnimChanged", {
         GVAR(animDuty) = _this call FUNC(getAnimDuty);
     }];
+
     TRACE_1("add new",_animHandler);
     _newUnit setVariable [QGVAR(animHandler), _animHandler];
 };
@@ -47,18 +52,27 @@ GVAR(ae2Reserve)      = _newUnit getVariable [QGVAR(ae2Reserve), AE2_MAXRESERVE]
 GVAR(anReserve)       = _newUnit getVariable [QGVAR(anReserve), AN_MAXRESERVE];
 GVAR(anFatigue)       = _newUnit getVariable [QGVAR(anFatigue), 0];
 GVAR(muscleDamage)    = _newUnit getVariable [QGVAR(muscleDamage), 0];
+GVAR(respiratoryRate) = _newUnit getVariable [QGVAR(respiratoryRate), 0];
 
 // Clean variables for respawning units
 {
     _newUnit setVariable [_x, nil];
-} forEach [QGVAR(ae1Reserve), QGVAR(ae2Reserve), QGVAR(anReserve), QGVAR(anFatigue), QGVAR(muscleDamage)];
+} forEach [QGVAR(ae1Reserve), QGVAR(ae2Reserve), QGVAR(anReserve), QGVAR(anFatigue), QGVAR(muscleDamage), QGVAR(respiratoryRate)];
 
 GVAR(VO2Max)          = 35 + 20 * (_newUnit getVariable [QGVAR(performanceFactor), GVAR(performanceFactor)]);
-GVAR(VO2MaxPower)     = GVAR(VO2Max) * SIM_BODYMASS * 0.23 * JOULES_PER_ML_O2 / 60;
+GVAR(VO2MaxPower)     = GVAR(VO2Max) * SIM_BODYMASS * BIOMECH_EFFICIENCY * JOULES_PER_ML_O2 / 60;
 GVAR(peakPower)       = VO2MAX_STRENGTH * GVAR(VO2MaxPower);
 
-GVAR(ae1PathwayPower) = GVAR(peakPower) / (13.3 + 16.7 + 113.3) * 13.3 * ANTPERCENT ^ 1.28 * 1.362;
-GVAR(ae2PathwayPower) = GVAR(peakPower) / (13.3 + 16.7 + 113.3) * 16.7 * ANTPERCENT ^ 1.28 * 1.362;
+GVAR(ae1PathwayPower) = GVAR(peakPower) / (AE1_ATP_RELEASE_RATE + AE2_ATP_RELEASE_RATE + AN_ATP_RELEASE_RATE) * AE1_ATP_RELEASE_RATE * ANTPERCENT ^ 1.28 * 1.362;
+GVAR(ae2PathwayPower) = GVAR(peakPower) / (AE1_ATP_RELEASE_RATE + AE2_ATP_RELEASE_RATE + AN_ATP_RELEASE_RATE) * AE2_ATP_RELEASE_RATE * ANTPERCENT ^ 1.28 * 1.362;
+GVAR(aePathwayPower)  = GVAR(ae1PathwayPower) + GVAR(ae2PathwayPower);
+GVAR(anPathwayPower)  = GVAR(peakPower) - GVAR(aePathwayPower);
+
+GVAR(aeWattsPerATP)   = GVAR(ae1PathwayPower) / AE1_ATP_RELEASE_RATE;
+GVAR(anWattsPerATP)   = GVAR(anPathwayPower) / AN_ATP_RELEASE_RATE;
+
+GVAR(respiratoryBufferDivisor) = (RESPIRATORY_BUFFER - 1) / RESPIRATORY_BUFFER;
+GVAR(maxPowerFatigueRatio) = 0.057 / GVAR(peakPower);
 
 GVAR(ppeBlackoutLast) = 100;
 GVAR(lastBreath)      = 0;
diff --git a/addons/advanced_fatigue/functions/fnc_mainLoop.sqf b/addons/advanced_fatigue/functions/fnc_mainLoop.sqf
index da469b6d21..a07abae794 100644
--- a/addons/advanced_fatigue/functions/fnc_mainLoop.sqf
+++ b/addons/advanced_fatigue/functions/fnc_mainLoop.sqf
@@ -1,6 +1,6 @@
 #include "..\script_component.hpp"
 /*
- * Author: BaerMitUmlaut
+ * Author: BaerMitUmlaut, ulteq
  * Main looping function that updates fatigue values.
  *
  * Arguments:
@@ -17,73 +17,131 @@
 
 // Dead people don't breathe, will also handle null (map intros)
 if (!alive ACE_player) exitWith {
-    [FUNC(mainLoop), [], 1] call CBA_fnc_waitAndExecute;
+    [LINKFUNC(mainLoop), [], 1] call CBA_fnc_waitAndExecute;
+
     private _staminaBarContainer = uiNamespace getVariable [QGVAR(staminaBarContainer), controlNull];
     _staminaBarContainer ctrlSetFade 1;
     _staminaBarContainer ctrlCommit 1;
 };
 
-
-private _oxygen = 0.9; // Default AF oxygen saturation
-if (GVAR(medicalLoaded) && {EGVAR(medical_vitals,simulateSpo2)}) then {
-    _oxygen = (ACE_player getVariable [QEGVAR(medical,spo2), 97]) / 100;
-};
+private _velocity = velocity ACE_player;
+private _normal = surfaceNormal (getPosWorld ACE_player);
+private _movementVector = vectorNormalized _velocity;
+private _sideVector = vectorNormalized (_movementVector vectorCrossProduct _normal);
+private _fwdAngle = asin (_movementVector select 2);
+private _sideAngle = asin (_sideVector select 2);
 
 private _currentWork = REE;
-private _currentSpeed = (vectorMagnitude (velocity ACE_player)) min 6;
+private _currentSpeed = (vectorMagnitude _velocity) min 6;
 
 // fix #4481. Diving to the ground is recorded as PRONE stance with running speed velocity. Cap maximum speed to fix.
 if (GVAR(isProne)) then {
     _currentSpeed = _currentSpeed min 1.5;
 };
 
-if ((vehicle ACE_player == ACE_player) && {_currentSpeed > 0.1} && {isTouchingGround ACE_player || {underwater ACE_player}}) then {
-    _currentWork = [ACE_player, _currentSpeed] call FUNC(getMetabolicCosts);
+// Get the current duty
+private _duty = GVAR(animDuty);
+
+{
+    if (_x isEqualType 0) then {
+        _duty = _duty * _x;
+    } else {
+        _duty = _duty * (ACE_player call _x);
+    };
+} forEach (values GVAR(dutyList));
+
+private _terrainGradient = abs _fwdAngle;
+private _terrainFactor = 1;
+private _gearMass = 0 max (((ACE_player getVariable [QEGVAR(movement,totalLoad), loadAbs ACE_player]) / 22.046 - UNDERWEAR_WEIGHT) * GVAR(loadFactor));
+
+if (isNull objectParent ACE_player && {_currentSpeed > 0.1} && {isTouchingGround ACE_player || {underwater ACE_player}}) then {
+    if (!GVAR(isSwimming)) then {
+        // If the unit is going downhill, it's much less demanding
+        if (_fwdAngle < 0) then {
+            _terrainGradient = 0.15 * _terrainGradient;
+        };
+
+        // Used to simulate the unevenness/roughness of the terrain
+        if ((getPosATL ACE_player) select 2 < 0.01) then {
+            private _sideGradient = abs (_sideAngle / 45) min 1;
+
+            _terrainFactor = 1 + _sideGradient ^ 4;
+        };
+    };
+
+    _currentWork = [_duty, _gearMass, _terrainGradient * GVAR(terrainGradientFactor), _terrainFactor, _currentSpeed] call FUNC(getMetabolicCosts);
     _currentWork = _currentWork max REE;
 };
 
+// Oxygen calculation
+private _oxygen =  if (GETEGVAR(medical,enabled,false) && {EGVAR(medical_vitals,simulateSpo2)}) then { // Defer to medical
+    (ACE_player getVariable [QEGVAR(medical,spo2), 97]) / 100
+} else {
+    1 - 0.131 * GVAR(respiratoryRate) ^ 2 // Default AF oxygen saturation
+};
 // Calculate muscle damage increase
-// Note: Muscle damage recovery is ignored as it takes multiple days
-GVAR(muscleDamage) = (GVAR(muscleDamage) + (_currentWork / GVAR(peakPower)) ^ 3.2 * 0.00004) min 1;
-private _muscleIntegritySqrt = sqrt (1 - GVAR(muscleDamage));
+GVAR(muscleDamage) = GVAR(muscleDamage) + (_currentWork / GVAR(peakPower)) ^ 3.2 * MUSCLE_TEAR_RATE;
+
+// Calculate muscle damage recovery
+GVAR(muscleDamage) = 0 max (GVAR(muscleDamage) - MUSCLE_RECOVERY * GVAR(recoveryFactor)) min 1;
+private _muscleIntegrity = 1 - GVAR(muscleDamage);
+private _muscleFactor = sqrt _muscleIntegrity;
 
 // Calculate available power
-private _ae1PathwayPowerFatigued = GVAR(ae1PathwayPower) * sqrt (GVAR(ae1Reserve) / AE1_MAXRESERVE) * _oxygen * _muscleIntegritySqrt;
-private _ae2PathwayPowerFatigued = GVAR(ae2PathwayPower) * sqrt (GVAR(ae2Reserve) / AE2_MAXRESERVE) * _oxygen * _muscleIntegritySqrt;
+private _ae1PathwayPowerFatigued = GVAR(ae1PathwayPower) * sqrt (GVAR(ae1Reserve) / AE1_MAXRESERVE) * _oxygen * _muscleFactor;
+private _ae2PathwayPowerFatigued = GVAR(ae2PathwayPower) * sqrt (GVAR(ae2Reserve) / AE2_MAXRESERVE) * _oxygen * _muscleFactor;
+private _aePathwayPowerFatigued  = _ae1PathwayPowerFatigued + _ae2PathwayPowerFatigued;
+private _anPathwayPowerFatigued  = GVAR(anPathwayPower) * sqrt (GVAR(anReserve) / AN_MAXRESERVE) * _oxygen * _muscleIntegrity;
 
 // Calculate how much power is consumed from each reserve
 private _ae1Power = _currentWork min _ae1PathwayPowerFatigued;
-private _ae2Power = ((_currentWork - _ae1Power) max 0) min _ae2PathwayPowerFatigued;
-private _anPower  = (_currentWork - _ae1Power - _ae2Power) max 0;
+private _ae2Power = (_currentWork - _ae1Power) min _ae2PathwayPowerFatigued;
+private _anPower  = 0 max (_currentWork - _ae1Power - _ae2Power);
 
 // Remove ATP from reserves for current work
-GVAR(ae1Reserve) = GVAR(ae1Reserve) - _ae1Power / WATTSPERATP;
-GVAR(ae2Reserve) = GVAR(ae2Reserve) - _ae2Power / WATTSPERATP;
-GVAR(anReserve)  = GVAR(anReserve)  -  _anPower / WATTSPERATP;
-// Increase anearobic fatigue
-GVAR(anFatigue)  = GVAR(anFatigue) + _anPower * (0.057 / GVAR(peakPower)) * 1.1;
+GVAR(ae1Reserve) = 0 max (GVAR(ae1Reserve) - _ae1Power / GVAR(aeWattsPerATP));
+GVAR(ae2Reserve) = 0 max (GVAR(ae2Reserve) - _ae2Power / GVAR(aeWattsPerATP));
+GVAR(anReserve)  = 0 max (GVAR(anReserve)  -  _anPower / GVAR(anWattsPerATP));
+
+// Acidosis accumulation
+GVAR(anFatigue)  = GVAR(anFatigue) + _anPower * GVAR(maxPowerFatigueRatio) * 1.1;
 
 // Aerobic ATP reserve recovery
-GVAR(ae1Reserve) = ((GVAR(ae1Reserve) + _oxygen * 6.60 * (GVAR(ae1PathwayPower) - _ae1Power) / GVAR(ae1PathwayPower) * GVAR(recoveryFactor)) min AE1_MAXRESERVE) max 0;
-GVAR(ae2Reserve) = ((GVAR(ae2Reserve) + _oxygen * 5.83 * (GVAR(ae2PathwayPower) - _ae2Power) / GVAR(ae2PathwayPower) * GVAR(recoveryFactor)) min AE2_MAXRESERVE) max 0;
+GVAR(ae1Reserve) = (GVAR(ae1Reserve) + _oxygen * GVAR(recoveryFactor) * AE1_ATP_RECOVERY * (GVAR(ae1PathwayPower) - _ae1Power) / GVAR(ae1PathwayPower)) min AE1_MAXRESERVE;
+GVAR(ae2Reserve) = (GVAR(ae2Reserve) + _oxygen * GVAR(recoveryFactor) * AE2_ATP_RECOVERY * (GVAR(ae2PathwayPower) - _ae2Power) / GVAR(ae2PathwayPower)) min AE2_MAXRESERVE;
 
-// Anaerobic ATP reserver and fatigue recovery
-GVAR(anReserve) = ((GVAR(anReserve)
-    + (_ae1PathwayPowerFatigued + _ae2PathwayPowerFatigued - _ae1Power - _ae2Power) / GVAR(VO2MaxPower) * 56.7 * GVAR(anFatigue) ^ 2 * GVAR(recoveryFactor)
-) min AN_MAXRESERVE) max 0;
+private _aeSurplus = _ae1PathwayPowerFatigued + _ae2PathwayPowerFatigued - _ae1Power - _ae2Power;
 
-GVAR(anFatigue) = ((GVAR(anFatigue)
-    - (_ae1PathwayPowerFatigued + _ae2PathwayPowerFatigued - _ae1Power - _ae2Power) * (0.057 / GVAR(peakPower)) * GVAR(anFatigue) ^ 2 * GVAR(recoveryFactor)
-) min 1) max 0;
+// Anaerobic ATP reserve recovery
+GVAR(anReserve) = 0 max (GVAR(anReserve) + _aeSurplus / GVAR(VO2MaxPower) * AN_ATP_RECOVERY * GVAR(recoveryFactor) * (GVAR(anFatigue) max linearConversion [AN_MAXRESERVE, 0, GVAR(anReserve), 0, 0.75, true]) ^ 2) min AN_MAXRESERVE; // max linearConversion ensures that if GVAR(anFatigue) is very low, it will still regenerate reserves
+// Acidosis recovery
+GVAR(anFatigue) = 0 max (GVAR(anFatigue) - _aeSurplus * GVAR(maxPowerFatigueRatio) * GVAR(recoveryFactor) * GVAR(anFatigue) ^ 2) min 1;
 
+// Respiratory rate decrease
+GVAR(respiratoryRate) = GVAR(respiratoryRate) * GVAR(respiratoryBufferDivisor);
+
+// Respiratory rate increase
+private _aePowerRatio = (GVAR(aePathwayPower) / _aePathwayPowerFatigued) min 2;
+private _respiratorySampleDivisor = 1 / (RESPIRATORY_BUFFER * 4.72 * GVAR(VO2Max));
+GVAR(respiratoryRate) = (GVAR(respiratoryRate) + _currentWork * _respiratorySampleDivisor * _aePowerRatio) min 1;
+
+// Calculate a pseudo-perceived fatigue, which is used for effects
 GVAR(aeReservePercentage) = (GVAR(ae1Reserve) / AE1_MAXRESERVE + GVAR(ae2Reserve) / AE2_MAXRESERVE) / 2;
 GVAR(anReservePercentage) = GVAR(anReserve) / AN_MAXRESERVE;
 private _perceivedFatigue = 1 - (GVAR(anReservePercentage) min GVAR(aeReservePercentage));
 
-[ACE_player, _perceivedFatigue, _currentSpeed, GVAR(anReserve) == 0] call FUNC(handleEffects);
+#ifdef DEBUG_MODE_FULL
+systemChat format ["---- muscleDamage: %1 ----", GVAR(muscleDamage) toFixed 8];
+systemChat format ["---- ae2: %1 - an: %2 ----", (GVAR(ae2Reserve) / AE2_MAXRESERVE) toFixed 2, (GVAR(anReserve) / AN_MAXRESERVE) toFixed 2];
+systemChat format ["---- anFatigue: %1 - perceivedFatigue: %2 ----", GVAR(anFatigue) toFixed 2, _perceivedFatigue toFixed 2];
+systemChat format ["---- velocity %1 - respiratoryRate: %2 ----", (vectorMagnitude _velocity) toFixed 2, GVAR(respiratoryRate) toFixed 2];
+// systemChat format ["---- aePower: %1 ----", _aePathwayPowerFatigued toFixed 1];
+#endif
+
+[ACE_player, _perceivedFatigue, GVAR(anReserve) == 0, _fwdAngle, _sideAngle] call FUNC(handleEffects);
 
 if (GVAR(enableStaminaBar)) then {
     [GVAR(anReserve) / AN_MAXRESERVE] call FUNC(handleStaminaBar);
 };
 
-[FUNC(mainLoop), [], 1] call CBA_fnc_waitAndExecute;
+[LINKFUNC(mainLoop), [], 1] call CBA_fnc_waitAndExecute;
diff --git a/addons/advanced_fatigue/functions/fnc_renderDebugLines.sqf b/addons/advanced_fatigue/functions/fnc_renderDebugLines.sqf
new file mode 100644
index 0000000000..3826637b9e
--- /dev/null
+++ b/addons/advanced_fatigue/functions/fnc_renderDebugLines.sqf
@@ -0,0 +1,40 @@
+#include "..\script_component.hpp"
+/*
+ * Author: ulteq
+ * Draw lines for debugging.
+ *
+ * Arguments:
+ * None
+ *
+ * Return Value:
+ * None
+ *
+ * Example:
+ * call ace_advanced_fatigue_fnc_renderDebugLines
+ *
+ * Public: No
+ */
+
+addMissionEventHandler ["Draw3D", {
+    private _normal = surfaceNormal (getPosWorld ACE_player);
+    private _beg = (getPosWorld ACE_player) vectorAdd (_normal vectorMultiply 0.5);
+    private _end = _beg vectorAdd (_normal vectorMultiply 2);
+    drawLine3D [ASLToATL _beg, ASLToATL _end, [0, 1, 0, 1]];
+
+    private _side = vectorNormalized (_normal vectorCrossProduct [0, 0, 1]);
+    private _end = _beg vectorAdd (_side vectorMultiply 2);
+    drawLine3D [ASLToATL _beg, ASLToATL _end, [0, 0, 1, 1]];
+
+    private _up = vectorNormalized (_normal vectorCrossProduct _side);
+    private _end = _beg vectorAdd (_up vectorMultiply 2);
+    drawLine3D [ASLToATL _beg, ASLToATL _end, [1, 0, 0, 1]];
+
+    private _movementVector = vectorNormalized (velocity ACE_player);
+    private _end = _beg vectorAdd (_movementVector vectorMultiply 2);
+    drawLine3D [ASLToATL _beg, ASLToATL _end, [1, 1, 0, 1]];
+
+    private _sideVector = vectorNormalized (_movementVector vectorCrossProduct _normal);
+    _sideVector set [2, 0];
+    private _end = _beg vectorAdd (_sideVector vectorMultiply 2);
+    drawLine3D [ASLToATL _beg, ASLToATL _end, [0, 1, 1, 1]];
+}];
diff --git a/addons/advanced_fatigue/initSettings.inc.sqf b/addons/advanced_fatigue/initSettings.inc.sqf
index 9952a51d23..01eba8652d 100644
--- a/addons/advanced_fatigue/initSettings.inc.sqf
+++ b/addons/advanced_fatigue/initSettings.inc.sqf
@@ -4,12 +4,14 @@
     [LSTRING(Enabled), LSTRING(Enabled_Description)],
     LSTRING(DisplayName),
     true,
-    true, {
+    1,
+    {
         if (!_this) then {
             private _staminaBarContainer = uiNamespace getVariable [QGVAR(staminaBarContainer), controlNull];
             _staminaBarContainer ctrlSetFade 1;
             _staminaBarContainer ctrlCommit 0;
         };
+
         [QGVAR(enabled), _this] call EFUNC(common,cbaSettings_settingChanged)
     },
     true // Needs mission restart
@@ -21,7 +23,8 @@
     [LSTRING(EnableStaminaBar), LSTRING(EnableStaminaBar_Description)],
     LSTRING(DisplayName),
     true,
-    true, {
+    1,
+    {
         if (!_this) then {
             private _staminaBarContainer = uiNamespace getVariable [QGVAR(staminaBarContainer), controlNull];
             _staminaBarContainer ctrlSetFade 1;
@@ -36,7 +39,8 @@
     [LSTRING(FadeStaminaBar), LSTRING(FadeStaminaBar_Description)],
     LSTRING(DisplayName),
     true,
-    false, {
+    0,
+    {
         if (!_this && GVAR(enabled) && GVAR(enableStaminaBar)) then {
             private _staminaBarContainer = uiNamespace getVariable [QGVAR(staminaBarContainer), controlNull];
             _staminaBarContainer ctrlSetFade 0;
@@ -50,8 +54,14 @@
     "SLIDER",
     [LSTRING(PerformanceFactor), LSTRING(PerformanceFactor_Description)],
     LSTRING(DisplayName),
-    [0, 5, 1, 1],
-    true
+    [0, 10, 1, 2],
+    1,
+    {
+        // Recalculate values if the setting is changed mid-mission
+        if (GVAR(enabled) && hasInterface && !isNull ACE_player) then {
+            [ACE_player, ACE_player] call FUNC(handlePlayerChanged);
+        };
+    }
 ] call CBA_fnc_addSetting;
 
 [
@@ -59,8 +69,8 @@
     "SLIDER",
     [LSTRING(RecoveryFactor), LSTRING(RecoveryFactor_Description)],
     LSTRING(DisplayName),
-    [0, 5, 1, 1],
-    true
+    [0, 10, 1, 2],
+    1
 ] call CBA_fnc_addSetting;
 
 [
@@ -68,8 +78,8 @@
     "SLIDER",
     [LSTRING(LoadFactor), LSTRING(LoadFactor_Description)],
     LSTRING(DisplayName),
-    [0, 5, 1, 1],
-    true
+    [0, 5, 1, 2],
+    1
 ] call CBA_fnc_addSetting;
 
 [
@@ -77,6 +87,6 @@
     "SLIDER",
     [LSTRING(TerrainGradientFactor), LSTRING(TerrainGradientFactor_Description)],
     LSTRING(DisplayName),
-    [0, 5, 1, 1],
-    true
+    [0, 5, 1, 2],
+    1
 ] call CBA_fnc_addSetting;
diff --git a/addons/advanced_fatigue/script_component.hpp b/addons/advanced_fatigue/script_component.hpp
index fcc8abd3c0..7e3255439f 100644
--- a/addons/advanced_fatigue/script_component.hpp
+++ b/addons/advanced_fatigue/script_component.hpp
@@ -16,14 +16,28 @@
 
 #include "\z\ace\addons\main\script_macros.hpp"
 
+#define UNDERWEAR_WEIGHT 3.5
+
 #define ANTPERCENT 0.8
 #define SIM_BODYMASS 70
 #define JOULES_PER_ML_O2 20.9
 #define VO2MAX_STRENGTH 4.1
-#define REE 18.83 //((0.5617 * SIM_BODYMASS + 42.57) * 0.23)
-#define OXYGEN 0.9
-#define WATTSPERATP 7
+#define BIOMECH_EFFICIENCY 0.23
+#define REE 18.83 // ((0.5617 * SIM_BODYMASS + 42.57) * BIOMECH_EFFICIENCY)
 
-#define AE1_MAXRESERVE 4000000
-#define AE2_MAXRESERVE   84000
-#define AN_MAXRESERVE     2300
+#define RESPIRATORY_BUFFER 60
+
+#define MUSCLE_TEAR_RATE 0.00004
+#define MUSCLE_RECOVERY 0.00000386
+
+#define AE1_ATP_RELEASE_RATE 13.3 // mmol
+#define AE2_ATP_RELEASE_RATE 16.7 // mmol
+#define AN_ATP_RELEASE_RATE 113.3 // mmol
+
+#define AE1_ATP_RECOVERY 6.60 // mmol
+#define AE2_ATP_RECOVERY 5.83 // mmol
+#define AN_ATP_RECOVERY 56.70 // mmol
+
+#define AE1_MAXRESERVE 4000000 // mmol
+#define AE2_MAXRESERVE   84000 // mmol
+#define AN_MAXRESERVE     2300 // mmol
diff --git a/addons/advanced_throwing/XEH_postInit.sqf b/addons/advanced_throwing/XEH_postInit.sqf
index 774c99b3e6..d91129b025 100644
--- a/addons/advanced_throwing/XEH_postInit.sqf
+++ b/addons/advanced_throwing/XEH_postInit.sqf
@@ -10,20 +10,10 @@ if (!hasInterface) exitWith {};
 // Temporary Wind Info indication
 GVAR(tempWindInfo) = false;
 
-// Ammo/Magazines look-up hash for correctness of initSpeed
-GVAR(ammoMagLookup) = call CBA_fnc_createNamespace;
-{
-    {
-        private _ammo = getText (configFile >> "CfgMagazines" >> _x >> "ammo");
-        if (_ammo != "") then { GVAR(ammoMagLookup) setVariable [_ammo, _x]; };
-    } forEach (getArray (configFile >> "CfgWeapons" >> "Throw" >> _x >> "magazines"));
-} forEach getArray (configFile >> "CfgWeapons" >> "Throw" >> "muzzles");
-
-
 // Add keybinds
 ["ACE3 Weapons", QGVAR(prepare), localize LSTRING(Prepare), {
     // Condition
-    if (!([ACE_player] call FUNC(canPrepare))) exitWith {false};
+    if !([ACE_player] call FUNC(canPrepare)) exitWith {false};
     if (EGVAR(common,isReloading)) exitWith {true};
 
     // Statement
diff --git a/addons/advanced_throwing/XEH_preStart.sqf b/addons/advanced_throwing/XEH_preStart.sqf
index 022888575e..efd2ca1f7e 100644
--- a/addons/advanced_throwing/XEH_preStart.sqf
+++ b/addons/advanced_throwing/XEH_preStart.sqf
@@ -1,3 +1,21 @@
 #include "script_component.hpp"
 
 #include "XEH_PREP.hpp"
+
+// Ammo/Magazines look-up hash for correctness of initSpeed
+private _cfgMagazines = configFile >> "CfgMagazines";
+private _cfgAmmo = configFile >> "CfgAmmo";
+private _cfgThrow = configFile >> "CfgWeapons" >> "Throw";
+
+private _ammoMagLookup = createHashMap;
+
+{
+    {
+        private _ammo = getText (_cfgMagazines >> _x >> "ammo");
+        if (_ammo != "") then {
+            _ammoMagLookup set [configName (_cfgAmmo >> _ammo), _x];
+        };
+    } forEach (getArray (_cfgThrow >> _x >> "magazines"));
+} forEach (getArray (_cfgThrow >> "muzzles"));
+
+uiNamespace setVariable [QGVAR(ammoMagLookup), compileFinal _ammoMagLookup];
diff --git a/addons/advanced_throwing/functions/fnc_drawThrowable.sqf b/addons/advanced_throwing/functions/fnc_drawThrowable.sqf
index 5bc3f22b57..f85c33dbde 100644
--- a/addons/advanced_throwing/functions/fnc_drawThrowable.sqf
+++ b/addons/advanced_throwing/functions/fnc_drawThrowable.sqf
@@ -43,13 +43,10 @@ if ((!_primed) && {!((_throwableMag in (uniformItems ACE_player)) || {_throwable
 
 // Get correct throw power for primed grenade
 if (_primed) then {
-    private _ammoType = typeOf _activeThrowable;
-    _throwableMag = GVAR(ammoMagLookup) getVariable _ammoType;
-    if (isNil "_throwableMag") then {
-        // What we're trying to throw must not be a normal throwable because it is not in our lookup hash (e.g. 40mm smoke)
-        // Just use HandGrenade as it has an average initSpeed value
-        _throwableMag = "HandGrenade";
-    };
+    // If ammo type is not found:
+    // What we're trying to throw must not be a normal throwable because it is not in our lookup hash (e.g. 40mm smoke)
+    // Just use HandGrenade as it has an average initSpeed value
+    _throwableMag = (uiNamespace getVariable QGVAR(ammoMagLookup)) getOrDefault [typeOf _activeThrowable, "HandGrenade"];
 };
 
 // Some throwables have different classname for magazine and ammo
diff --git a/addons/advanced_throwing/functions/fnc_prepare.sqf b/addons/advanced_throwing/functions/fnc_prepare.sqf
index 3008b8e540..c158ad5150 100644
--- a/addons/advanced_throwing/functions/fnc_prepare.sqf
+++ b/addons/advanced_throwing/functions/fnc_prepare.sqf
@@ -21,7 +21,7 @@ TRACE_1("params",_unit);
 // Select next throwable if one already in hand
 if (_unit getVariable [QGVAR(inHand), false]) exitWith {
     TRACE_1("inHand",_unit);
-    if (!(_unit getVariable [QGVAR(primed), false])) then {
+    if !(_unit getVariable [QGVAR(primed), false]) then {
         TRACE_1("not primed",_unit);
         // Restore muzzle ammo (setAmmo 1 has no impact if no appliccable throwable in inventory)
         // selectNextGrenade relies on muzzles array (setAmmo 0 removes the muzzle from the array and current can't be found, cycles between 0 and 1 muzzles)
diff --git a/addons/advanced_throwing/functions/fnc_throw.sqf b/addons/advanced_throwing/functions/fnc_throw.sqf
index 797f18d773..d6b38a6a0c 100644
--- a/addons/advanced_throwing/functions/fnc_throw.sqf
+++ b/addons/advanced_throwing/functions/fnc_throw.sqf
@@ -20,7 +20,7 @@ TRACE_1("params",_unit);
 
 // Prime the throwable if it hasn't been cooking already
 // Next to proper simulation this also has to happen before delay for orientation of the throwable to be set
-if (!(_unit getVariable [QGVAR(primed), false])) then {
+if !(_unit getVariable [QGVAR(primed), false]) then {
     [_unit] call FUNC(prime);
 };
 
diff --git a/addons/advanced_throwing/stringtable.xml b/addons/advanced_throwing/stringtable.xml
index e0e526e12e..fc9cf2705a 100644
--- a/addons/advanced_throwing/stringtable.xml
+++ b/addons/advanced_throwing/stringtable.xml
@@ -144,7 +144,7 @@
             <English>Enables ability to pick up throwables from the ground.</English>
             <Spanish>Activa la habilidad de coger objetos lanzados del suelo</Spanish>
             <Russian>Включает возможность подбирать гранаты с земли.</Russian>
-            <Japanese>地面に落ちている投擲物を拾い上げる機能を有効化します。</Japanese>
+            <Japanese>地面に落ちている投擲物を拾う機能を有効化します。</Japanese>
             <Polish>Umożliwia podnoszenie obiektów miotanych z ziemi.</Polish>
             <German>Aktiviert die Möglichkeit, geworfene Objekte wieder vom Boden aufzuheben.</German>
             <Korean>땅에 떨어진 투척물을 주울 수 있게 해줍니다.</Korean>
@@ -174,7 +174,7 @@
             <English>Enables ability to pick up throwables from attached objects.</English>
             <Spanish>Activa la habilidad de lanzar objetos enganchados</Spanish>
             <Russian>Включает возможность подбирать гранаты, прикрепленные к объектам.</Russian>
-            <Japanese>オブジェクトに装着された投擲可能物を拾い上げる機能を有効化します。</Japanese>
+            <Japanese>オブジェクトに装着された投擲物を拾う機能を有効化します。</Japanese>
             <Polish>Umożliwia podnoszenie obiektów miotanych przyczepionych do innych obiektów.</Polish>
             <German>Aktiviert die Möglichkeit, befestigte Wurfobjekte erneut aufzunehmen.</German>
             <Korean>부착된 투척물을 주울 수 있게 해줍니다.</Korean>
@@ -254,7 +254,7 @@
             <English>Primed</English>
             <Spanish>Preparado</Spanish>
             <Russian>Подготовлена</Russian>
-            <Japanese>点火</Japanese>
+            <Japanese>を点火した</Japanese>
             <Polish>Odbezpieczony</Polish>
             <German>Scharf gemacht</German>
             <Korean>뇌관 작동</Korean>
diff --git a/addons/aircraft/functions/fnc_droneAddActions.sqf b/addons/aircraft/functions/fnc_droneAddActions.sqf
index 38ca53e4c6..895004f0e9 100644
--- a/addons/aircraft/functions/fnc_droneAddActions.sqf
+++ b/addons/aircraft/functions/fnc_droneAddActions.sqf
@@ -22,7 +22,7 @@ if (!alive _vehicle) exitWith {};
 if (_vehicle getVariable [QGVAR(droneActionsAdded), false]) exitWith {};
 _vehicle setVariable [QGVAR(droneActionsAdded), true];
 
-// move to location
+// Move to location
 private _condition = {
     params ["_vehicle"];
     (missionNamespace getVariable [QGVAR(droneWaypoints), true]) && {waypointsEnabledUAV _vehicle} && {(ACE_controlledUAV select 2) isEqualTo [0]}
@@ -37,14 +37,63 @@ private _action = [QGVAR(droneSetWaypointMove), localize "$STR_AC_MOVE",
     "\a3\3DEN\Data\CfgWaypoints\Move_ca.paa", _statement, _condition] call EFUNC(interact_menu,createAction);
 [_vehicle, 1, ["ACE_SelfActions"], _action] call EFUNC(interact_menu,addActionToObject);
 
+// Follow unit/vehicle at turret location
+_condition = {
+    params ["_vehicle"];
+    private _target = cursorTarget;
+    (missionNamespace getVariable [QGVAR(droneWaypoints), true]) && {waypointsEnabledUAV _vehicle} && {(ACE_controlledUAV select 2) isEqualTo [0]} && {!isNull _target} && {["CAManBase", "LandVehicle", "Ship"] findIf {_target isKindOf _x} != -1}
+};
+_statement = {
+    params ["_vehicle"];
+    private _group = group driver _vehicle;
+    private _pos = ([_vehicle, [0]] call FUNC(droneGetTurretTargetPos)) select 0;
+    [QGVAR(droneSetWaypoint), [_vehicle, _group, _pos, "FOLLOW", cursorTarget], _group] call CBA_fnc_targetEvent;
+    private _followDistance = _vehicle getVariable [QGVAR(wpFollowDistance), 0];
+    [[LLSTRING(DroneFollowHint), _followDistance], 3] call EFUNC(common,displayTextStructured);
+};
+_action = [QGVAR(droneSetWaypointFollow), localize "$STR_AC_FOLLOW", "\a3\3DEN\Data\CfgWaypoints\Follow_ca.paa", _statement, _condition] call EFUNC(interact_menu,createAction);
+[_vehicle, 1, ["ACE_SelfActions"], _action] call EFUNC(interact_menu,addActionToObject);
+
+// Set drone follow distance
+_condition = {
+    params ["_vehicle"];
+    private _group = group driver _vehicle;
+    private _index = (currentWaypoint _group) min count waypoints _group;
+    private _waypoint = [_group, _index];
+    (missionNamespace getVariable [QGVAR(droneWaypoints), true]) && {waypointsEnabledUAV _vehicle} && {(ACE_controlledUAV select 2) isEqualTo [0]} && {(waypointType _waypoint) == "HOLD"}
+};
+_statement = {
+    params ["_vehicle", "", "_value"];
+    _vehicle setVariable [QGVAR(wpFollowDistance), _value];
+    [[LLSTRING(DroneFollowHint), _value], 3] call EFUNC(common,displayTextStructured);
+};
+_action = [QGVAR(droneSetFollowDistance), LLSTRING(DroneFollowDistance), "", {}, _condition] call EFUNC(interact_menu,createAction);
+private _base = [_vehicle, 1, ["ACE_SelfActions"], _action] call EFUNC(interact_menu,addActionToObject);
+private _followDistances = if (_vehicle isKindOf "Car_F") then {
+    [0, 25, 50, 100, 200]
+} else {
+    [0, 100, 200, 300, 400, 500]
+};
+{
+    _action = [
+        QGVAR(droneSetFollowDistance_) + str _x,
+        str _x,
+        "",
+        _statement,
+        {true},
+        {},
+        _x
+    ] call EFUNC(interact_menu,createAction);
+    [_vehicle, 1, _base, _action] call EFUNC(interact_menu,addActionToObject);
+} forEach _followDistances;
 
 if (_vehicle isKindOf "Air") then {
-    // loiter at location
+    // Loiter at location
     _condition = {
         params ["_vehicle"];
         (missionNamespace getVariable [QGVAR(droneWaypoints), true]) && {waypointsEnabledUAV _vehicle} && {(ACE_controlledUAV select 2) isEqualTo [0]}
     };
-    _statement = {        
+    _statement = {
         params ["_vehicle"];
         private _group = group driver _vehicle;
         private _pos = ([_vehicle, [0]] call FUNC(droneGetTurretTargetPos)) select 0;
@@ -55,7 +104,7 @@ if (_vehicle isKindOf "Air") then {
     [_vehicle, 1, ["ACE_SelfActions"], _action] call EFUNC(interact_menu,addActionToObject);
 
 
-    // set height
+    // Set height
     _condition = {
         params ["_vehicle"];
         (missionNamespace getVariable [QGVAR(droneWaypoints), true]) && {waypointsEnabledUAV _vehicle} && {(ACE_controlledUAV select 2) isEqualTo [0]}
@@ -74,7 +123,7 @@ if (_vehicle isKindOf "Air") then {
     } forEach [20, 50, 200, 500, 2000];
 
 
-    // set loiter radius
+    // Set loiter radius
     _condition = {
         params ["_vehicle"];
         private _group = group driver _vehicle;
@@ -97,7 +146,7 @@ if (_vehicle isKindOf "Air") then {
     } forEach [500, 750, 1000, 1250, 1500];
 
 
-    // set loiter direction
+    // Set loiter direction
     _condition = {
         params ["_vehicle", "", "_args"];
         private _group = group driver _vehicle;
diff --git a/addons/aircraft/functions/fnc_droneSetWaypoint.sqf b/addons/aircraft/functions/fnc_droneSetWaypoint.sqf
index 5ffbbae825..953b99a357 100644
--- a/addons/aircraft/functions/fnc_droneSetWaypoint.sqf
+++ b/addons/aircraft/functions/fnc_droneSetWaypoint.sqf
@@ -8,6 +8,7 @@
  * 1: Group <GROUP>
  * 2: Pos 2D <ARRAY>
  * 3: Type <STRING>
+ * 4: Target to follow <OBJECT> (default: objNull)
  *
  * Return Value:
  * None
@@ -18,7 +19,7 @@
  * Public: No
  */
 
-params ["_vehicle", "_group", "_pos", "_type"];
+params ["_vehicle", "_group", "_pos", "_type", ["_target", objNull]];
 TRACE_4("droneSetWaypoint",_vehicle,_group,_pos,_type);
 
 private _index = (currentWaypoint _group) min count waypoints _group;
@@ -34,9 +35,34 @@ _pos set [
     [0, _currentHeight] select (_currentHeight >= 50)
 ];
 
-// [_group] call CBA_fnc_clearWaypoints;
 _waypoint = _group addWaypoint [_pos, 0];
-_waypoint setWaypointType _type;
+// The Vanilla "FOLLOW"-type waypoint is not used directly, due to 2 main issues (as of v2.16):
+// - It does not work at all for UGVs, which is a known issue https://feedback.bistudio.com/T126283;
+// - No clear scripting way was found to mimic the UAV Terminal's "Follow Distance" functionality;
+// Instead, the solution for both UAV and UGV following consists of a CBA PFH that moves a "HOLD"-type Waypoint every 3 seconds.
+// Either on the target itself, or on the Drone's current position if the target is within the desired follow distance.
+if (_type == "FOLLOW" && {["CAManBase", "LandVehicle", "Ship"] findIf {_target isKindOf _x} != -1}) then {
+    _waypoint setWaypointType "HOLD";
+    [{
+        params ["_args", "_handle"];
+        _args params ["_vehicle", "_group", "_waypoint", "_target"];
+
+        if ( // Abort PFH if a new waypoint is created via UAV Terminal or ACE Interaction
+            _waypoint select 1 != currentWaypoint _group ||
+            {!alive _vehicle} || {isNull _target}
+        ) exitWith {
+            deleteWaypoint _waypoint;
+            [_handle] call CBA_fnc_removePerFrameHandler;
+        };
+
+        private _followDistance = _vehicle getVariable [QGVAR(wpFollowDistance), 0];
+        if ((_vehicle distance2D _target) < _followDistance) then {
+            _waypoint setWaypointPosition [getPosASL _vehicle, -1];
+        } else {
+            _waypoint setWaypointPosition [getPosASL _target, -1];
+        };
+    }, 3, [_vehicle, _group, _waypoint, _target]] call CBA_fnc_addPerFrameHandler;
+};
 
 TRACE_3("",_currentHeight,_currentLoiterRadius,_currentLoiterType);
 if (_currentHeight > 1) then { _vehicle flyInHeight _currentHeight; };
diff --git a/addons/aircraft/stringtable.xml b/addons/aircraft/stringtable.xml
index c0cef87756..041653fe2b 100644
--- a/addons/aircraft/stringtable.xml
+++ b/addons/aircraft/stringtable.xml
@@ -129,7 +129,7 @@
             <Japanese>30mm コンバット ミックス 4:1 劣化ウラン徹甲弾:焼夷榴弾</Japanese>
             <Czech>30mm Bojový Mix 4:1 DU:HEI</Czech>
             <Russian>30мм Смешанное боепитание 4:1 ОУ:ОФЗ</Russian>
-            <Korean>30mm 4:1 열화:고폭소이</Korean>
+            <Korean>30mm 열화우라늄:고폭소이 4:1 혼합</Korean>
             <Portuguese>30mm Mix de Combate 4:1 DU:AEI</Portuguese>
         </Key>
         <Key ID="STR_ACE_Aircraft_GatlingDescriptionShortCM41">
@@ -145,7 +145,7 @@
             <Japanese>30mm CM 4:1</Japanese>
             <Czech>30mm BM 4:1</Czech>
             <Russian>30мм СБ 4:1</Russian>
-            <Korean>30mm CM 4:1</Korean>
+            <Korean>30mm 4:1 혼합</Korean>
         </Key>
         <Key ID="STR_ACE_Aircraft_GatlingDescriptionCM51">
             <English>30mm Combat Mix 5:1 DU:HEI</English>
@@ -160,7 +160,7 @@
             <Japanese>30mm コンバット ミックス 5:1 劣化ウラン徹甲弾:焼夷榴弾</Japanese>
             <Czech>30mm Bojový Mix 5:1 DU:HEI</Czech>
             <Russian>30мм Смешанное боепитание 5:1 ОУ:ОФЗ</Russian>
-            <Korean>30mm 5:1 열화:고폭소이</Korean>
+            <Korean>30mm 열화우라늄:고폭소이 5:1 혼합</Korean>
         </Key>
         <Key ID="STR_ACE_Aircraft_GatlingDescriptionShortCM51">
             <English>30mm CM 5:1</English>
@@ -175,7 +175,21 @@
             <Japanese>30mm CM 5:1</Japanese>
             <Czech>30mm BM 5:1</Czech>
             <Russian>30мм СБ 5:1</Russian>
-            <Korean>30mm CM 5:1</Korean>
+            <Korean>30mm 5:1 혼합</Korean>
+        </Key>
+        <Key ID="STR_ACE_Aircraft_DroneFollowDistance">
+            <English>Follow Distance</English>
+            <Italian>Distanza di seguimento</Italian>
+            <German>Folge-Entfernung</German>
+            <Korean>따라가는 거리</Korean>
+            <Japanese>追跡距離</Japanese>
+        </Key>
+        <Key ID="STR_ACE_Aircraft_DroneFollowHint">
+            <English>Following unit within %1m</English>
+            <Italian>Seguendo unità entro %1m</Italian>
+            <German>Folgt Einheit bis zu %1m</German>
+            <Korean>%1m 이내로 유닛을 따라갑니다</Korean>
+            <Japanese>%1m 間隔で 目標を追跡します</Japanese>
         </Key>
     </Package>
 </Project>
diff --git a/addons/arsenal/XEH_PREP.hpp b/addons/arsenal/XEH_PREP.hpp
index 94d4739b60..d0819056f2 100644
--- a/addons/arsenal/XEH_PREP.hpp
+++ b/addons/arsenal/XEH_PREP.hpp
@@ -78,6 +78,7 @@ PREP(removeStat);
 PREP(removeVirtualItems);
 PREP(renameDefaultLoadout);
 PREP(replaceUniqueItemsLoadout);
+PREP(saveLoadout);
 PREP(scanConfig);
 PREP(showItem);
 PREP(sortPanel);
diff --git a/addons/arsenal/XEH_preInit.sqf b/addons/arsenal/XEH_preInit.sqf
index 10cc3989e9..248fc16db2 100644
--- a/addons/arsenal/XEH_preInit.sqf
+++ b/addons/arsenal/XEH_preInit.sqf
@@ -85,10 +85,10 @@ private _insigniaCondition = toString {
 
 // Ref fnc_addListBoxItem, 0/nil = configFile, 1 = campaignConfigFile, 2 = missionConfigFile
 {
-    GVAR(insigniaCache) set [_x, 1];
+    GVAR(insigniaCache) set [configName _x, 1];
 } forEach (_insigniaCondition configClasses (campaignConfigFile >> "CfgUnitInsignia"));
 {
-    GVAR(insigniaCache) set [_x, 2];
+    GVAR(insigniaCache) set [configName _x, 2];
 } forEach (_insigniaCondition configClasses (missionConfigFile >> "CfgUnitInsignia"));
 
 ADDON = true;
diff --git a/addons/arsenal/functions/fnc_onArsenalClose.sqf b/addons/arsenal/functions/fnc_onArsenalClose.sqf
index f2316bc9d5..6803d2d5de 100644
--- a/addons/arsenal/functions/fnc_onArsenalClose.sqf
+++ b/addons/arsenal/functions/fnc_onArsenalClose.sqf
@@ -18,7 +18,7 @@
 (_this select 1) params ["", "_exitCode"];
 
 [QGVAR(displayClosed), []] call CBA_fnc_localEvent;
-removeMissionEventHandler ["draw3D", GVAR(camPosUpdateHandle)];
+removeMissionEventHandler ["Draw3D", GVAR(camPosUpdateHandle)];
 
 if (is3DEN) then {
     private _centerOriginParent = objectParent GVAR(centerOrigin);
diff --git a/addons/arsenal/functions/fnc_onArsenalOpen.sqf b/addons/arsenal/functions/fnc_onArsenalOpen.sqf
index f307c932b1..0f0a5817c6 100644
--- a/addons/arsenal/functions/fnc_onArsenalOpen.sqf
+++ b/addons/arsenal/functions/fnc_onArsenalOpen.sqf
@@ -278,4 +278,4 @@ showCinemaBorder false;
 
 //--------------- Reset camera pos
 [nil, [controlNull, 0, 0]] call FUNC(handleMouse);
-GVAR(camPosUpdateHandle) = addMissionEventHandler ["draw3D", {call FUNC(updateCamPos)}];
+GVAR(camPosUpdateHandle) = addMissionEventHandler ["Draw3D", {call FUNC(updateCamPos)}];
diff --git a/addons/arsenal/functions/fnc_saveLoadout.sqf b/addons/arsenal/functions/fnc_saveLoadout.sqf
new file mode 100644
index 0000000000..05e712e45f
--- /dev/null
+++ b/addons/arsenal/functions/fnc_saveLoadout.sqf
@@ -0,0 +1,37 @@
+#include "..\script_component.hpp"
+/*
+ * Author: DartRuffian
+ * Saves a given loadout to the client's profile.
+ *
+ * Arguments:
+ * 0: Name of loadout <STRING>
+ * 1: CBA extended loadout or getUnitLoadout array <ARRAY>
+ * 2: Replace existing loadout <BOOL> (default: false)
+ *
+ * Return Value:
+ * True if loadout was saved, otherwise false <BOOL>
+ *
+ * Example:
+ * ["Current Loadout", getUnitLoadout ACE_player] call ace_arsenal_fnc_saveLoadout
+ *
+ * Public: Yes
+ */
+
+params [["_name", "", [""]], ["_loadout", [], [[]]], ["_replaceExisting", false, [false]]];
+
+if (_name == "" || {_loadout isEqualTo []}) exitWith { false };
+
+private _loadouts = profileNamespace getVariable [QGVAR(saved_loadouts), []];
+private _loadoutIndex = _loadouts findIf {(_x#0) == _name};
+
+// If a loadout with same name already exists and no overwriting enabled, quit
+if (!_replaceExisting && {_loadoutIndex != -1}) exitWith { false };
+
+if (_loadoutIndex == -1) then {
+    _loadouts pushBack [_name, _loadout];
+} else {
+    _loadouts set [_loadoutIndex, [_name, _loadout]];
+};
+
+profileNamespace setVariable [QGVAR(saved_loadouts), _loadouts];
+true
diff --git a/addons/arsenal/functions/fnc_showItem.sqf b/addons/arsenal/functions/fnc_showItem.sqf
index 7ceda5f0d5..f47f12d2bf 100644
--- a/addons/arsenal/functions/fnc_showItem.sqf
+++ b/addons/arsenal/functions/fnc_showItem.sqf
@@ -72,6 +72,6 @@ if (_nextAction != GVAR(currentAction)) then {
     GVAR(currentAction) = _nextAction;
 };
 
-if (!(GVAR(currentAction) in ["Civil", "Salute"])) then {
+if !(GVAR(currentAction) in ["Civil", "Salute"]) then {
     GVAR(center) selectWeapon ([primaryWeapon GVAR(center), secondaryWeapon GVAR(center), handgunWeapon GVAR(center), binocular GVAR(center)] select GVAR(selectedWeaponType)); // select correct weapon, prevents floating weapons
 };
diff --git a/addons/arsenal/missions/Arsenal.VR/fnc_createTarget.sqf b/addons/arsenal/missions/Arsenal.VR/fnc_createTarget.sqf
index a93611d329..502f7b888d 100644
--- a/addons/arsenal/missions/Arsenal.VR/fnc_createTarget.sqf
+++ b/addons/arsenal/missions/Arsenal.VR/fnc_createTarget.sqf
@@ -63,7 +63,7 @@ _target switchMove "amovpercmstpslowwrfldnon";
 _target setVariable ["origin", _position];
 
 // When killed, respawn AI
-_target addEventHandler ["killed", {
+_target addEventHandler ["Killed", {
     params ["_target"];
 
     // Killed may fire twice, 2nd will be null - https://github.com/acemod/ACE3/pull/7561
diff --git a/addons/arsenal/stringtable.xml b/addons/arsenal/stringtable.xml
index 25ce1f75ae..38f41ef4a6 100644
--- a/addons/arsenal/stringtable.xml
+++ b/addons/arsenal/stringtable.xml
@@ -23,7 +23,7 @@
             <French>Masque l'interface</French>
             <German>Oberfläche verstecken</German>
             <Polish>Ukryj interfejs</Polish>
-            <Japanese>インターフェースを隠す</Japanese>
+            <Japanese>インタフェースを隠す</Japanese>
             <Italian>Nascondi interfaccia</Italian>
             <Korean>인터페이스 숨기기</Korean>
             <Chinese>隱藏介面</Chinese>
@@ -1245,6 +1245,7 @@
             <Russian>Интегрирован тепловизор.</Russian>
             <Korean>열화상 내장</Korean>
             <French>Thermique intégrée</French>
+            <German>Thermal integriert</German>
             <Spanish>Térmica integrada</Spanish>
         </Key>
         <Key ID="STR_ACE_Arsenal_statVisionMode_intPrimTi">
@@ -1254,6 +1255,7 @@
             <Russian>Интегрирован тепловизор и осн.прицел.</Russian>
             <Korean>열화상과 주무기 내장</Korean>
             <French>Thermique et primaire intégrés</French>
+            <German>Thermal und in Primärwaffe integriert</German>
             <Spanish>Térmica y Primaria integrada</Spanish>
         </Key>
         <Key ID="STR_ACE_Arsenal_statVisionMode_NoSup">
diff --git a/addons/artillerytables/functions/fnc_firedEH.sqf b/addons/artillerytables/functions/fnc_firedEH.sqf
index 01947b4ebe..5aa46c6969 100644
--- a/addons/artillerytables/functions/fnc_firedEH.sqf
+++ b/addons/artillerytables/functions/fnc_firedEH.sqf
@@ -25,7 +25,7 @@
 params ["_vehicle", "", "", "", "", "_magazine", "_projectile", "_gunner"];
 TRACE_4("firedEH",_vehicle,_magazine,_projectile,_gunner);
 
-if (!([_gunner] call EFUNC(common,isPlayer))) exitWith {}; // AI don't know how to use (this does give them more range than a player)
+if !([_gunner] call EFUNC(common,isPlayer)) exitWith {}; // AI don't know how to use (this does give them more range than a player)
 if ((gunner _vehicle) != _gunner) exitWith {}; // check if primaryGunner
 
 
@@ -35,7 +35,7 @@ if (isNumber (configFile >> "CfgMagazines" >> _magazine >> QGVAR(airFriction)))
     _airFriction = getNumber (configFile >> "CfgMagazines" >> _magazine >> QGVAR(airFriction));
 };
 TRACE_1("",_airFriction);
-if (_airFriction >= 0) exitWith {}; // 0 disables everything, >0 makes no sense
+if (_airFriction == 0) exitWith {}; // 0 disables everything
 
 BEGIN_COUNTER(adjustmentsCalc);
 
@@ -60,6 +60,7 @@ if (_newMuzzleVelocityCoefficent != 1) then {
     _projectile setVelocity _bulletVelocity;
 };
 
+if (_airFriction > 0) exitWith {}; // positive value indicates it has vanilla airFriction, so we can just exit
 
 [{
     params ["_projectile", "_kFactor", "_time"];
diff --git a/addons/artillerytables/functions/fnc_interactMenuOpened.sqf b/addons/artillerytables/functions/fnc_interactMenuOpened.sqf
index b7d6371339..4ba6342fc8 100644
--- a/addons/artillerytables/functions/fnc_interactMenuOpened.sqf
+++ b/addons/artillerytables/functions/fnc_interactMenuOpened.sqf
@@ -19,7 +19,7 @@ params ["_menuType"];
 TRACE_1("interactMenuOpened",_menuType);
 
 if (_menuType != 1) exitWith {};
-if (!("ACE_artilleryTable" in (ace_player call EFUNC(common,uniqueItems)))) exitWith {};
+if !("ACE_artilleryTable" in (ace_player call EFUNC(common,uniqueItems))) exitWith {};
 
 private _vehicleAdded = ace_player getVariable [QGVAR(vehiclesAdded), []];
 private _rangeTablesShown = ace_player getVariable [QGVAR(rangeTablesShown), []];
diff --git a/addons/artillerytables/functions/fnc_rangeTableOpen.sqf b/addons/artillerytables/functions/fnc_rangeTableOpen.sqf
index 327a2903a0..508b8c894c 100644
--- a/addons/artillerytables/functions/fnc_rangeTableOpen.sqf
+++ b/addons/artillerytables/functions/fnc_rangeTableOpen.sqf
@@ -41,8 +41,15 @@ _mags = _mags apply {
     private _initSpeed = getNumber (_magCfg >> _x >> "initSpeed");
     _magParamsArray pushBackUnique _initSpeed;
     private _airFriction = 0;
-    if (_advCorrection) then {
-        _airFriction = if (isNumber (_magCfg >> _x >> QGVAR(airFriction))) then { getNumber (_magCfg >> _x >> QGVAR(airFriction)) } else { DEFAULT_AIR_FRICTION };
+    private _magAirFriction = getNumber (_magCfg >> _x >> QGVAR(airFriction));
+    if (_magAirFriction <= 0) then {
+        if (_advCorrection) then {
+            _airFriction = [DEFAULT_AIR_FRICTION, _magAirFriction] select (isNumber (_magCfg >> _x >> QGVAR(airFriction)));
+        };
+    } else {
+        // positive value, use ammo's airFriction (regardless of setting)
+        private _ammo = getText (_magCfg >> _x >> "ammo");
+        _airFriction = getNumber (configFile >> "CfgAmmo" >> _ammo >> "airFriction");
     };
     _magParamsArray pushBackUnique _airFriction;
     [getText (_magCfg >> _x >> "displayNameShort"), getText (_magCfg >> _x >> "displayName"), _initSpeed, _airFriction]
diff --git a/addons/atragmx/functions/fnc_initGunList.sqf b/addons/atragmx/functions/fnc_initGunList.sqf
index 2ae67bb78d..515bc9013e 100644
--- a/addons/atragmx/functions/fnc_initGunList.sqf
+++ b/addons/atragmx/functions/fnc_initGunList.sqf
@@ -23,7 +23,7 @@ if ((profileNamespace getVariable ["ACE_ATragMX_profileNamespaceVersion", 0]) ==
     _resetGunList = false;
     {
         // Verify each gun has correct param type
-        if (!(_x isEqualTypeArray ["", 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "", [], [], false])) exitWith {
+        if !(_x isEqualTypeArray ["", 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "", [], [], false]) exitWith {
             _resetGunList = true;
         };
     } forEach GVAR(gunList);
diff --git a/addons/atragmx/functions/fnc_read_gun_list_entries_from_config.sqf b/addons/atragmx/functions/fnc_read_gun_list_entries_from_config.sqf
index 31451c7ff8..cbbb4603e3 100644
--- a/addons/atragmx/functions/fnc_read_gun_list_entries_from_config.sqf
+++ b/addons/atragmx/functions/fnc_read_gun_list_entries_from_config.sqf
@@ -74,7 +74,7 @@ private _validate_preset = {
         ERROR(_errorMsg);
         _valid = false;
     };
-    if (!((_this select 17) in ["ASM", "ICAO"])) then {
+    if !((_this select 17) in ["ASM", "ICAO"]) then {
         private _errorMsg = format ["Invalid atmosphere model: %1", _this select 17];
         ERROR(_errorMsg);
         _valid = false;
diff --git a/addons/atragmx/functions/fnc_target_speed_assist_timer.sqf b/addons/atragmx/functions/fnc_target_speed_assist_timer.sqf
index b34dd666f2..5408edee3a 100644
--- a/addons/atragmx/functions/fnc_target_speed_assist_timer.sqf
+++ b/addons/atragmx/functions/fnc_target_speed_assist_timer.sqf
@@ -26,7 +26,7 @@ if !(ctrlVisible 9000) then {
         params ["_args"];
         _args params ["_startTime"];
 
-        if (!(GVAR(speedAssistTimer))) exitWith {
+        if !(GVAR(speedAssistTimer)) exitWith {
             GVAR(speedAssistTimer) = true;
 
             ctrlSetText [8006, Str(Round((CBA_missionTime - _startTime) * 10) / 10)];
diff --git a/addons/atragmx/functions/fnc_toggle_c1_ballistic_coefficient_data.sqf b/addons/atragmx/functions/fnc_toggle_c1_ballistic_coefficient_data.sqf
index bb581ad6ea..a8cd7ce52a 100644
--- a/addons/atragmx/functions/fnc_toggle_c1_ballistic_coefficient_data.sqf
+++ b/addons/atragmx/functions/fnc_toggle_c1_ballistic_coefficient_data.sqf
@@ -15,7 +15,7 @@
  * Public: No
  */
 
-if (!(missionNamespace getVariable [QEGVAR(advanced_ballistics,enabled), false])) exitWith {};
+if !(missionNamespace getVariable [QEGVAR(advanced_ballistics,enabled), false]) exitWith {};
 
 if (ctrlVisible 17000) then {
     false call FUNC(show_c1_ballistic_coefficient_data);
diff --git a/addons/atragmx/functions/fnc_toggle_muzzle_velocity_data.sqf b/addons/atragmx/functions/fnc_toggle_muzzle_velocity_data.sqf
index 562ef30553..34326b251d 100644
--- a/addons/atragmx/functions/fnc_toggle_muzzle_velocity_data.sqf
+++ b/addons/atragmx/functions/fnc_toggle_muzzle_velocity_data.sqf
@@ -15,7 +15,7 @@
  * Public: No
  */
 
-if (!(missionNamespace getVariable [QEGVAR(advanced_ballistics,enabled), false])) exitWith {};
+if !(missionNamespace getVariable [QEGVAR(advanced_ballistics,enabled), false]) exitWith {};
 
 if (ctrlVisible 16000) then {
     false call FUNC(show_muzzle_velocity_data);
diff --git a/addons/atragmx/functions/fnc_toggle_truing_drop.sqf b/addons/atragmx/functions/fnc_toggle_truing_drop.sqf
index 2c61b1776b..2d13619de0 100644
--- a/addons/atragmx/functions/fnc_toggle_truing_drop.sqf
+++ b/addons/atragmx/functions/fnc_toggle_truing_drop.sqf
@@ -15,7 +15,7 @@
  * Public: No
  */
 
-if (!(missionNamespace getVariable [QEGVAR(advanced_ballistics,enabled), false])) exitWith {};
+if !(missionNamespace getVariable [QEGVAR(advanced_ballistics,enabled), false]) exitWith {};
 
 if (ctrlVisible 18000) then {
     false call FUNC(show_truing_drop);
diff --git a/addons/atragmx/functions/fnc_update_zero_range.sqf b/addons/atragmx/functions/fnc_update_zero_range.sqf
index 023a5a7ee2..8a3eca1344 100644
--- a/addons/atragmx/functions/fnc_update_zero_range.sqf
+++ b/addons/atragmx/functions/fnc_update_zero_range.sqf
@@ -35,7 +35,7 @@ if (!GVAR(atmosphereModeTBH)) then {
     _relativeHumidity = 0.5;
 };
 
-private _scopeBaseAngle = if (!(missionNamespace getVariable [QEGVAR(advanced_ballistics,enabled), false])) then {
+private _scopeBaseAngle = if !(missionNamespace getVariable [QEGVAR(advanced_ballistics,enabled), false]) then {
     private _zeroAngle = "ace_advanced_ballistics" callExtension format ["calcZero:%1:%2:%3:%4", _zeroRange, _muzzleVelocity, _airFriction, _boreHeight];
     (parseNumber _zeroAngle)
 } else {
diff --git a/addons/attach/functions/fnc_handleKilled.sqf b/addons/attach/functions/fnc_handleKilled.sqf
index ef08aff305..2183b05b42 100644
--- a/addons/attach/functions/fnc_handleKilled.sqf
+++ b/addons/attach/functions/fnc_handleKilled.sqf
@@ -28,7 +28,7 @@ if (_attachedList isEqualTo []) exitWith {};
     TRACE_2("detaching",_xObject,_deadUnit);
     detach _xObject;
     //If it's a vehicle, also delete the attached
-    if (!(_deadUnit isKindOf "CAManBase")) then {
+    if !(_deadUnit isKindOf "CAManBase") then {
         _xObject setPos ((getPos _deadUnit) vectorAdd [0, 0, -1000]);
         [{deleteVehicle (_this select 0)}, [_xObject], 2] call CBA_fnc_waitAndExecute;
     };
diff --git a/addons/ballistics/stringtable.xml b/addons/ballistics/stringtable.xml
index a4c67c68d5..7137735233 100644
--- a/addons/ballistics/stringtable.xml
+++ b/addons/ballistics/stringtable.xml
@@ -1505,7 +1505,7 @@
             <Portuguese>Carregador de 10 cartuchos 9.3 mm traçantes IR-DIM</Portuguese>
             <Hungarian>9,3 mm 10-lövedékes infravörös nyomkövető tár</Hungarian>
             <Japanese>9.3mm 10Rnd IR-DIM トレーサー マガジン</Japanese>
-            <Korean>10발들이 9.3mm IR-DIM 예광탄 탄창</Korean>
+            <Korean>10발 들이 9.3mm IR-DIM 예광탄 탄창</Korean>
             <Chinese>9.3毫米 10發 低視度紅外線曳光彈 彈匣</Chinese>
             <Chinesesimp>9.3 mm 10发 弹匣（红外曳光）</Chinesesimp>
             <Turkish>9.3 mm 10Rnd Tracer IR-DIM Mag</Turkish>
@@ -1608,7 +1608,7 @@
             <Portuguese>Cinto de munição traçante 9.3 mm IR-DIM com 150 cartuchos</Portuguese>
             <Hungarian>9,3 mm 150-lövedékes infravörös nyomkövető heveder</Hungarian>
             <Japanese>9.3mm 150Rnd IR-DIM トレーサー ベルト</Japanese>
-            <Korean>150발들이 9.3mm IR-DIM 예광탄 벨트</Korean>
+            <Korean>150발 들이 9.3mm IR-DIM 예광탄 벨트</Korean>
             <Chinese>9.3毫米 150發 低視度紅外線曳光彈 彈鏈</Chinese>
             <Chinesesimp>9.3 mm 150发 弹链（红外曳光）</Chinesesimp>
             <Turkish>9.3 mm 150Rnd Tracer IR-DIM Belt</Turkish>
@@ -1659,7 +1659,7 @@
             <Portuguese>Cinto de munição 9.3 mm AP com 150 cartuchos</Portuguese>
             <Hungarian>9,3 mm 150-lövedékes páncéltörő heveder</Hungarian>
             <Japanese>9.3mm 150Rnd 徹甲弾 ベルト</Japanese>
-            <Korean>150발들이 9.3mm 철갑탄 벨트</Korean>
+            <Korean>150발 들이 9.3mm 철갑탄 벨트</Korean>
             <Chinese>9.3毫米 150發 穿甲彈 彈鏈</Chinese>
             <Chinesesimp>9.3 mm 150发 弹链（穿甲）</Chinesesimp>
             <Turkish>9.3 mm 150Rnd AP Belt</Turkish>
@@ -1710,7 +1710,7 @@
             <Portuguese>Carregador de 16 cartuchos 9x19 mm</Portuguese>
             <Hungarian>9x19 mm 16-lövedékes tár</Hungarian>
             <Japanese>9x19 mm 16Rnd マガジン</Japanese>
-            <Korean>17발들이 9x19mm 탄창</Korean>
+            <Korean>16발 들이 9x19mm 탄창</Korean>
             <Chinese>9x19毫米 16發 彈匣</Chinese>
             <Chinesesimp>9x19 mm 16发 弹匣</Chinesesimp>
             <Turkish>9x19 mm 16Rnd Mag</Turkish>
@@ -2016,7 +2016,7 @@
             <Portuguese>Carregador 5.56 mm com 30 cartuchos (Mk318)</Portuguese>
             <Hungarian>5,56 mm 30-lövedékes tár (Mk318)</Hungarian>
             <Japanese>5.56mm 30Rnd マガジン (Mk318)</Japanese>
-            <Korean>30발들이 5.56mm 탄창 (Mk.318)</Korean>
+            <Korean>30발 들이 5.56mm 탄창 (Mk.318)</Korean>
             <Chinese>5.56毫米 30發 彈匣 (Mk318 特戰專用彈)</Chinese>
             <Chinesesimp>5.56 mm 30发 弹匣（Mk318）</Chinesesimp>
             <Turkish>5.56 mm 30Rnd Mag (Mk318)</Turkish>
@@ -2322,7 +2322,7 @@
             <Portuguese>Carregador 7.62 mm com 10 cartuchos (Mk319 Mod 0)</Portuguese>
             <Hungarian>7,62 mm 10-lövedékes tár (Mk319 Mod 0)</Hungarian>
             <Japanese>7.62mm 10Rnd マガジン (Mk319 Mod 0)</Japanese>
-            <Korean>10발들이 7.62mm 탄창 (Mk.319 Mod 0)</Korean>
+            <Korean>10발 들이 7.62mm 탄창 (Mk.319 Mod 0)</Korean>
             <Chinese>7.62毫米 10發 彈匣 (Mk319 Mod 0 特戰專用彈)</Chinese>
             <Chinesesimp>7.62 mm 10发 弹匣（Mk319 Mod 0）</Chinesesimp>
             <Turkish>7.62 mm 10Rnd Mag (Mk319 Mod 0)</Turkish>
@@ -3344,7 +3344,7 @@
             <Portuguese>Carregador 12.7x99 mm (AMAX) com 5 cartuchos </Portuguese>
             <Hungarian>12,7x99 mm 5-lövedékes tár (AMAX)</Hungarian>
             <Japanese>12.7x99mm 5Rnd マガジン (AMAX)</Japanese>
-            <Korean>5발들이 12.7x99mm 탄창 (AMAX)</Korean>
+            <Korean>5발 들이 12.7x99mm 탄창 (AMAX)</Korean>
             <Chinese>12.7x99毫米 5發 彈匣 (AMAX 比賽專用彈)</Chinese>
             <Chinesesimp>12.7x99 mm 5发 弹匣（AMAX）</Chinesesimp>
             <Turkish>12.7x99 mm 5Rnd Şarjör (AMAX)</Turkish>
@@ -3378,7 +3378,7 @@
             <Portuguese>Carregador 12.7x99 mm (AMAX) com 10 cartuchos </Portuguese>
             <Hungarian>12,7x99 mm 10-lövedékes tár (AMAX)</Hungarian>
             <Japanese>12.7x99mm 10Rnd マガジン (AMAX)</Japanese>
-            <Korean>10발들이 12.7x99mm 탄창 (AMAX)</Korean>
+            <Korean>10발 들이 12.7x99mm 탄창 (AMAX)</Korean>
             <Chinese>12.7x99毫米 10發 彈匣 (AMAX 比賽專用彈)</Chinese>
             <Chinesesimp>12.7x99 mm 10发 弹匣（AMAX）</Chinesesimp>
             <Turkish>12.7x99 mm 10Rnd Şarjör (AMAX)</Turkish>
diff --git a/addons/captives/XEH_postInit.sqf b/addons/captives/XEH_postInit.sqf
index 951a710771..2580e72463 100644
--- a/addons/captives/XEH_postInit.sqf
+++ b/addons/captives/XEH_postInit.sqf
@@ -24,7 +24,7 @@ if (isServer) then {
     }];
 };
 
-["unit", FUNC(handlePlayerChanged)] call CBA_fnc_addPlayerEventHandler;
+["unit", LINKFUNC(handlePlayerChanged)] call CBA_fnc_addPlayerEventHandler;
 [QGVAR(moveInCaptive), LINKFUNC(vehicleCaptiveMoveIn)] call CBA_fnc_addEventHandler;
 [QGVAR(moveOutCaptive), LINKFUNC(vehicleCaptiveMoveOut)] call CBA_fnc_addEventHandler;
 
diff --git a/addons/captives/functions/fnc_canEscortCaptive.sqf b/addons/captives/functions/fnc_canEscortCaptive.sqf
index f39ff2ac5f..204206e506 100644
--- a/addons/captives/functions/fnc_canEscortCaptive.sqf
+++ b/addons/captives/functions/fnc_canEscortCaptive.sqf
@@ -21,7 +21,6 @@ params ["_unit", "_target"];
 
 (_target getVariable [QGVAR(isHandcuffed), false]) &&
 {isNull (attachedTo _target)} &&
-{alive _target} &&
-{!(_target getVariable ["ACE_isUnconscious", false])} &&
+{_target call EFUNC(common,isAwake)} &&
 {(vehicle _unit) == _unit} &&
 {(vehicle _target) == _target}
diff --git a/addons/captives/functions/fnc_canLoadCaptive.sqf b/addons/captives/functions/fnc_canLoadCaptive.sqf
index 982e4025a2..46da188238 100644
--- a/addons/captives/functions/fnc_canLoadCaptive.sqf
+++ b/addons/captives/functions/fnc_canLoadCaptive.sqf
@@ -20,7 +20,7 @@
 params ["_unit", "_target", "_vehicle"];
 
 // Don't show "Load Captive" if unit is unconscious (already has "Load Patient")
-if (_target getVariable ["ACE_isUnconscious", false]) exitWith {false};
+if !(_target call EFUNC(common,isAwake)) exitWith {false};
 
 if ((isNull _target) && {_unit getVariable [QGVAR(isEscorting), false]}) then {
     //Looking at a vehicle while escorting, get target from attached objects:
diff --git a/addons/captives/functions/fnc_doEscortCaptive.sqf b/addons/captives/functions/fnc_doEscortCaptive.sqf
index 817745ece3..86cc52cb9c 100644
--- a/addons/captives/functions/fnc_doEscortCaptive.sqf
+++ b/addons/captives/functions/fnc_doEscortCaptive.sqf
@@ -39,12 +39,12 @@ if (_state) then {
         _args params ["_unit", "_target", "_actionID"];
 
         if (_unit getVariable [QGVAR(isEscorting), false]) then {
-            if (!alive _target || {!alive _unit} || {!canStand _target} || {!canStand _unit} || {_target getVariable ["ACE_isUnconscious", false]} || {_unit getVariable ["ACE_isUnconscious", false]} || {!isNull (attachedTo _unit)}) then {
+            if (!canStand _target || {!canStand _unit} || {!(_target call EFUNC(common,isAwake))} || {!(_unit call EFUNC(common,isAwake))} || {!isNull (attachedTo _unit)}) then {
                 _unit setVariable [QGVAR(isEscorting), false, true];
             };
         };
 
-        if (!(_unit getVariable [QGVAR(isEscorting), false])) then {
+        if !(_unit getVariable [QGVAR(isEscorting), false]) then {
             [(_this select 1)] call CBA_fnc_removePerFrameHandler;
             [objNull, _target, false] call EFUNC(common,claim);
             detach _target;
diff --git a/addons/captives/functions/fnc_handleAnimChangedHandcuffed.sqf b/addons/captives/functions/fnc_handleAnimChangedHandcuffed.sqf
index 3363ca923e..8ce4391783 100644
--- a/addons/captives/functions/fnc_handleAnimChangedHandcuffed.sqf
+++ b/addons/captives/functions/fnc_handleAnimChangedHandcuffed.sqf
@@ -19,7 +19,7 @@
 params ["_unit", "_newAnimation"];
 TRACE_2("AnimChanged",_unit,_newAnimation);
 if (_unit == (vehicle _unit)) then {
-    if ((_newAnimation != "ACE_AmovPercMstpSsurWnonDnon") && {!(_unit getVariable ["ACE_isUnconscious", false])}) then {
+    if ((_newAnimation != "ACE_AmovPercMstpSsurWnonDnon") && {_unit call EFUNC(common,isAwake)}) then {
         TRACE_1("Handcuff animation interrupted",_newAnimation);
         [_unit, "ACE_AmovPercMstpScapWnonDnon", 1] call EFUNC(common,doAnimation);
     };
diff --git a/addons/captives/functions/fnc_handleAnimChangedSurrendered.sqf b/addons/captives/functions/fnc_handleAnimChangedSurrendered.sqf
index b9164ddbe5..7d69c8c7fa 100644
--- a/addons/captives/functions/fnc_handleAnimChangedSurrendered.sqf
+++ b/addons/captives/functions/fnc_handleAnimChangedSurrendered.sqf
@@ -19,7 +19,7 @@
 params ["_unit", "_newAnimation"];
 
 TRACE_2("AnimChanged",_unit,_newAnimation);
-if ((_newAnimation != "ACE_AmovPercMstpSsurWnonDnon") && {!(_unit getVariable ["ACE_isUnconscious", false])}) then {
+if ((_newAnimation != "ACE_AmovPercMstpSsurWnonDnon") && {_unit call EFUNC(common,isAwake)}) then {
     TRACE_1("Surrender animation interrupted",_newAnimation);
     [_unit, "ACE_AmovPercMstpSsurWnonDnon", 1] call EFUNC(common,doAnimation);
 };
diff --git a/addons/captives/functions/fnc_setHandcuffed.sqf b/addons/captives/functions/fnc_setHandcuffed.sqf
index c13da8f927..d3d9fa4e6b 100644
--- a/addons/captives/functions/fnc_setHandcuffed.sqf
+++ b/addons/captives/functions/fnc_setHandcuffed.sqf
@@ -58,7 +58,7 @@ if (_state) then {
     // fix anim on mission start (should work on dedicated servers)
     [{
         params ["_unit"];
-        if (!(_unit getVariable [QGVAR(isHandcuffed), false])) exitWith {};
+        if !(_unit getVariable [QGVAR(isHandcuffed), false]) exitWith {};
 
         if ((vehicle _unit) == _unit) then {
             [_unit] call EFUNC(common,fixLoweredRifleAnimation);
@@ -91,7 +91,7 @@ if (_state) then {
     _unit removeEventHandler ["AnimChanged", _animChangedEHID];
     _unit setVariable [QGVAR(handcuffAnimEHID), -1];
 
-    if (((vehicle _unit) == _unit) && {!(_unit getVariable ["ACE_isUnconscious", false])}) then {
+    if (((vehicle _unit) == _unit) && {_unit call EFUNC(common,isAwake)}) then {
         //Break out of hands up animation loop
         [_unit, "ACE_AmovPercMstpScapWnonDnon_AmovPercMstpSnonWnonDnon", 2] call EFUNC(common,doAnimation);
     };
diff --git a/addons/captives/functions/fnc_setSurrendered.sqf b/addons/captives/functions/fnc_setSurrendered.sqf
index 393465e08e..887bfb2680 100644
--- a/addons/captives/functions/fnc_setSurrendered.sqf
+++ b/addons/captives/functions/fnc_setSurrendered.sqf
@@ -81,13 +81,12 @@ if (_state) then {
 
     if (_unit == ACE_player) then {
         //only re-enable HUD if not handcuffed
-        if (!(_unit getVariable [QGVAR(isHandcuffed), false])) then {
+        if !(_unit getVariable [QGVAR(isHandcuffed), false]) then {
             ["captive", []] call EFUNC(common,showHud); //same as showHud true;
         };
     };
 
-    if (!alive _unit) exitWith {};
-    if (_unit getVariable ["ACE_isUnconscious", false]) exitWith {};  //don't touch animations if unconscious
+    if !(_unit call EFUNC(common,isAwake)) exitWith {};  //don't touch animations if unconscious
 
     //if we are in "hands up" animationState, crack it now
     if (((vehicle _unit) == _unit) && {(animationState _unit) == "ACE_AmovPercMstpSsurWnonDnon"}) then {
@@ -99,7 +98,7 @@ if (_state) then {
             params ["_args", "_pfID"];
             _args params ["_unit", "_maxTime"];
             //If waited long enough or they re-surrendered or they are unconscious, exit loop
-            if ((CBA_missionTime > _maxTime) || {_unit getVariable [QGVAR(isSurrendering), false]} || {_unit getVariable ["ACE_isUnconscious", false]}) exitWith {
+            if ((CBA_missionTime > _maxTime) || {_unit getVariable [QGVAR(isSurrendering), false]} || {!(_unit call EFUNC(common,isAwake))}) exitWith {
                 [_pfID] call CBA_fnc_removePerFrameHandler;
             };
             //Only break animation if they are actualy the "hands up" animation (because we are using switchmove there won't be an transition)
diff --git a/addons/captives/stringtable.xml b/addons/captives/stringtable.xml
index 4fc86ec58f..dfc293028d 100644
--- a/addons/captives/stringtable.xml
+++ b/addons/captives/stringtable.xml
@@ -158,6 +158,7 @@
             <Japanese>目隠しを外す</Japanese>
             <Russian>Снять повязку с глаз</Russian>
             <Spanish>Quitar vendas de los ojos</Spanish>
+            <Portuguese>Remover a venda</Portuguese>
         </Key>
         <Key ID="STR_ACE_Captives_CableTie">
             <English>Cable Tie</English>
diff --git a/addons/cargo/functions/fnc_addCargoItem.sqf b/addons/cargo/functions/fnc_addCargoItem.sqf
index de262bdcfb..d5c7925a6f 100644
--- a/addons/cargo/functions/fnc_addCargoItem.sqf
+++ b/addons/cargo/functions/fnc_addCargoItem.sqf
@@ -41,6 +41,8 @@ if (_item isEqualType "") then {
 TRACE_1("loaded",_loaded);
 
 // Invoke listenable event
-["ace_cargoAdded", [_item, _vehicle, _loaded]] call CBA_fnc_globalEvent;
+if (_loaded > 0) then {
+    ["ace_cargoAdded", [_item, _vehicle, _loaded]] call CBA_fnc_globalEvent;
+};
 
 _loaded // return
diff --git a/addons/cargo/functions/fnc_loadItem.sqf b/addons/cargo/functions/fnc_loadItem.sqf
index 21ebc0d52a..aa3117c7dd 100644
--- a/addons/cargo/functions/fnc_loadItem.sqf
+++ b/addons/cargo/functions/fnc_loadItem.sqf
@@ -62,6 +62,17 @@ if (_item isEqualType objNull) then {
 
     // Some objects below water will take damage over time, eventually becoming "water logged" and unfixable (because of negative z attach)
     [_item, "blockDamage", QUOTE(ADDON), true] call EFUNC(common,statusEffect_set);
+
+    // Prevent UAVs from firing
+    private _UAVCrew = _item call EFUNC(common,getVehicleUAVCrew);
+
+    if (_UAVCrew isNotEqualTo []) then {
+        {
+            [_x, true] call EFUNC(common,disableAiUAV);
+        } forEach _UAVCrew;
+
+        _item setVariable [QGVAR(isUAV), _UAVCrew, true];
+    };
 };
 
 // Invoke listenable event
diff --git a/addons/cargo/functions/fnc_paradropItem.sqf b/addons/cargo/functions/fnc_paradropItem.sqf
index acd780f463..6a84a20799 100644
--- a/addons/cargo/functions/fnc_paradropItem.sqf
+++ b/addons/cargo/functions/fnc_paradropItem.sqf
@@ -100,14 +100,26 @@ if (_item isEqualType objNull) then {
 
 // Create smoke effect when crate landed
 [{
-    (_this select 0) params ["_object"];
+    params ["_object", "_pfhID"];
 
     if (isNull _object) exitWith {
-        [_this select 1] call CBA_fnc_removePerFrameHandler;
+        _pfhID call CBA_fnc_removePerFrameHandler;
     };
 
     if (getPos _object select 2 < 1) exitWith {
-        [_this select 1] call CBA_fnc_removePerFrameHandler;
+        _pfhID call CBA_fnc_removePerFrameHandler;
+
+        // Reenable UAV crew
+        private _UAVCrew = _object getVariable [QGVAR(isUAV), []];
+
+        if (_UAVCrew isNotEqualTo []) then {
+            // Reenable AI
+            {
+                [_x, false] call EFUNC(common,disableAiUAV);
+            } forEach _UAVCrew;
+
+            _object setVariable [QGVAR(isUAV), nil, true];
+        };
 
         if ((GVAR(disableParadropEffectsClasstypes) findIf {_object isKindOf _x}) == -1) then {
             private _smoke = "SmokeshellYellow" createVehicle [0, 0, 0];
diff --git a/addons/cargo/functions/fnc_unloadItem.sqf b/addons/cargo/functions/fnc_unloadItem.sqf
index f32215fdd7..7580de8488 100644
--- a/addons/cargo/functions/fnc_unloadItem.sqf
+++ b/addons/cargo/functions/fnc_unloadItem.sqf
@@ -96,6 +96,18 @@ if (_object isEqualType objNull) then {
 
         [QEGVAR(zeus,addObjects), [[_object], _objectCurators]] call CBA_fnc_serverEvent;
     };
+
+    // Reenable UAV crew
+    private _UAVCrew = _object getVariable [QGVAR(isUAV), []];
+
+    if (_UAVCrew isNotEqualTo []) then {
+        // Reenable AI
+        {
+            [_x, false] call EFUNC(common,disableAiUAV);
+        } forEach _UAVCrew;
+
+        _object setVariable [QGVAR(isUAV), nil, true];
+    };
 } else {
     _object = createVehicle [_item, _emptyPosAGL, [], 0, "NONE"];
 
diff --git a/addons/cargo/stringtable.xml b/addons/cargo/stringtable.xml
index e74fd742c2..8e16f50090 100644
--- a/addons/cargo/stringtable.xml
+++ b/addons/cargo/stringtable.xml
@@ -40,6 +40,7 @@
             <Japanese>配置する</Japanese>
             <Korean>배치하기</Korean>
             <French>Déployer</French>
+            <German>Aufstellen</German>
             <Spanish>Desplegar</Spanish>
         </Key>
         <Key ID="STR_ACE_Cargo_ScrollAction">
@@ -288,6 +289,7 @@
             <Russian>Загружаем %1 в %2...</Russian>
             <Korean>%1을(를) %2에 싣는 중...</Korean>
             <French>Chargement %1 dans %2...</French>
+            <German>%1 wird in %2 geladen...</German>
         </Key>
         <Key ID="STR_ACE_Cargo_UnloadingItem">
             <English>Unloading %1 from %2...</English>
@@ -297,6 +299,7 @@
             <Russian>Выгружаем %1 из %2...</Russian>
             <Korean>%1을(를) %2(으)로부터 내리는 중...</Korean>
             <French>Déchargement %1 de %2...</French>
+            <German>%1 wird von %2 entladen...</German>
         </Key>
         <Key ID="STR_ACE_Cargo_LoadingFailed">
             <English>%1&lt;br/&gt;could not be loaded</English>
@@ -503,7 +506,7 @@
             <German>Ladezeitmultiplikator</German>
             <Japanese>積載の所要時間係数</Japanese>
             <Polish>Współczynnik czasu załadowania</Polish>
-            <Italian>Coefficente Tempo Caricamento</Italian>
+            <Italian>Coefficiente Tempo Caricamento</Italian>
             <Russian>Коэф. времени погрузки</Russian>
             <Portuguese>Fator de tempo para carregar</Portuguese>
             <French>Coefficient du temps de chargement</French>
@@ -587,6 +590,7 @@
             <Japanese>配置機能を有効化</Japanese>
             <Korean>배치 활성화</Korean>
             <French>Permettre le placement</French>
+            <German>Aktiviere Aufbauen</German>
             <Spanish>Habilitar despliegue</Spanish>
         </Key>
         <Key ID="STR_ACE_Cargo_enableDeploy_description">
@@ -596,6 +600,7 @@
             <Japanese>配置機能を介して貨物アイテムを降ろすことが出来るかどうかを制御します。</Japanese>
             <Korean>배치 방법을 통해 화물 아이템을 내릴 수 있는지 여부를 제어합니다.</Korean>
             <French>Contrôler si les éléments de cargaison peuvent être déchargés via la méthode de déploiement.</French>
+            <German>Steuert, ob Frachtgegenstände über die Aufbaumethode entladen werden können.</German>
             <Spanish>Controla si los objetos de la carga pueden ser descargados mediante el método de despliegue.</Spanish>
         </Key>
     </Package>
diff --git a/addons/casings/XEH_postInit.sqf b/addons/casings/XEH_postInit.sqf
index c1baad68e9..47737c4e04 100644
--- a/addons/casings/XEH_postInit.sqf
+++ b/addons/casings/XEH_postInit.sqf
@@ -1,7 +1,12 @@
 #include "script_component.hpp"
 
-if (!hasInterface || !GVAR(enabled)) exitWith {};
+if (!hasInterface) exitWith {};
 
-GVAR(cachedCasings) = createHashMap;
-GVAR(casings) = [];
-["CAManBase", "FiredMan", LINKFUNC(createCasing)] call CBA_fnc_addClassEventHandler;
+["CBA_settingsInitialized", {
+    if (!GVAR(enabled)) exitWith {};
+
+    GVAR(cachedCasings) = createHashMap;
+    GVAR(casings) = [];
+
+    ["CAManBase", "FiredMan", LINKFUNC(createCasing)] call CBA_fnc_addClassEventHandler;
+}] call CBA_fnc_addEventHandler;
diff --git a/addons/chemlights/config.cpp b/addons/chemlights/config.cpp
index 263fcb1a57..7f30429e79 100644
--- a/addons/chemlights/config.cpp
+++ b/addons/chemlights/config.cpp
@@ -3,6 +3,7 @@
 
 class CfgPatches {
     class ADDON {
+        name = COMPONENT_NAME;
         units[] = {"ACE_Box_Chemlights","ACE_Item_Chemlight_Shield","ACE_Item_Chemlight_Shield_Green","ACE_Item_Chemlight_Shield_Red","ACE_Item_Chemlight_Shield_Blue","ACE_Item_Chemlight_Shield_Yellow","ACE_Item_Chemlight_Shield_Orange","ACE_Item_Chemlight_Shield_White","ModuleChemlightOrange","ModuleChemlightWhite","ModuleChemlightHiRed","ModuleChemlightHiYellow","ModuleChemlightHiWhite","ModuleChemlightHiBlue","ModuleChemlightHiGreen","ModuleChemlightUltraHiOrange"};
         weapons[] = {"ACE_Chemlight_Shield", "ACE_Chemlight_Shield_Green","ACE_Chemlight_Shield_Red","ACE_Chemlight_Shield_Blue","ACE_Chemlight_Shield_Yellow","ACE_Chemlight_Shield_Orange","ACE_Chemlight_Shield_White"};
         requiredVersion = REQUIRED_VERSION;
diff --git a/addons/chemlights/script_component.hpp b/addons/chemlights/script_component.hpp
index 324af2c55c..5095ebe666 100644
--- a/addons/chemlights/script_component.hpp
+++ b/addons/chemlights/script_component.hpp
@@ -1,4 +1,5 @@
 #define COMPONENT chemlights
+#define COMPONENT_BEAUTIFIED Chemlights
 #include "\z\ace\addons\main\script_mod.hpp"
 
 // #define DEBUG_MODE_FULL
diff --git a/addons/common/XEH_PREP.hpp b/addons/common/XEH_PREP.hpp
index 68fdaaf77d..3614775345 100644
--- a/addons/common/XEH_PREP.hpp
+++ b/addons/common/XEH_PREP.hpp
@@ -30,6 +30,7 @@ PREP(changeProjectileDirection);
 PREP(checkFiles);
 PREP(checkFiles_diagnoseACE);
 PREP(checkPBOs);
+PREP(checkVersionNumber);
 PREP(claim);
 PREP(claimSafeServer);
 PREP(codeToString);
@@ -42,6 +43,7 @@ PREP(deviceKeyFindValidIndex);
 PREP(deviceKeyRegisterNew);
 PREP(deprecateComponent);
 PREP(disableAI);
+PREP(disableAiUAV);
 PREP(disableUserInput);
 PREP(displayIcon);
 PREP(displayText);
@@ -103,6 +105,7 @@ PREP(getWeaponAzimuthAndInclination);
 PREP(getWeaponIndex);
 PREP(getWeaponState);
 PREP(getWeight);
+PREP(getWheelHitPointsWithSelections);
 PREP(getWindDirection);
 PREP(getZoom);
 PREP(goKneeling);
@@ -175,6 +178,7 @@ PREP(setupLocalUnitsHandler);
 PREP(setVariableJIP);
 PREP(setVariablePublic);
 PREP(setVolume);
+PREP(setWeaponLightLaserState);
 PREP(showHud);
 PREP(statusEffect_addType);
 PREP(statusEffect_get);
@@ -187,6 +191,7 @@ PREP(stopGesture);
 PREP(stringCompare);
 PREP(stringToColoredText);
 PREP(swayLoop);
+PREP(switchAttachmentMode);
 PREP(switchPersistentLaser);
 PREP(switchToGroupSide);
 PREP(throttledPublicVariable);
@@ -265,6 +270,7 @@ PREP(_handleRequestAllSyncedEvents);
 PREP(addActionEventHandler);
 PREP(addActionMenuEventHandler);
 PREP(addMapMarkerCreatedEventHandler);
+PREP(addPlayerEH);
 
 PREP(removeActionEventHandler);
 PREP(removeActionMenuEventHandler);
diff --git a/addons/common/XEH_postInit.sqf b/addons/common/XEH_postInit.sqf
index 0d4b55ae28..8b7568f75e 100644
--- a/addons/common/XEH_postInit.sqf
+++ b/addons/common/XEH_postInit.sqf
@@ -133,6 +133,30 @@
     _object lockInventory (_set > 0);
 }] call CBA_fnc_addEventHandler;
 
+[QGVAR(disableAiUAV), {
+    params ["_unit", "_disable"];
+
+    if (_disable) then {
+        private _features = ["AUTOTARGET", "TARGET", "WEAPONAIM"/*, "FIREWEAPON"*/, "RADIOPROTOCOL"]; // TODO: Uncomment in 2.18
+
+        // Save current status
+        _unit setVariable [QGVAR(featuresAiUAV), _features apply {[_x, _unit checkAIFeature _x]}];
+
+        {
+            _unit enableAIFeature [_x, false];
+        } forEach _features;
+    } else {
+        // Restore previous status
+        private _features = _unit getVariable [QGVAR(featuresAiUAV), []];
+
+        {
+            _unit enableAIFeature [_x select 0, _x select 1];
+        } forEach _features;
+
+        _unit setVariable [QGVAR(featuresAiUAV), nil];
+    };
+}] call CBA_fnc_addEventHandler;
+
 //Add a fix for BIS's zeus remoteControl module not reseting variables on DC when RC a unit
 //This variable is used for isPlayer checks
 if (isServer) then {
@@ -145,7 +169,7 @@ if (isServer) then {
                     INFO_3("[%1] DC - Was Zeus [%2] while controlling unit [%3] - manually clearing `bis_fnc_moduleRemoteControl_owner`",[_x] call FUNC(getName),_dcPlayer,_x);
                     _x setVariable ["bis_fnc_moduleRemoteControl_owner", nil, true];
                 };
-            } forEach (curatorEditableObjects  _zeusLogic);
+            } forEach (curatorEditableObjects _zeusLogic);
         };
     }];
 };
diff --git a/addons/common/XEH_preInit.sqf b/addons/common/XEH_preInit.sqf
index 9b5d27d12c..b559cb5dd9 100644
--- a/addons/common/XEH_preInit.sqf
+++ b/addons/common/XEH_preInit.sqf
@@ -10,6 +10,7 @@ PREP_RECOMPILE_END;
 GVAR(syncedEvents) = createHashMap;
 GVAR(showHudHash) = createHashMap;
 GVAR(vehicleIconCache) = createHashMap; // for getVehicleIcon
+GVAR(wheelSelections) = createHashMap;
 
 GVAR(blockItemReplacement) = false;
 
diff --git a/addons/common/XEH_preStart.sqf b/addons/common/XEH_preStart.sqf
index 208adea7b1..3168243c06 100644
--- a/addons/common/XEH_preStart.sqf
+++ b/addons/common/XEH_preStart.sqf
@@ -15,3 +15,25 @@ uiNamespace setVariable [QGVAR(addonCache), createHashMap];
 
 // Cache for FUNC(getConfigName)
 uiNamespace setVariable [QGVAR(configNames), createHashMap];
+
+//Add warnings for missing compat PBOs
+GVAR(isModLoadedCache) = createHashMap;
+{
+    _x params ["_modPBO", "_compatPBO"];
+    if ([_modPBO] call FUNC(isModLoaded) && {!([_compatPBO] call FUNC(isModLoaded))}) then {
+        WARNING_2("Weapon Mod [%1] missing ace compat pbo [%2]",_modPBO,_compatPBO);
+    };
+} forEach [
+    ["CUP_Creatures_People_LoadOrder","ace_compat_cup_units"],
+    ["CUP_Vehicles_LoadOrder","ace_compat_cup_vehicles"],
+    ["CUP_Weapons_LoadOrder","ace_compat_cup_weapons"],
+    ["r3f_armes_c","ace_compat_r3f"],
+    ["RF_Data_Loadorder","ace_compat_rf"],
+    ["RH_acc","ace_compat_rh_acc"],
+    ["RH_de_cfg","ace_compat_rh_de"],
+    ["RH_m4_cfg","ace_compat_rh_m4"],
+    ["RH_PDW","ace_compat_rh_pdw"],
+    ["RKSL_PMII","ace_compat_rksl_pm_ii"],
+    ["iansky_opt","ace_compat_sma3_iansky"],
+    ["R3F_Armes","ace_compat_r3f"]
+];
diff --git a/addons/common/dev/test_cfgPatches.sqf b/addons/common/dev/test_cfgPatches.sqf
index e2ce10b2c6..c5f3c81ef5 100644
--- a/addons/common/dev/test_cfgPatches.sqf
+++ b/addons/common/dev/test_cfgPatches.sqf
@@ -50,7 +50,7 @@ private _allWeapons = [];
 private _vics = "(configName _x) select [0,3] == 'ace'" configClasses (configFile >> "CfgVehicles");
 {
     if (((getNumber (_x >> "scope")) == 2) || {((getNumber (_x >> "scopeCurator")) == 2)}) then {
-        if (!((toLowerANSI configName _x) in _allUnits)) then {
+        if !((toLowerANSI configName _x) in _allUnits) then {
             WARNING_2("Not in any units[] - %1 from %2",configName _x,configSourceMod _x);
             _testPass = false;
         };
@@ -62,7 +62,7 @@ private _weapons = "(configName _x) select [0,3] == 'ace'" configClasses (config
 {
     private _type = toLowerANSI configName _x;
     if (((getNumber (_x >> "scope")) == 2) || {((getNumber (_x >> "scopeCurator")) == 2)}) then {
-        if (!((toLowerANSI configName _x) in _allWeapons)) then {
+        if !((toLowerANSI configName _x) in _allWeapons) then {
             WARNING_2("Not in any weapons[] - %1 from %2",configName _x,configSourceMod _x);
             _testPass = false;
         };
diff --git a/addons/common/functions/fnc_actionKeysNamesConverted.sqf b/addons/common/functions/fnc_actionKeysNamesConverted.sqf
index dd62fc8789..27c3597a9b 100644
--- a/addons/common/functions/fnc_actionKeysNamesConverted.sqf
+++ b/addons/common/functions/fnc_actionKeysNamesConverted.sqf
@@ -43,10 +43,10 @@ if (isNil "_keyTable") then {
     };
 };
 
-private _keyCache = uiNamespace getVariable [QGVAR(keyNameCache), locationNull];
+private _keyCache = uiNamespace getVariable QGVAR(keyNameCache); // @TODO: Move cache creation to preStart/somewhere else
 
-if (isNull _keyCache) then {
-    _keyCache = call CBA_fnc_createNamespace;
+if (isNil "_keyCache") then {
+    _keyCache = createHashMap;
     uiNamespace setVariable [QGVAR(keyNameCache), _keyCache];
 };
 
@@ -54,7 +54,7 @@ params [["_action", "", [""]]];
 
 private _keybinds = actionKeysNamesArray _action apply {
     private _keyName = _x;
-    private _keybind = _keyCache getVariable _keyName;
+    private _keybind = _keyCache get _keyName;
 
     if (isNil "_keybind") then {
         private _key = -1;
@@ -101,7 +101,7 @@ private _keybinds = actionKeysNamesArray _action apply {
 
         // cache
         _keybind = [_key, _shift, _ctrl, _alt];
-        _keyCache setVariable [_keyName, _keybind];
+        _keyCache set [_keyName, _keybind];
     };
 
     _keybind
diff --git a/addons/common/functions/fnc_addPlayerEH.sqf b/addons/common/functions/fnc_addPlayerEH.sqf
new file mode 100644
index 0000000000..c20fde9da1
--- /dev/null
+++ b/addons/common/functions/fnc_addPlayerEH.sqf
@@ -0,0 +1,63 @@
+#include "..\script_component.hpp"
+/*
+ * Author: PabstMirror
+ * Adds event handler just to ACE_player
+ * Can be removed after cba 3.18 is released for CBA_fnc_addBISPlayerEventHandler
+ * This never was public in a release
+ *
+ * Arguments:
+ * 0: Key <STRING>
+ * 1: Event Type <STRING>
+ * 2: Event Code <CODE>
+ * 3: Ignore Virtual Units (spectators, virtual zeus, uav RC) <BOOL> (default: true)
+ *
+ * Return Value:
+ * None
+ *
+ * Example:
+ * ["example", "FiredNear", {systemChat str _this}] call ace_common_fnc_addPlayerEH
+ *
+ * Public: No
+*/
+params [["_key", "", [""]], ["_type", "", [""]], ["_code", {}, [{}]], ["_ignoreVirtual", true, [true]]];
+TRACE_3("addPlayerEH",_key,_type,_ignoreVirtual);
+
+if (isNil QGVAR(playerEventsHash)) then { // first-run init
+    GVAR(playerEventsHash) = createHashMap;
+    ["unit", {
+        params ["_newPlayer", "_oldPlayer"];
+        // uav check only applies to direct controlling UAVs from zeus, no effect on normal UAV operation
+        private _isVirutal = (unitIsUAV _newPlayer) || {getNumber (configOf _newPlayer >> "isPlayableLogic") == 1};
+
+        TRACE_4("",_newPlayer,_oldPlayer,_isVirutal,count GVAR(playerEventsHash));
+        {
+            _y params ["_type", "_code", "_ignoreVirtual"];
+
+            private _oldEH = _oldPlayer getVariable [_x, -1];
+            if (_oldEH != -1) then { 
+                _oldPlayer removeEventHandler [_type, _oldEH]; 
+                _oldPlayer setVariable [_x, nil];
+            };
+
+            _oldEH = _newPlayer getVariable [_x, -1];
+            if (_oldEH != -1) then { continue }; // if respawned then var and EH already exists
+            if (_ignoreVirtual && _isVirutal) then { continue };
+
+            private _newEH = _newPlayer addEventHandler [_type, _code];
+            _newPlayer setVariable [_x, _newEH];
+        } forEach GVAR(playerEventsHash);
+    }, false] call CBA_fnc_addPlayerEventHandler;
+};
+
+
+_key = format [QGVAR(playerEvents_%1), toLower _key];
+if (_key in GVAR(playerEventsHash)) exitWith { ERROR_1("bad key %1",_this); };
+
+GVAR(playerEventsHash) set [_key, [_type, _code, _ignoreVirtual]];
+
+if (isNull ACE_player) exitWith {};
+if (_ignoreVirtual && {(unitIsUAV ACE_player) || {getNumber (configOf ACE_player >> "isPlayableLogic") == 1}}) exitWith {};
+
+// Add event now
+private _newEH = ACE_player addEventHandler [_type, _code];
+ACE_player setVariable [_key, _newEH];
diff --git a/addons/common/functions/fnc_checkFiles.sqf b/addons/common/functions/fnc_checkFiles.sqf
index 39e2bac3ac..7b90a1b0a8 100644
--- a/addons/common/functions/fnc_checkFiles.sqf
+++ b/addons/common/functions/fnc_checkFiles.sqf
@@ -15,15 +15,20 @@
  * Public: No
  */
 
-///////////////
-// check addons
-///////////////
-private _mainCfg = configFile >> "CfgPatches" >> "ace_main";
-private _mainVersion = getText (_mainCfg >> "versionStr");
-private _mainSource = configSourceMod _mainCfg;
+// Don't execute in scheduled environment
+if (canSuspend) exitWith {
+    [FUNC(checkFiles), nil] call CBA_fnc_directCall;
+};
 
-//CBA Versioning check - close main display if using incompatible version
-private _cbaVersionAr = getArray (configFile >> "CfgPatches" >> "cba_main" >> "versionAr");
+///////////////
+// Check addons
+///////////////
+private _cfgPatches = configFile >> "CfgPatches";
+private _mainVersion = getText (_cfgPatches >> "ace_main" >> "versionStr");
+private _mainSource = configSourceMod (_cfgPatches >> "ace_main");
+
+// CBA Versioning check - close main display if using incompatible version
+private _cbaVersionAr = getArray (_cfgPatches >> "cba_main" >> "versionAr");
 private _cbaRequiredAr = getArray (configFile >> "CfgSettings" >> "CBA" >> "Versioning" >> "ACE" >> "dependencies" >> "CBA") select 1;
 
 private _cbaVersionStr = _cbaVersionAr joinString ".";
@@ -31,53 +36,62 @@ private _cbaRequiredStr = _cbaRequiredAr joinString ".";
 
 INFO_3("ACE is version %1 - CBA is version %2 (min required %3)",_mainVersion,_cbaVersionStr,_cbaRequiredStr);
 
-if ([_cbaRequiredAr, _cbaVersionAr] call cba_versioning_fnc_version_compare) then {
+if ([_cbaRequiredAr, _cbaVersionAr] call CBA_versioning_fnc_version_compare) then {
     private _errorMsg = format ["CBA version %1 is outdated (required %2)", _cbaVersionStr, _cbaRequiredStr];
     ERROR(_errorMsg);
+
     if (hasInterface) then {
-        ["[ACE] ERROR", _errorMsg, {findDisplay 46 closeDisplay 0}] call FUNC(errorMessage);
+        ["[ACE] ERROR", _errorMsg] call FUNC(errorMessage);
     };
 };
 
-//private _addons = activatedAddons; // broken with High-Command module, see #2134
-private _addons = (cba_common_addons select {(_x select [0,4]) == "ace_"}) apply {toLowerANSI _x};
+//private _addons = activatedAddons; // Broken with High-Command module, see #2134
+private _addons = (CBA_common_addons select {(_x select [0, 4]) == "ace_"}) apply {toLowerANSI _x};
+
 private _oldAddons = [];
 private _oldSources = [];
 private _oldCompats = [];
+
 {
     private _addonCfg = configFile >> "CfgPatches" >> _x;
     private _addonVersion = getText (_addonCfg >> "versionStr");
+
     if (_addonVersion != _mainVersion) then {
         private _addonSource = configSourceMod _addonCfg;
+
         _oldSources pushBackUnique _addonSource;
+
+        // Check ACE install
         call FUNC(checkFiles_diagnoseACE);
 
+        // Don't block game if it's just an old compat pbo
         if ((_x select [0, 10]) != "ace_compat") then {
-            if (hasInterface) then {
-                _oldAddons pushBack _x;
-            };
+            _oldAddons pushBack _x;
         } else {
-            _oldCompats pushBack [_x, _addonVersion];  // Don't block game if it's just an old compat pbo
+            _oldCompats pushBack [_x, _addonVersion];
         };
     };
 } forEach _addons;
 
 if (_oldAddons isNotEqualTo []) then {
-    _oldAddons = _oldAddons apply { format ["%1.pbo", _x] };
-    private _errorMsg = "";
-    if (count _oldAddons > 3) then {
-        _errorMsg = format ["The following files are outdated: %1, and %2 more.<br/>ACE Main version is %3 from %4.<br/>Loaded mods with outdated ACE files: %5", (_oldAddons select [0, 3]) joinString ", ", (count _oldAddons) -3, _mainVersion, _mainSource, (_oldSources joinString ", ")];
+    _oldAddons = _oldAddons apply {format ["%1.pbo", _x]};
+
+    private _errorMsg = if (count _oldAddons > 3) then {
+        format ["The following files are outdated: %1, and %2 more.<br/>ACE Main version is %3 from %4.<br/>Loaded mods with outdated ACE files: %5", (_oldAddons select [0, 3]) joinString ", ", (count _oldAddons) - 3, _mainVersion, _mainSource, _oldSources joinString ", "];
     } else {
-        _errorMsg = format ["The following files are outdated: %1.<br/>ACE Main version is %2 from %3.<br/>Loaded mods with outdated ACE files: %4", (_oldAddons) joinString ", ", _mainVersion, _mainSource, (_oldSources) joinString ", "];
+        format ["The following files are outdated: %1.<br/>ACE Main version is %2 from %3.<br/>Loaded mods with outdated ACE files: %4", _oldAddons joinString ", ", _mainVersion, _mainSource, _oldSources joinString ", "];
     };
+
     if (hasInterface) then {
-        ["[ACE] ERROR", _errorMsg, {findDisplay 46 closeDisplay 0}] call FUNC(errorMessage);
+        ["[ACE] ERROR", _errorMsg] call FUNC(errorMessage);
     };
+
     ERROR(_errorMsg);
 };
 
 if (_oldCompats isNotEqualTo []) then {
     _oldCompats = _oldCompats apply {format ["%1 (%2)", _x select 0, _x select 1]};
+
     [{
         // Lasts for ~10 seconds
         ERROR_WITH_TITLE_3("The following ACE compatiblity PBOs are outdated","%1. ACE Main version is %2 from %3.",_this select 0,_this select 1,_this select 2);
@@ -85,9 +99,10 @@ if (_oldCompats isNotEqualTo []) then {
 };
 
 ///////////////
-// check extensions
+// Check extensions
 ///////////////
 private _platform = toLowerANSI (productVersion select 6);
+
 if (!isServer && {_platform in ["linux", "osx"]}) then {
     // Linux and OSX client ports do not support extensions at all
     INFO("Operating system does not support extensions");
@@ -101,8 +116,10 @@ if (!isServer && {_platform in ["linux", "osx"]}) then {
 
         if ((_isWindows || _isLinux) && {_isClient || _isServer}) then {
             private _versionEx = _extension callExtension "version";
+
             if (_versionEx == "") then {
                 private _extensionFile = _extension;
+
                 if (productVersion select 7 == "x64") then {
                     _extensionFile = format ["%1_x64", _extensionFile];
                 };
@@ -114,7 +131,7 @@ if (!isServer && {_platform in ["linux", "osx"]}) then {
                 ERROR(_errorMsg);
 
                 if (hasInterface) then {
-                    ["[ACE] ERROR", _errorMsg, {findDisplay 46 closeDisplay 0}] call FUNC(errorMessage);
+                    ["[ACE] ERROR", _errorMsg] call FUNC(errorMessage);
                 };
             } else {
                 // Print the current extension version
@@ -123,54 +140,66 @@ if (!isServer && {_platform in ["linux", "osx"]}) then {
         };
     } forEach ("true" configClasses (configFile >> "ACE_Extensions"));
 };
+
 if (isArray (configFile >> "ACE_Extensions" >> "extensions")) then {
     WARNING("extensions[] array no longer supported");
 };
 
 ///////////////
-// check server version/addons
+// Check server version/addons
 ///////////////
 if (isMultiplayer) then {
-    // don't check optional addons
-    _addons = _addons select {getNumber (configFile >> "CfgPatches" >> _x >> "ACE_isOptional") != 1};
+    // Don't check optional addons
+    _addons = _addons select {getNumber (_cfgPatches >> _x >> "ACE_isOptional") != 1};
 
     if (isServer) then {
-        // send servers version of ACE to all clients
-        GVAR(ServerVersion) = _mainVersion;
-        GVAR(ServerAddons) = _addons;
-        publicVariable QGVAR(ServerVersion);
-        publicVariable QGVAR(ServerAddons);
+        // Send server's version of ACE to all clients
+        GVAR(serverVersion) = _mainVersion;
+        GVAR(serverAddons) = _addons;
+        GVAR(serverSource) = _mainSource;
+
+        publicVariable QGVAR(serverVersion);
+        publicVariable QGVAR(serverAddons);
+        publicVariable QGVAR(serverSource);
     } else {
-        // clients have to wait for the variables
-        [{
-            if (isNil QGVAR(ServerVersion) || isNil QGVAR(ServerAddons)) exitWith {};
+        GVAR(clientVersion) = _version;
+        GVAR(clientAddons) = _addons;
 
-            (_this select 0) params ["_mainVersion", "_addons"];
-
-            if (_mainVersion != GVAR(ServerVersion)) then {
-                private _errorMsg = format ["Client/Server Version Mismatch. Server: %1, Client: %2.", GVAR(ServerVersion), _mainVersion];
+        private _fnc_check = {
+            if (GVAR(clientVersion) != GVAR(serverVersion)) then {
+                private _errorMsg = format ["Client/Server Version Mismatch. Server: %1, Client: %2. Server modDir: %3", GVAR(serverVersion), GVAR(clientVersion), GVAR(serverSource)];
 
+                // Check ACE install
                 call FUNC(checkFiles_diagnoseACE);
+
                 ERROR(_errorMsg);
 
                 if (hasInterface) then {
-                    ["[ACE] ERROR", _errorMsg, {findDisplay 46 closeDisplay 0}] call FUNC(errorMessage);
+                    ["[ACE] ERROR", _errorMsg] call FUNC(errorMessage);
                 };
             };
 
-            _addons = _addons - GVAR(ServerAddons);
+            private _addons = GVAR(clientAddons) - GVAR(serverAddons);
+
             if (_addons isNotEqualTo []) then {
-                private _errorMsg = format ["Client/Server Addon Mismatch. Client has extra addons: %1.",_addons];
+                private _errorMsg = format ["Client/Server Addon Mismatch. Client has additional addons: %1. Server modDir: %2", _addons, GVAR(serverSource)];
 
+                // Check ACE install
                 call FUNC(checkFiles_diagnoseACE);
+
                 ERROR(_errorMsg);
 
                 if (hasInterface) then {
-                    ["[ACE] ERROR", _errorMsg, {findDisplay 46 closeDisplay 0}] call FUNC(errorMessage);
+                    ["[ACE] ERROR", _errorMsg] call FUNC(errorMessage);
                 };
             };
+        };
 
-            [_this select 1] call CBA_fnc_removePerFrameHandler;
-        }, 1, [_mainVersion,_addons]] call CBA_fnc_addPerFrameHandler;
+        // Clients have to wait for the variables
+        if (isNil QGVAR(serverVersion) || isNil QGVAR(serverAddons)) then {
+            GVAR(serverVersion) addPublicVariableEventHandler _fnc_check;
+        } else {
+            call _fnc_check;
+        };
     };
 };
diff --git a/addons/common/functions/fnc_checkFiles_diagnoseACE.sqf b/addons/common/functions/fnc_checkFiles_diagnoseACE.sqf
index 5b7f80198b..f9271ca213 100644
--- a/addons/common/functions/fnc_checkFiles_diagnoseACE.sqf
+++ b/addons/common/functions/fnc_checkFiles_diagnoseACE.sqf
@@ -1,13 +1,13 @@
 #include "..\script_component.hpp"
 /*
  * Author: PabstMirror
- * Diagnose ACE install problems, this will only be called if there is a known problem
+ * Diagnoses ACE install problems, this will only be called if there is a known problem.
  *
  * Arguments:
  * None
  *
  * Return Value:
- * None
+ * ACE addons' WS IDs <HASHMAP>
  *
  * Example:
  * [] call ace_common_fnc_checkFiles_diagnoseACE
@@ -16,43 +16,59 @@
  */
 
 // Only run once
-if (missionNameSpace getVariable [QGVAR(checkFiles_diagnoseACE), false]) exitWith {};
+if (missionNameSpace getVariable [QGVAR(checkFiles_diagnoseACE), false]) exitWith {
+    createHashMap // return
+};
+
 GVAR(checkFiles_diagnoseACE) = true;
 
-private _addons = cba_common_addons select {(_x select [0,4]) == "ace_"};
+private _addons = CBA_common_addons select {(_x select [0, 4]) == "ace_"};
 private _cfgPatches = configFile >> "CfgPatches";
 private _allMods = createHashMap;
+private _getLoadedModsInfo = getLoadedModsInfo;
 
-// Check ACE_ADDONs are in expected mod DIR
+// Check if ACE_ADDONs are in expected mod DIR
 {
-    private _cfg = (_cfgPatches >> _x);
+    private _cfg = _cfgPatches >> _x;
     private _actualModDir = configSourceMod _cfg;
     private _expectedModDir = getText (_cfg >> "ACE_expectedModDir");
-    if (_expectedModDir == "") then { _expectedModDir = "@ace" };
+
+    if (_expectedModDir == "") then {
+        _expectedModDir = "@ace";
+    };
+
     private _expectedSteamID = getText (_cfg >> "ACE_expectedSteamID");
-    if (_expectedSteamID == "") then { _expectedSteamID = "463939057" };
+
+    if (_expectedSteamID == "") then {
+        _expectedSteamID = "463939057"
+    };
 
     (_allMods getOrDefault [_actualModDir, [], true]) pushBackUnique _expectedSteamID;
+
     if (_actualModDir != _expectedModDir) then {
-        private _errorMsg = format ["%1 loading from unexpected modDir [%2]",_x,_actualModDir];
+        private _errorMsg = format ["%1 loading from unexpected modDir [%2]", _x, _actualModDir];
         systemChat _errorMsg;
         WARNING_1("%1",_errorMsg);
     };
 } forEach _addons;
 
-// Check all ACE ModDirs have expected steam WS ID
+// Check if all ACE ModDirs have expected steam WS ID
 {
     private _modDir = _x;
-    if ((count _y) != 1) then { ERROR_2("Unexpected multiple steamIDs %1 - %2",_modDir,_y) };
-    private _expectedSteamID = _y # 0;
-    private _index = getLoadedModsInfo findIf {_x#1 == _modDir};
-    (getLoadedModsInfo param [_index, []]) params [["_modName", "$Error$"], "", "", "", "", "", "", ["_actualID", ""]];
+
+    if (count _y != 1) then {
+        ERROR_2("Unexpected multiple steamIDs %1 - %2",_modDir,_y);
+    };
+
+    private _expectedSteamID = _y select 0;
+    private _index = _getLoadedModsInfo findIf {_x select 1 == _modDir};
+    (_getLoadedModsInfo param [_index, []]) params [["_modName", "$Error$"], "", "", "", "", "", "", ["_actualID", ""]];
 
     if (_actualID != _expectedSteamID) then {
-        private _errorMsg = format ["%1 [%2] unexpected workshopID [%3]",_modDir,_modName,_actualID];
+        private _errorMsg = format ["%1 [%2] unexpected workshopID [%3]", _modDir, _modName, _actualID];
         systemChat _errorMsg;
         WARNING_1("%1",_errorMsg);
     };
 } forEach _allMods;
 
-_allMods
+_allMods // return
diff --git a/addons/common/functions/fnc_checkPBOs.sqf b/addons/common/functions/fnc_checkPBOs.sqf
index cb192c6667..4f2e3f4fa6 100644
--- a/addons/common/functions/fnc_checkPBOs.sqf
+++ b/addons/common/functions/fnc_checkPBOs.sqf
@@ -1,6 +1,6 @@
 #include "..\script_component.hpp"
 /*
- * Author: commy2
+ * Author: commy2, johnb43
  * Used to execute the checkPBOs module without placing the module. Don't use this together with the module.
  * Checks PBO versions and compares to the one running on server.
  *
@@ -9,8 +9,8 @@
  *   0 = Warn once
  *   1 = Warn permanently
  *   2 = Kick
- * 1: Check all PBOs? (default: false) <BOOL>
- * 2: Whitelist (default: "") <STRING>
+ * 1: Check all PBOs? <BOOL> (default: false)
+ * 2: Whitelist <STRING> (default: "")
  *
  * Return Value:
  * None
@@ -24,7 +24,7 @@
 params ["_mode", ["_checkAll", false], ["_whitelist", "", [""]]];
 TRACE_3("params",_mode,_checkAll,_whitelist);
 
-//lowercase and convert whiteList String into array of strings:
+// Lowercase and convert whiteList string into array of strings
 _whitelist = toLowerANSI _whitelist;
 _whitelist = _whitelist splitString "[,""']";
 TRACE_1("Array",_whitelist);
@@ -32,75 +32,67 @@ TRACE_1("Array",_whitelist);
 ACE_Version_CheckAll = _checkAll;
 ACE_Version_Whitelist = _whitelist;
 
-if (!_checkAll) exitWith {}; //ACE is checked by FUNC(checkFiles)
+// ACE is checked by FUNC(checkFiles)
+if (!_checkAll) exitWith {};
 
 if (!isServer) then {
-    [{
-        if (isNil "ACE_Version_ClientErrors") exitWith {};
+    ["ace_versioning_clientCheckDone", {
+        // Don't let this event get triggered again
+        [_thisType, _thisId] call CBA_fnc_removeEventHandler;
 
-        ACE_Version_ClientErrors params ["_missingAddon", "_missingAddonServer", "_oldVersionClient", "_oldVersionServer"];
+        params ["_clientErrors"];
+        _clientErrors params ["_missingAddonClient", "_additionalAddonClient", "_olderVersionClient", "_newerVersionClient"];
+        _thisArgs params ["_mode"];
 
-        (_this select 0) params ["_mode", "_checkAll", "_whitelist"];
+        // Display error message(s)
+        if (_missingAddonClient || {_additionalAddonClient} || {_olderVersionClient} || {_newerVersionClient}) then {
+            private _errorMsg = "[ACE] Version mismatch:<br/><br/>";
+            private _error = [];
 
-        // Display error message.
-        if (_missingAddon || {_missingAddonServer} || {_oldVersionClient} || {_oldVersionServer}) then {
-            private _text = "[ACE] Version mismatch:<br/><br/>";
-            private _error = format ["ACE version mismatch: %1: ", profileName];
-
-            if (_missingAddon) then {
-                _text = _text + "Detected missing addon on client<br/>";
-                _error = _error + "Missing file(s); ";
-            };
-            if (_missingAddonServer) then {
-                _text = _text + "Detected missing addon on server<br/>";
-                _error = _error + "Additional file(s); ";
-            };
-            if (_oldVersionClient) then {
-                _text = _text + "Detected old client version<br/>";
-                _error = _error + "Older version; ";
-            };
-            if (_oldVersionServer) then {
-                _text = _text + "Detected old server version<br/>";
-                _error = _error + "Newer version; ";
+            if (_missingAddonClient) then {
+                _errorMsg = _errorMsg + "Detected missing addon on client<br/>";
+                _error pushBack "Missing file(s)";
             };
 
-            //[QGVAR(systemChatGlobal), _error] call CBA_fnc_globalEvent;
+            if (_additionalAddonClient) then {
+                _errorMsg = _errorMsg + "Detected additional addon on client<br/>";
+                _error pushBack "Additional file(s)";
+            };
 
-            ERROR(_error);
+            if (_olderVersionClient) then {
+                _errorMsg = _errorMsg + "Detected older client version<br/>";
+                _error pushBack "Older version";
+            };
 
+            if (_newerVersionClient) then {
+                _errorMsg = _errorMsg + "Detected newer client version<br/>";
+                _error pushBack "Newer version";
+            };
+
+            ERROR_2("[ACE] Version mismatch: %1: %2",profileName,_error joinString ", ");
+
+            _errorMsg = parseText format ["<t align='center'>%1</t>", _errorMsg];
+
+            // Warn
             if (_mode < 2) then {
-                _text = composeText [lineBreak, parseText format ["<t align='center'>%1</t>", _text]];
-
                 private _rscLayer = "ACE_RscErrorHint" call BIS_fnc_rscLayer;
                 _rscLayer cutRsc ["ACE_RscErrorHint", "PLAIN", 0, true];
 
-                disableSerialization;
-                private _ctrlHint = uiNamespace getVariable "ACE_ctrlErrorHint";
-                _ctrlHint ctrlSetStructuredText _text;
+                (uiNamespace getVariable "ACE_ctrlErrorHint") ctrlSetStructuredText composeText [lineBreak, _errorMsg];
 
                 if (_mode == 0) then {
                     [{
-                        params ["_rscLayer"];
-                        TRACE_2("Hiding Error message after 10 seconds",time,_rscLayer);
-                        _rscLayer cutFadeOut 0.2;
-                    }, [_rscLayer], 10] call CBA_fnc_waitAndExecute;
+                        TRACE_2("Hiding Error message after 10 seconds",time,_this);
+                        _this cutFadeOut 0.2;
+                    }, _rscLayer, 10] call CBA_fnc_waitAndExecute;
                 };
-            };
-
-            if (_mode == 2) then {
-                [{alive player}, { // To be able to show list if using checkAll
-                    params ["_text"];
-                    TRACE_2("Player is alive, showing msg and exiting",time,_text);
-                    _text = composeText [parseText format ["<t align='center'>%1</t>", _text]];
-                    ["[ACE] ERROR", _text, {findDisplay 46 closeDisplay 0}] call FUNC(errorMessage);
-                }, [_text]] call CBA_fnc_waitUntilAndExecute;
+            } else {
+                // Kick
+                ["[ACE] ERROR", composeText [_errorMsg]] call FUNC(errorMessage);
             };
         };
-
-        [_this select 1] call CBA_fnc_removePerFrameHandler;
-    }, 1, [_mode, _checkAll, _whitelist]] call CBA_fnc_addPerFrameHandler;
+    }, [_mode]] call CBA_fnc_addEventHandlerArgs;
 };
 
-if (_checkAll) then {
-    0 spawn COMPILE_FILE(scripts\checkVersionNumber); // @todo
-};
+// Check file version numbers
+[_whitelist] call FUNC(checkVersionNumber);
diff --git a/addons/common/functions/fnc_checkVersionNumber.sqf b/addons/common/functions/fnc_checkVersionNumber.sqf
new file mode 100644
index 0000000000..a286129917
--- /dev/null
+++ b/addons/common/functions/fnc_checkVersionNumber.sqf
@@ -0,0 +1,161 @@
+#include "..\script_component.hpp"
+/*
+ * Author: commy2, johnb43
+ * Compares version numbers from loaded addons.
+ *
+ * Arguments:
+ * 0: Lowercase addon whitelist <ARRAY> (default: missionNamespace getVariable ["ACE_Version_Whitelist", []])
+ *
+ * Return Value:
+ * None
+ *
+ * Example:
+ * call ace_common_fnc_checkVersionNumber
+ *
+ * Public: No
+ */
+
+// Don't execute in scheduled environment
+if (canSuspend) exitWith {
+    [FUNC(checkVersionNumber), _this] call CBA_fnc_directCall;
+};
+
+params [["_whitelist", missionNamespace getVariable ["ACE_Version_Whitelist", []]]];
+
+private _files = CBA_common_addons select {
+    (_x select [0, 3] != "a3_") &&
+    {_x select [0, 4] != "ace_"} &&
+    {!((toLowerANSI _x) in _whitelist)}
+};
+
+private _cfgPatches = configFile >> "CfgPatches";
+private _versions = [];
+
+{
+    (getText (_cfgPatches >> _x >> "version") splitString ".") params [["_major", "0"], ["_minor", "0"]];
+    private _version = parseNumber _major + parseNumber _minor / 100;
+    _versions pushBack _version;
+} forEach _files;
+
+if (isServer) exitWith {
+    ACE_Version_ServerVersions = [_files, _versions];
+    publicVariable "ACE_Version_ServerVersions";
+
+    // Raise event when done
+    ["ace_versioning_serverCheckDone", [+ACE_Version_ServerVersions]] call CBA_fnc_localEvent;
+};
+
+// Begin client version check
+ACE_Version_ClientVersions = [_files, _versions];
+
+private _fnc_check = {
+    ACE_Version_ClientVersions params [["_files", []], ["_versions", []]];
+    ACE_Version_ServerVersions params [["_serverFiles", []], ["_serverVersions", []]];
+
+    // Compare client and server files and versions
+    private _client = profileName;
+    private _missingAddonsClient = [];
+    private _olderVersionsClient = [];
+    private _newerVersionsClient = [];
+
+    {
+        private _serverVersion = _serverVersions select _forEachIndex;
+
+        private _index = _files find _x;
+
+        if (_index == -1) then {
+            if (_x != "ace_server") then {
+                _missingAddonsClient pushBack _x;
+            };
+        } else {
+            private _clientVersion = _versions select _index;
+
+            if (_clientVersion < _serverVersion) then {
+                _olderVersionsClient pushBack [_x, _clientVersion, _serverVersion];
+            };
+
+            if (_clientVersion > _serverVersion) then {
+                _newerVersionsClient pushBack [_x, _clientVersion, _serverVersion];
+            };
+        };
+    } forEach _serverFiles;
+
+    // Find client files which the server doesn't have
+    private _additionalAddonsClient = _files select {!(_x in _serverFiles)};
+
+    // Check for client missing addons, server missing addons, client outdated addons and server outdated addons
+    private _clientErrors = [];
+
+    #define DISPLAY_NUMBER_ADDONS (10 + 1) // +1 to account for header
+
+    {
+        _x params ["_items", "_string"];
+
+        // Check if something is either missing or outdated
+        private _isMissingItems = _items isNotEqualTo [];
+
+        if (_isMissingItems) then {
+            // Generate error message
+            private _errorLog = +_items;
+            private _header = format ["[ACE] %1: ERROR %2 addon(s): ", _client, _string];
+
+            // Don't display all missing items, as they are logged
+            private _errorMsg = _header + ((_errorLog select [0, DISPLAY_NUMBER_ADDONS]) joinString ", ");
+            _errorLog = _header + (_errorLog joinString ", ");
+
+            private _count = count _items;
+
+            if (_count > DISPLAY_NUMBER_ADDONS) then {
+                _errorMsg = _errorMsg + format [", and %1 more.", _count - DISPLAY_NUMBER_ADDONS];
+            };
+
+            // Wait until in briefing screen
+            [{
+                getClientStateNumber >= 9 // "BRIEFING SHOWN"
+            }, {
+                params ["_errorLog", "_errorMsg"];
+
+                // Log and display error messages
+                diag_log text _errorLog;
+                [QGVAR(serverLog), _errorLog] call CBA_fnc_serverEvent;
+                [QGVAR(systemChatGlobal), _errorMsg] call CBA_fnc_globalEvent;
+
+                // Wait until after map screen
+                [{
+                    !isNull (call BIS_fnc_displayMission)
+                }, {
+                    params ["_errorMsg", "_timeOut"];
+
+                    // If the briefing screen was shown for less than 5 seconds, display the error message again, but locally
+                    if (_timeOut < CBA_missionTime) exitWith {};
+
+                    // Make sure systemChat is ready by waiting a bit
+                    [{
+                        systemChat _this;
+                    }, _errorMsg, 1] call CBA_fnc_waitAndExecute;
+                }, [_errorMsg, CBA_missionTime + 5]] call CBA_fnc_waitUntilAndExecute;
+            }, [_errorLog, _errorMsg]] call CBA_fnc_waitUntilAndExecute;
+        };
+
+        _clientErrors pushBack _isMissingItems;
+    } forEach [
+        [_missingAddonsClient, "client missing"],
+        [_additionalAddonsClient, "client additional"],
+        [_olderVersionsClient, "older client"],
+        [_newerVersionsClient, "newer client"]
+    ];
+
+    TRACE_4("",_missingAddonsClient,_additionalAddonsClient,_olderVersionsClient,_newerVersionsClient);
+
+    ACE_Version_ClientErrors = _clientErrors;
+
+    // Raise event when done
+    ["ace_versioning_clientCheckDone", [+ACE_Version_ClientErrors]] call CBA_fnc_localEvent;
+};
+
+// Wait for server to send the servers files and version numbers
+if (isNil "ACE_Version_ServerVersions") then {
+    ACE_Version_ServerVersions addPublicVariableEventHandler _fnc_check;
+} else {
+    call _fnc_check;
+};
diff --git a/addons/common/functions/fnc_defineVariable.sqf b/addons/common/functions/fnc_defineVariable.sqf
index 6cf537b1f8..85eb7b447f 100644
--- a/addons/common/functions/fnc_defineVariable.sqf
+++ b/addons/common/functions/fnc_defineVariable.sqf
@@ -24,7 +24,7 @@ params ["_name", "_value", "_defaultGlobal", "_category", ["_code", 0], ["_persi
 
 if (isNil "_defaultGlobal") exitWith {};
 
-if (!(_name isEqualType "")) exitwith {
+if !(_name isEqualType "") exitwith {
     [format ["Tried to the deinfe a variable with an invalid name: %1 Arguments: %2", _name, _this]] call FUNC(debug);
 };
 
diff --git a/addons/common/functions/fnc_disableAI.sqf b/addons/common/functions/fnc_disableAI.sqf
index 52f1ed37c3..a0c725c7db 100644
--- a/addons/common/functions/fnc_disableAI.sqf
+++ b/addons/common/functions/fnc_disableAI.sqf
@@ -29,7 +29,7 @@ if !([_unit] call EFUNC(common,isPlayer)) then {
         _unit disableConversation true;
     } else {
         //Sanity check to make sure we don't enable unconsious AI
-        if (_unit getVariable ["ace_isunconscious", false] && alive _unit) exitWith {
+        if (_unit getVariable ["ACE_isUnconscious", false] && alive _unit) exitWith {
             ERROR("Enabling AI for unconsious unit");
         };
 
diff --git a/addons/common/functions/fnc_disableAiUAV.sqf b/addons/common/functions/fnc_disableAiUAV.sqf
new file mode 100644
index 0000000000..195e3ed2dc
--- /dev/null
+++ b/addons/common/functions/fnc_disableAiUAV.sqf
@@ -0,0 +1,45 @@
+#include "..\script_component.hpp"
+/*
+ * Author: johnb43
+ * Disables/Enables UAV AI crew members, can be run on any machine and is applied globally.
+ *
+ * Arguments:
+ * 0: Unit <OBJECT>
+ * 1: Disable AI <BOOL>
+ *
+ * Return Value:
+ * None
+ *
+ * Example:
+ * [cursorObject, true] call ace_common_fnc_disableAiUAV
+ *
+ * Public: No
+ */
+
+params [["_unit", objNull, [objNull]], ["_disable", true, [false]]];
+
+// Allow disabling of Zeus remote controlled units
+if (!alive _unit || {isPlayer _unit} || {!unitIsUAV _unit}) exitWith {};
+
+if (_disable) then {
+    // Ignore if already disabled
+    if (!isNil "_jipID") exitWith {};
+
+    // Disable shooting and targeting on every machine
+    // Give predefined JIP ID, in case of simultaneous executions on different machines
+    private _jipID = [QGVAR(disableAiUAV), [_unit, _disable], QGVAR(disableAiUAV_) + hashValue _unit] call CBA_fnc_globalEventJIP;
+    [_jipID, _unit] call CBA_fnc_removeGlobalEventJIP;
+
+    _unit setVariable [QGVAR(disableAiUavJipID), _jipID, true];
+} else {
+    // Restore shooting and targeting to each client's individual state prior to disabling
+    private _jipID = _unit getVariable QGVAR(disableAiUavJipID);
+
+    if (isNil "_jipID") exitWith {};
+
+    _jipID call CBA_fnc_removeGlobalEventJIP;
+
+    _unit setVariable [QGVAR(disableAiUavJipID), nil, true];
+
+    [QGVAR(disableAiUAV), [_unit, _disable]] call CBA_fnc_globalEvent;
+};
diff --git a/addons/common/functions/fnc_errorMessage.sqf b/addons/common/functions/fnc_errorMessage.sqf
index 021fdba10c..e98a5baf8f 100644
--- a/addons/common/functions/fnc_errorMessage.sqf
+++ b/addons/common/functions/fnc_errorMessage.sqf
@@ -1,147 +1,141 @@
 #include "..\script_component.hpp"
+#include "\a3\ui_f\hpp\defineResincl.inc"
+#include "\a3\ui_f\hpp\defineDIKCodes.inc"
 /*
- * Author: commy2, based on BIS_fnc_errorMsg and BIS_fnc_guiMessage by Karel Moricky (BI)
- * Stops simulation and opens a textbox with error message.
+ * Author: commy2, johnb43, based on BIS_fnc_errorMsg and BIS_fnc_guiMessage by Karel Moricky (BI)
+ * Opens a textbox with an error message, used for PBO checking.
  *
  * Arguments:
- * ?
+ * 0: Header <STRING>
+ * 1: Text <STRING|TEXT>
  *
  * Return Value:
  * None
  *
  * Example:
- * call ace_common_fnc_errorMessage
+ * ["[ACE] ERROR", "Test"] call ace_common_fnc_errorMessage
  *
  * Public: No
  */
 
-disableSerialization;
+// Force stop any loading screens
 endLoadingScreen;
 
-// no message without player possible
+// No message without interface possible
 if (!hasInterface) exitWith {};
 
-// wait for display
-if (isNull (call BIS_fnc_displayMission)) exitWith {
-    [{
-        if (isNull (call BIS_fnc_displayMission)) exitWith {};
+[{
+    !isNull (call BIS_fnc_displayMission)
+}, {
+    params ["_textHeader", "_textMessage"];
 
-        (_this select 0) call FUNC(errorMessage);
-        [_this select 1] call CBA_fnc_removePerFrameHandler;
+    disableSerialization;
 
-    }, 1, _this] call CBA_fnc_addPerFrameHandler;
-};
+    // Use curator display if present
+    private _curatorDisplay = findDisplay 312;
 
-params ["_textHeader", "_textMessage", ["_onOK", {}], ["_onCancel", {}]];
+    private _mainDisplay = if (!isNull _curatorDisplay) then {
+        _curatorDisplay
+    } else {
+        call BIS_fnc_displayMission
+    };
 
-if (_textMessage isEqualType "") then {
-    _textMessage = parseText _textMessage;
-};
+    if (_textMessage isEqualType "") then {
+        _textMessage = parseText _textMessage;
+    };
 
-ARR_SELECT(_this,4,call BIS_fnc_displayMission) createDisplay "RscDisplayCommonMessagePause";
+    private _display = _mainDisplay createDisplay "RscDisplayCommonMessagePause";
 
-private _display = uiNamespace getVariable "RscDisplayCommonMessage_display";
-private _ctrlRscMessageBox =          _display displayCtrl 2351;
-private _ctrlBcgCommonTop =           _display displayCtrl 235100;
-private _ctrlBcgCommon =              _display displayCtrl 235101;
-private _ctrlText =                   _display displayCtrl 235102;
-private _ctrlBackgroundButtonOK =     _display displayCtrl 235103;
-private _ctrlBackgroundButtonMiddle = _display displayCtrl 235104;
-private _ctrlBackgroundButtonCancel = _display displayCtrl 235105;
-private _ctrlButtonOK =               _display displayCtrl 235106;
-private _ctrlButtonCancel =           _display displayCtrl 235107;
+    if (isNull _display) exitWith {};
 
-_ctrlBcgCommonTop ctrlSetText _textHeader;
+    private _ctrlRscMessageBox =          _display displayCtrl 2351;
+    private _ctrlBcgCommonTop =           _display displayCtrl 235100;
+    private _ctrlBcgCommon =              _display displayCtrl 235101;
+    private _ctrlText =                   _display displayCtrl 235102;
+    private _ctrlBackgroundButtonOK =     _display displayCtrl 235103;
+    private _ctrlBackgroundButtonMiddle = _display displayCtrl 235104;
+    private _ctrlBackgroundButtonCancel = _display displayCtrl 235105;
+    private _ctrlButtonOK =               _display displayCtrl 235106;
+    private _ctrlButtonCancel =           _display displayCtrl 235107;
 
-private _ctrlButtonOKPos = ctrlPosition _ctrlButtonOK;
-private _ctrlBcgCommonPos = ctrlPosition _ctrlBcgCommon;
-private _bottomSpaceY = (_ctrlButtonOKPos select 1) - ((_ctrlBcgCommonPos select 1) + (_ctrlBcgCommonPos select 3));
+    _ctrlBcgCommonTop ctrlSetText _textHeader;
 
-private _ctrlTextPos = ctrlPosition _ctrlText;
-private _marginX = (_ctrlTextPos select 0) - (_ctrlBcgCommonPos select 0);
-private _marginY = (_ctrlTextPos select 1) - (_ctrlBcgCommonPos select 1);
+    private _ctrlButtonOKPos = ctrlPosition _ctrlButtonOK;
+    private _ctrlBcgCommonPos = ctrlPosition _ctrlBcgCommon;
+    private _bottomSpaceY = (_ctrlButtonOKPos select 1) - ((_ctrlBcgCommonPos select 1) + (_ctrlBcgCommonPos select 3));
 
-_ctrlText ctrlSetStructuredText _textMessage;
-private _ctrlTextPosH = ctrlTextHeight _ctrlText;
+    private _ctrlTextPos = ctrlPosition _ctrlText;
+    private _marginX = (_ctrlTextPos select 0) - (_ctrlBcgCommonPos select 0);
+    private _marginY = (_ctrlTextPos select 1) - (_ctrlBcgCommonPos select 1);
 
-_ctrlBcgCommon ctrlSetPosition [
-    _ctrlBcgCommonPos select 0,
-    _ctrlBcgCommonPos select 1,
-    _ctrlBcgCommonPos select 2,
-    _ctrlTextPosH + _marginY * 2
-];
-_ctrlBcgCommon ctrlCommit 0;
+    _ctrlText ctrlSetStructuredText _textMessage;
+    private _ctrlTextPosH = ctrlTextHeight _ctrlText;
 
-_ctrlText ctrlSetPosition [
-    (_ctrlBcgCommonPos select 0) + _marginX,
-    (_ctrlBcgCommonPos select 1) + _marginY,
-    (_ctrlBcgCommonPos select 2) - _marginX * 2,
-    _ctrlTextPosH
-];
-_ctrlText ctrlCommit 0;
+    _ctrlBcgCommon ctrlSetPosition [
+        _ctrlBcgCommonPos select 0,
+        _ctrlBcgCommonPos select 1,
+        _ctrlBcgCommonPos select 2,
+        _ctrlTextPosH + _marginY * 2
+    ];
+    _ctrlBcgCommon ctrlCommit 0;
 
-private _bottomPosY = (_ctrlBcgCommonPos select 1) + _ctrlTextPosH + (_marginY * 2) + _bottomSpaceY;
+    _ctrlText ctrlSetPosition [
+        (_ctrlBcgCommonPos select 0) + _marginX,
+        (_ctrlBcgCommonPos select 1) + _marginY,
+        (_ctrlBcgCommonPos select 2) - _marginX * 2,
+        _ctrlTextPosH
+    ];
+    _ctrlText ctrlCommit 0;
 
-{
-    private _xPos = ctrlPosition _x;
+    private _bottomPosY = (_ctrlBcgCommonPos select 1) + _ctrlTextPosH + (_marginY * 2) + _bottomSpaceY;
 
-    _xPos set [1, _bottomPosY];
-    _x ctrlSetPosition _xPos;
-    _x ctrlCommit 0;
-} forEach [
-    _ctrlBackgroundButtonOK,
-    _ctrlBackgroundButtonMiddle,
-    _ctrlBackgroundButtonCancel,
-    _ctrlButtonOK,
-    _ctrlButtonCancel
-];
+    {
+        private _xPos = ctrlPosition _x;
 
-private _ctrlRscMessageBoxPos = ctrlPosition _ctrlRscMessageBox;
-private _ctrlRscMessageBoxPosH = _bottomPosY + (_ctrlButtonOKPos select 3);
+        _xPos set [1, _bottomPosY];
+        _x ctrlSetPosition _xPos;
+        _x ctrlCommit 0;
+    } forEach [
+        _ctrlBackgroundButtonOK,
+        _ctrlBackgroundButtonMiddle,
+        _ctrlBackgroundButtonCancel,
+        _ctrlButtonOK,
+        _ctrlButtonCancel
+    ];
 
-_ctrlRscMessageBox ctrlSetPosition [
-    0.5 - (_ctrlBcgCommonPos select 2) / 2,
-    0.5 - _ctrlRscMessageBoxPosH / 2,
-    (_ctrlBcgCommonPos select 2) + 0.5,
-    _ctrlRscMessageBoxPosH
-];
+    private _ctrlRscMessageBoxPos = ctrlPosition _ctrlRscMessageBox;
+    private _ctrlRscMessageBoxPosH = _bottomPosY + (_ctrlButtonOKPos select 3);
 
-_ctrlRscMessageBox ctrlEnable true;
-_ctrlRscMessageBox ctrlCommit 0;
+    _ctrlRscMessageBox ctrlSetPosition [
+        0.5 - (_ctrlBcgCommonPos select 2) / 2,
+        0.5 - _ctrlRscMessageBoxPosH / 2,
+        (_ctrlBcgCommonPos select 2) + 0.5,
+        _ctrlRscMessageBoxPosH
+    ];
 
-if (_onOK isEqualTo {}) then {
-    _ctrlButtonOK ctrlEnable false;
-    _ctrlButtonOK ctrlSetFade 0;
-    _ctrlButtonOK ctrlSetText "";
-    _ctrlButtonOK ctrlCommit 0;
-} else {
+    _ctrlRscMessageBox ctrlEnable true;
+    _ctrlRscMessageBox ctrlCommit 0;
+
+    // Enable ok button
     _ctrlButtonOK ctrlEnable true;
     _ctrlButtonOK ctrlSetFade 0;
     _ctrlButtonOK ctrlSetText localize "STR_DISP_OK";
     _ctrlButtonOK ctrlCommit 0;
 
     ctrlSetFocus _ctrlButtonOK;
-};
 
-if (_onCancel isEqualTo {}) then {
+    // Disable cancel button
     _ctrlButtonCancel ctrlEnable false;
     _ctrlButtonCancel ctrlSetFade 0;
     _ctrlButtonCancel ctrlSetText "";
     _ctrlButtonCancel ctrlCommit 0;
-} else {
-    _ctrlButtonCancel ctrlEnable true;
-    _ctrlButtonCancel ctrlSetFade 0;
-    _ctrlButtonCancel ctrlSetText localize "STR_DISP_CANCEL";
-    _ctrlButtonCancel ctrlCommit 0;
 
-    ctrlSetFocus _ctrlButtonCancel;
-};
+    _ctrlButtonOK ctrlAddEventHandler ["ButtonClick", {(ctrlParent (_this select 0)) closeDisplay IDC_OK; true}];
 
-_ctrlButtonOK ctrlAddEventHandler ["buttonClick", {(ctrlParent (_this select 0)) closeDisplay 1; true}];
-_ctrlButtonCancel ctrlAddEventHandler ["buttonClick", {(ctrlParent (_this select 0)) closeDisplay 2; true}];
+    // Intercept all keystrokes except the enter keys
+    _display displayAddEventHandler ["KeyDown", {!((_this select 1) in [DIK_RETURN, DIK_NUMPADENTER])}];
 
-GVAR(errorOnOK) = _onOK;
-GVAR(errorOnCancel) = _onCancel;
-
-_display displayAddEventHandler ["unload", {call ([{}, GVAR(errorOnOK), GVAR(errorOnCancel)] select (_this select 1))}];
-_display displayAddEventHandler ["keyDown", {_this select 1 == 1}];
+    // Close curator and mission displays (because of the message display, it doesn't quit the mission yet)
+    findDisplay 312 closeDisplay 0;
+    findDisplay 46 closeDisplay 0;
+}, _this] call CBA_fnc_waitUntilAndExecute;
diff --git a/addons/common/functions/fnc_getSettingData.sqf b/addons/common/functions/fnc_getSettingData.sqf
index a2dceb746c..eeb8dff1d8 100644
--- a/addons/common/functions/fnc_getSettingData.sqf
+++ b/addons/common/functions/fnc_getSettingData.sqf
@@ -32,7 +32,6 @@ scopeName "main";
     if (_x select 0 == _name) then {
         _x breakOut "main";
     };
-    false
-} count GVAR(settings);
+} forEach GVAR(settings);
 
 []
diff --git a/addons/common/functions/fnc_getWeaponModes.sqf b/addons/common/functions/fnc_getWeaponModes.sqf
index c1ca241cab..42a29681f2 100644
--- a/addons/common/functions/fnc_getWeaponModes.sqf
+++ b/addons/common/functions/fnc_getWeaponModes.sqf
@@ -1,34 +1,45 @@
 #include "..\script_component.hpp"
 /*
- * Author: commy2
+ * Author: commy2, johnb43
  * Get the available firing modes of a weapon. Will ignore the AI helper modes.
  *
  * Arguments:
  * 0: Weapon <STRING>
+ * 1: Muzzle <STRING> (default: weapon)
  *
  * Return Value:
  * Firing Modes <ARRAY>
  *
  * Example:
- * ["gun"] call ace_common_fnc_getWeaponModes
+ * "arifle_AK12_F" call ace_common_fnc_getWeaponModes
  *
  * Public: Yes
  */
 
-params [["_weapon", "", [""]]];
+params [["_weapon", "", [""]], ["_muzzle", nil, [""]]];
 
 private _config = configFile >> "CfgWeapons" >> _weapon;
 
+if (!isNil "_muzzle") then {
+    _config = _config >> _muzzle
+};
+
+if (!isClass _config) exitWith {
+    [] // return
+};
+
 private _modes = [];
 
 {
     if (getNumber (_config >> _x >> "showToPlayer") == 1) then {
-        _modes pushBack _x;
-    };
-
-    if (_x == "this") then {
-        _modes pushBack _weapon;
+        if (_x == "this") then {
+            _modes pushBack (configName _config);
+        } else {
+            if (isClass (_config >> _x)) then {
+                _modes pushBack (configName (_config >> _x));
+            };
+        };
     };
 } forEach getArray (_config >> "modes");
 
-_modes
+_modes // return
diff --git a/addons/common/functions/fnc_getWeaponMuzzles.sqf b/addons/common/functions/fnc_getWeaponMuzzles.sqf
index 11fffaf196..0184a0c8c8 100644
--- a/addons/common/functions/fnc_getWeaponMuzzles.sqf
+++ b/addons/common/functions/fnc_getWeaponMuzzles.sqf
@@ -1,6 +1,6 @@
 #include "..\script_component.hpp"
 /*
- * Author: commy2
+ * Author: commy2, johnb43
  * Get the muzzles of a weapon.
  *
  * Arguments:
@@ -10,19 +10,30 @@
  * All weapon muzzles <ARRAY>
  *
  * Example:
- * ["gun"] call ace_common_fnc_getWeaponMuzzles
+ * "arifle_AK12_F" call ace_common_fnc_getWeaponMuzzles
  *
  * Public: Yes
  */
 
 params [["_weapon", "", [""]]];
 
-private _muzzles = getArray (configFile >> "CfgWeapons" >> _weapon >> "muzzles");
+private _config = configFile >> "CfgWeapons" >> _weapon;
 
+if (!isClass _config) exitWith {
+    [] // return
+};
+
+private _muzzles = [];
+
+// Get config case muzzle names
 {
     if (_x == "this") then {
-        _muzzles set [_forEachIndex, configName (configFile >> "CfgWeapons" >> _weapon)];
+        _muzzles pushBack (configName _config);
+    } else {
+        if (isClass (_config >> _x)) then {
+            _muzzles pushBack (configName (_config >> _x));
+        };
     };
-} forEach _muzzles;
+} forEach getArray (_config >> "muzzles");
 
-_muzzles
+_muzzles // return
diff --git a/addons/common/functions/fnc_getWheelHitPointsWithSelections.sqf b/addons/common/functions/fnc_getWheelHitPointsWithSelections.sqf
new file mode 100644
index 0000000000..2194c2aca0
--- /dev/null
+++ b/addons/common/functions/fnc_getWheelHitPointsWithSelections.sqf
@@ -0,0 +1,104 @@
+#include "..\script_component.hpp"
+/*
+ * Author: commy2, johnb43
+ * Returns the wheel hitpoints and their selections.
+ *
+ * Arguments:
+ * 0: Vehicle <OBJECT>
+ *
+ * Return Value:
+ * 0: Wheel hitpoints <ARRAY>
+ * 1: Wheel hitpoint selections <ARRAY>
+ *
+ * Example:
+ * cursorObject call ace_common_fnc_getWheelHitPointsWithSelections
+ *
+ * Public: No
+ */
+
+params ["_vehicle"];
+TRACE_1("params",_vehicle);
+
+// TODO: Fix for GM vehicles
+GVAR(wheelSelections) getOrDefaultCall [typeOf _vehicle, {
+    // Get the vehicles wheel config
+    private _wheels = configOf _vehicle >> "Wheels";
+
+    if (isClass _wheels) then {
+        // Get all hitpoints and selections
+        (getAllHitPointsDamage _vehicle) params ["_hitPoints", "_hitPointSelections"];
+
+        // Get all wheels and read selections from config
+        _wheels = "true" configClasses _wheels;
+
+        private _wheelHitPoints = [];
+        private _wheelHitPointSelections = [];
+
+        {
+            private _wheelName = configName _x;
+            private _wheelCenter = getText (_x >> "center");
+            private _wheelBone = getText (_x >> "boneName");
+            private _wheelBoneNameResized = _wheelBone select [0, 9]; // Count "wheel_X_Y"; // this is a requirement for physx. Should work for all addon vehicles.
+
+            TRACE_4("",_wheelName,_wheelCenter,_wheelBone,_wheelBoneNameResized);
+
+            private _wheelHitPoint = "";
+            private _wheelHitPointSelection = "";
+
+            // Commy's orginal method
+            {
+                if ((_wheelBoneNameResized != "") && {_x find _wheelBoneNameResized == 0}) exitWith {  // same as above. Requirement for physx.
+                    _wheelHitPoint = _hitPoints select _forEachIndex;
+                    _wheelHitPointSelection = _hitPointSelections select _forEachIndex;
+                    TRACE_2("wheel found [Orginal]",_wheelName,_wheelHitPoint);
+                };
+            } forEach _hitPointSelections;
+
+
+            if (_vehicle isKindOf "Car") then {
+                // Backup method, search for the closest hitpoint to the wheel's center selection pos.
+                // Ref #2742 - RHS's HMMWV
+                if (_wheelHitPoint == "") then {
+                    private _wheelCenterPos = _vehicle selectionPosition _wheelCenter;
+                    if (_wheelCenterPos isEqualTo [0, 0, 0]) exitWith {TRACE_1("no center?",_wheelCenter);};
+
+
+                    private _bestDist = 99;
+                    private _bestIndex = -1;
+                    {
+                        if (_x != "") then {
+                             // Filter out things that definitly aren't wheeels (#3759)
+                            if ((toLowerANSI (_hitPoints select _forEachIndex)) in ["hitengine", "hitfuel", "hitbody"]) exitWith {TRACE_1("filter",_x)};
+                            private _xPos = _vehicle selectionPosition _x;
+                            if (_xPos isEqualTo [0, 0, 0]) exitWith {};
+                            private _xDist = _wheelCenterPos distance _xPos;
+                            if (_xDist < _bestDist) then {
+                                _bestIndex = _forEachIndex;
+                                _bestDist = _xDist;
+                            };
+                        };
+                    } forEach _hitPointSelections;
+
+                    TRACE_2("closestPoint",_bestDist,_bestIndex);
+                    if (_bestIndex != -1) then {
+                        _wheelHitPoint = _hitPoints select _bestIndex;
+                        _wheelHitPointSelection = _hitPointSelections select _bestIndex;
+                        TRACE_2("wheel found [Backup]",_wheelName,_wheelHitPoint);
+                    };
+                };
+            };
+
+            if ((_wheelHitPoint != "") && {_wheelHitPointSelection != ""}) then {
+                _wheelHitPoints pushBack _wheelHitPoint;
+                _wheelHitPointSelections pushBack _wheelHitPointSelection;
+            };
+        } forEach _wheels;
+
+        [_wheelHitPoints, _wheelHitPointSelections]
+    } else {
+        // Exit with nothing if the vehicle has no wheels class
+        TRACE_1("No Wheels",_wheels);
+
+        [[], []]
+    }
+}, true] // return
diff --git a/addons/common/functions/fnc_hasItem.sqf b/addons/common/functions/fnc_hasItem.sqf
index f446c5dac0..ac0be8b10e 100644
--- a/addons/common/functions/fnc_hasItem.sqf
+++ b/addons/common/functions/fnc_hasItem.sqf
@@ -1,21 +1,21 @@
 #include "..\script_component.hpp"
 /*
  * Author: Glowbal
- * Check if unit has item. Note: case-sensitive.
+ * Check if given unit has an item of given classname. Note: Case sensitive.
  *
  * Arguments:
  * 0: Unit <OBJECT>
- * 1: Item Classname <STRING>
+ * 1: Item classname <STRING>
  *
  * Return Value:
- * Unit has Item <BOOL>
+ * Unit has item <BOOL>
  *
  * Example:
- * [bob, "item"] call ace_common_fnc_hasItem
+ * [player, "ACE_Banana"] call ace_common_fnc_hasItem
  *
  * Public: Yes
  */
 
 params [["_unit", objNull, [objNull]], ["_item", "", [""]]];
 
-_item in (_unit call EFUNC(common,uniqueItems))
+_item in (_unit call FUNC(uniqueItems)) // return
diff --git a/addons/common/functions/fnc_hasMagazine.sqf b/addons/common/functions/fnc_hasMagazine.sqf
index 7874bcbd16..9f35aafdba 100644
--- a/addons/common/functions/fnc_hasMagazine.sqf
+++ b/addons/common/functions/fnc_hasMagazine.sqf
@@ -1,23 +1,21 @@
 #include "..\script_component.hpp"
 /*
  * Author: Glowbal
- * Check if given unit has a magazine of given classname
+ * Check if given unit has a magazine of given classname. Note: Case sensitive.
  *
  * Arguments:
  * 0: Unit <OBJECT>
- * 1: Magazine Classname <STRING>
+ * 1: Magazine classname <STRING>
  *
  * Return Value:
- * has Magazine <BOOL>
+ * Unit has magazine <BOOL>
  *
  * Example:
- * [bob, "magazine"] call ace_common_fnc_hasMagazine
+ * [player, "30Rnd_65x39_caseless_mag"] call ace_common_fnc_hasMagazine
  *
  * Public: yes
- *
- * Note: Case sensitive
  */
 
 params [["_unit", objNull, [objNull]], ["_magazine", "", [""]]];
 
-_magazine in magazines _unit // return
+_magazine in ([_unit, 2] call FUNC(uniqueItems)) // return
diff --git a/addons/common/functions/fnc_nearestVehiclesFreeSeat.sqf b/addons/common/functions/fnc_nearestVehiclesFreeSeat.sqf
index 71f62959b9..2108751066 100644
--- a/addons/common/functions/fnc_nearestVehiclesFreeSeat.sqf
+++ b/addons/common/functions/fnc_nearestVehiclesFreeSeat.sqf
@@ -22,7 +22,7 @@ params ["_unit", ["_distance", 10], ["_cargoOnly", false]];
 private _nearVehicles = nearestObjects [_unit, ["Car", "Air", "Tank", "Ship_F", "Pod_Heli_Transport_04_crewed_base_F"], _distance];
 _nearVehicles select {
     // Filter cargo seats that will eject unconscious units (e.g. quad bike)
-    private _canSitInCargo = (!(_unit getVariable ['ACE_isUnconscious', false])) || {(getNumber (configOf _x >> "ejectDeadCargo")) == 0};
+    private _canSitInCargo = (_unit call EFUNC(common,isAwake)) || {(getNumber (configOf _x >> "ejectDeadCargo")) == 0};
     ((fullCrew [_x, "", true]) findIf {
         _x params ["_body", "_role", "_cargoIndex"];
         (isNull _body) // seat empty
diff --git a/addons/common/functions/fnc_registerItemReplacement.sqf b/addons/common/functions/fnc_registerItemReplacement.sqf
index ce2fd7e393..f1e068c322 100644
--- a/addons/common/functions/fnc_registerItemReplacement.sqf
+++ b/addons/common/functions/fnc_registerItemReplacement.sqf
@@ -20,15 +20,23 @@
 params [["_oldItem", "", [0,""]], ["_newItems", "", ["", []]], ["_replaceInherited", false, [false]]];
 TRACE_3("registerItemReplacement",_oldItem,_newItems,_replaceInherited);
 
-
 // Setup on first run
 if (isNil QGVAR(itemReplacements)) then {
-    GVAR(itemReplacements) = [] call CBA_fnc_createNamespace;
+    GVAR(itemReplacements) = createHashMap;
     GVAR(inheritedReplacements) = [];
     GVAR(oldItems) = [];
     ["loadout", LINKFUNC(replaceRegisteredItems)] call CBA_fnc_addPlayerEventHandler;
 };
 
+// Get config case - if item doesn't exist, "" is returned
+if (_oldItem isEqualType "") then {
+    _oldItem = _oldItem call FUNC(getConfigName);
+};
+
+if (_oldItem isEqualTo "") exitWith {
+    ERROR("Item doesn't exist");
+};
+
 // Save item replacement
 // $ prefix is used for types (numbers) and replacements with inheritance
 if (_replaceInherited) then {
@@ -42,9 +50,8 @@ if (_newItems isEqualType "") then {
     _newItems = [_newItems];
 };
 
-private _oldReplacements = GVAR(itemReplacements) getVariable [_oldItem, []];
+private _oldReplacements = GVAR(itemReplacements) getOrDefault [_oldItem, [], true];
 _oldReplacements append _newItems;
-GVAR(itemReplacements) setVariable [_oldItem, _oldReplacements];
 
 // Force item scan when new replacement was registered in PostInit
 if !(isNull ACE_player) then {
diff --git a/addons/common/functions/fnc_replaceRegisteredItems.sqf b/addons/common/functions/fnc_replaceRegisteredItems.sqf
index bfe2e493e0..baa591c8d8 100644
--- a/addons/common/functions/fnc_replaceRegisteredItems.sqf
+++ b/addons/common/functions/fnc_replaceRegisteredItems.sqf
@@ -42,7 +42,7 @@ for "_i" from 0 to count _newItems - 1 do {
     private _replacements = [];
 
     // Determine replacement items: direct replacements, ...
-    private _directReplacements = GVAR(itemReplacements) getVariable _item;
+    private _directReplacements = GVAR(itemReplacements) get _item;
     if (!isNil "_directReplacements") then {
         _doReplace = true;
         _replacements append _directReplacements;
@@ -50,7 +50,7 @@ for "_i" from 0 to count _newItems - 1 do {
 
     // ... item type replacements ...
     private _type = getNumber (_cfgWeapons >> _item >> "ItemInfo" >> "type");
-    private _typeReplacements = GVAR(itemReplacements) getVariable ("$" + str _type);
+    private _typeReplacements = GVAR(itemReplacements) get ("$" + str _type);
     if (!isNil "_typeReplacements") then {
         _doReplace = true;
         _replacements append _typeReplacements;
@@ -59,7 +59,7 @@ for "_i" from 0 to count _newItems - 1 do {
     // ... and inherited replacements
     {
         if (_item isKindOf [_x, _cfgWeapons]) then {
-            private _inheritedReplacements = GVAR(itemReplacements) getVariable _x;
+            private _inheritedReplacements = GVAR(itemReplacements) get _x;
             if (!isNil "_inheritedReplacements") then {
                 _doReplace = true;
                 _replacements append _inheritedReplacements;
diff --git a/addons/common/functions/fnc_setDead.sqf b/addons/common/functions/fnc_setDead.sqf
index 316f7346cc..f6d62abd34 100644
--- a/addons/common/functions/fnc_setDead.sqf
+++ b/addons/common/functions/fnc_setDead.sqf
@@ -24,7 +24,7 @@ if (!local _unit) exitWith {
     WARNING_1("setDead executed on non-local unit - %1",_this);
 };
 
-if (["ace_medical"] call EFUNC(common,isModLoaded)) then {
+if (GETEGVAR(medical,enabled,false)) then {
     [_unit, _reason, _source, _instigator] call EFUNC(medical_status,setDead);
 } else {
     // From 'ace_medical_status_fnc_setDead': Kill the unit without changing visual appearance
diff --git a/addons/common/functions/fnc_setWeaponLightLaserState.sqf b/addons/common/functions/fnc_setWeaponLightLaserState.sqf
new file mode 100644
index 0000000000..7f50573acb
--- /dev/null
+++ b/addons/common/functions/fnc_setWeaponLightLaserState.sqf
@@ -0,0 +1,59 @@
+#include "..\script_component.hpp"
+/*
+ * Author: johnb43
+ * Toggles the unit's current weapon's light & laser.
+ * API for persistent lasers. Doesn't work on AI, as they have their own logic.
+ *
+ * Arguments:
+ * 0: Unit <OBJECT>
+ * 1: Weapon light/laser state <BOOL> (default: false)
+ *
+ * Return Value:
+ * None
+ *
+ * Example:
+ * [player, true] call ace_common_fnc_setWeaponLightLaserState
+ *
+ * Public: Yes
+ */
+
+params [["_unit", objNull, [objNull]], ["_state", false, [false]]];
+
+if (!local _unit || {!alive _unit} || {!(_unit call FUNC(isPlayer))}) exitWith {};
+
+if !(_unit call CBA_fnc_canUseWeapon) exitWith {};
+
+private _currentWeapon = currentWeapon _unit;
+
+// Exit if unit has no weapon selected
+if (_currentWeapon == "") exitWith {};
+
+private _weaponIndex = [_unit, _currentWeapon] call FUNC(getWeaponIndex);
+
+// Ignore binoculars
+if (_weaponIndex == -1) exitWith {};
+
+_unit setVariable [QGVAR(laserEnabled_) + str _weaponIndex, _state];
+
+// Turn off light/laser (switching between weapons can leave previous weapon laser on)
+action ["GunLightOff", _unit];
+action ["IRLaserOff", _unit];
+
+// Light/laser is off, don't need to do anything more
+if (!_state) exitWith {};
+
+// Turn laser on next frame (if weapon hasn't changed)
+[{
+    params ["_unit", "_currentWeapon"];
+
+    private _weaponState = (weaponState _unit) select [0, 3];
+
+    if (_weaponState select 0 != _currentWeapon) exitWith {};
+
+    action ["GunLightOn", _unit];
+    action ["IRLaserOn", _unit];
+
+    _unit selectWeapon _weaponState;
+}, [_unit, _currentWeapon]] call CBA_fnc_execNextFrame;
+
+nil
diff --git a/addons/common/functions/fnc_showHud.sqf b/addons/common/functions/fnc_showHud.sqf
index 1ca7ca8106..5bb0153772 100644
--- a/addons/common/functions/fnc_showHud.sqf
+++ b/addons/common/functions/fnc_showHud.sqf
@@ -56,7 +56,7 @@ private _resultMask = [];
 for "_index" from 0 to 9 do {
     private _set = true; //Default to true
     {
-        if (!(_x select _index)) exitWith {
+        if !(_x select _index) exitWith {
             _set = false; //Any false will make it false
         };
     } forEach _masks;
diff --git a/addons/common/functions/fnc_switchAttachmentMode.sqf b/addons/common/functions/fnc_switchAttachmentMode.sqf
new file mode 100644
index 0000000000..f721428a53
--- /dev/null
+++ b/addons/common/functions/fnc_switchAttachmentMode.sqf
@@ -0,0 +1,73 @@
+#include "..\script_component.hpp"
+/*
+ * Author: PabstMirror
+ * Switch attachment from one mode to another - based on CBA_accessory_fnc_switchAttachment
+ * ToDo: Port this to CBA?
+ *
+ * Arguments:
+ * 0: Unit <OBJECT>
+ * 1: Weapon (String or CBA-Weapon-Index (not ace's getWeaponIndex)) <STRING|NUMBER>
+ * 2: From <STRING>
+ * 3: To <STRING>
+ *
+ * Return Value:
+ * None
+ *
+ * Example:
+ * [player, 0, "ACE_DBAL_A3_Green_VP", "ACE_DBAL_A3_Green"] call ace_common_fnc_switchAttachmentMode
+ *
+ * Public: No
+ */
+
+params ["_unit", "_weapon", "_currItem", "_switchItem"];
+TRACE_4("switchAttachmentMode",_unit,_weapon,_currItem,_switchItem);
+
+if (_weapon isEqualTo "") exitWith {};
+
+private _exit = _unit != ACE_player;
+switch (_weapon) do {
+    case 0;
+    case (primaryWeapon _unit): {
+        private _currWeaponType = 0;
+        _unit removePrimaryWeaponItem _currItem;
+        [{
+            params ["_unit", "", "_switchItem"];
+            _unit addPrimaryWeaponItem _switchItem;
+            ["CBA_attachmentSwitched", _this] call CBA_fnc_localEvent;
+        }, [_unit, _currItem, _switchItem, _currWeaponType]] call CBA_fnc_execNextFrame;
+    };
+    case 1;
+    case (handgunWeapon _unit): {
+        private _currWeaponType = 1;
+        _unit removeHandgunItem _currItem;
+        [{
+            params ["_unit", "", "_switchItem"];
+            _unit addHandgunItem _switchItem;
+            ["CBA_attachmentSwitched", _this] call CBA_fnc_localEvent;
+        }, [_unit, _currItem, _switchItem, _currWeaponType]] call CBA_fnc_execNextFrame;
+    };
+    case 2;
+    case (secondaryWeapon _unit): {
+        private _currWeaponType = 2;
+        _unit removeSecondaryWeaponItem _currItem;
+        [{
+            params ["_unit", "", "_switchItem"];
+            _unit addSecondaryWeaponItem _switchItem;
+            ["CBA_attachmentSwitched", _this] call CBA_fnc_localEvent;
+        }, [_unit, _currItem, _switchItem, _currWeaponType]] call CBA_fnc_execNextFrame;
+    };
+    default {
+        ERROR_1("bad weapon - %1",_this);
+        _exit = true;
+    };
+};
+if (_exit) exitWith {}; // Don't notify if the unit isn't the local player or if an invalid weapon was passed
+
+private _configSwitchItem = configfile >> "CfgWeapons" >> _switchItem;
+private _switchItemHintText = getText (_configSwitchItem >> "MRT_SwitchItemHintText");
+private _switchItemHintImage = getText (_configSwitchItem >> "picture");
+
+playSound "click";
+if (_switchItemHintText != "") then {
+    [[_switchItemHintImage, 2.0], [_switchItemHintText], true] call CBA_fnc_notify;
+};
diff --git a/addons/common/functions/fnc_switchPersistentLaser.sqf b/addons/common/functions/fnc_switchPersistentLaser.sqf
index a2b7b9c1a8..d258284edb 100644
--- a/addons/common/functions/fnc_switchPersistentLaser.sqf
+++ b/addons/common/functions/fnc_switchPersistentLaser.sqf
@@ -1,6 +1,6 @@
 #include "..\script_component.hpp"
 /*
- * Author: Dystopian
+ * Author: Dystopian, johnb43
  * Controls persistent laser state.
  *
  * Arguments:
@@ -17,51 +17,85 @@
 
 params ["_enabled"];
 
+if (!hasInterface) exitwith {};
+
+// Reset state
+{
+    ACE_player setVariable [QGVAR(laserEnabled_) + str _x, nil];
+} forEach [0, 1, 2];
+
 if (!_enabled) exitWith {
     if (isNil QGVAR(laserKeyDownEH)) exitWith {};
-    ["KeyDown", GVAR(laserKeyDownEH)] call CBA_fnc_removeDisplayHandler;
+
+    removeUserActionEventHandler ["headlights", "Activate", GVAR(laserKeyDownEH)];
+
     ["loadout", GVAR(laserLoadoutEH)] call CBA_fnc_removePlayerEventHandler;
     ["turret", GVAR(laserTurretEH)] call CBA_fnc_removePlayerEventHandler;
     ["vehicle", GVAR(laserVehicleEH)] call CBA_fnc_removePlayerEventHandler;
     ["weapon", GVAR(laserWeaponEH)] call CBA_fnc_removePlayerEventHandler;
+
+    GVAR(laserKeyDownEH) = nil;
+    GVAR(laserLoadoutEH) = nil;
+    GVAR(laserTurretEH) = nil;
+    GVAR(laserVehicleEH) = nil;
+    GVAR(laserWeaponEH) = nil;
 };
 
-GVAR(laserKeyDownEH) = ["KeyDown", {
-    if !((_this select 1) in actionKeys "headlights") exitWith {false};
-    private _weapon = currentWeapon ACE_player;
-    [
-        {
-            params ["_weapon", "_laserWasEnabled"];
-            private _laserEnabled = ACE_player isIRLaserOn _weapon || {ACE_player isFlashlightOn _weapon};
-            if (_laserEnabled && {_laserWasEnabled} || {!_laserEnabled && {!_laserWasEnabled}}) exitWith {};
-            private _weaponIndex = [ACE_player, _weapon] call FUNC(getWeaponIndex);
-            ACE_player setVariable [QGVAR(laserEnabled_) + str _weaponIndex, [nil, true] select _laserEnabled];
-        },
-        [_weapon, ACE_player isIRLaserOn _weapon || {ACE_player isFlashlightOn _weapon}]
-    ] call CBA_fnc_execNextFrame;
-    false
-}] call CBA_fnc_addDisplayHandler;
+private _fnc_getLightLaserState = {
+    private _currentWeapon = currentWeapon ACE_player;
 
-private _laserEH = {
-    if (sunOrMoon == 1) exitWith {};
-    params ["_player"];
-    private _weaponIndex = [_player, currentWeapon _player] call FUNC(getWeaponIndex);
-    if (
-        !(_player getVariable [QGVAR(laserEnabled_) + str _weaponIndex, false])
-        || {_weaponIndex > 0 && {"" != primaryWeapon _player}} // Arma switches to primary weapon if exists
-        || {!(_player call CBA_fnc_canUseWeapon)} // ignore in vehicle except FFV
-    ) exitWith {};
-    [
-        // wait for weapon in "ready to fire" direction
-        {0.01 > getCameraViewDirection _this vectorDistance (_this weaponDirection currentWeapon _this)},
-        {{_this action [_x, _this]} forEach ["GunLightOn", "IRLaserOn"]},
-        _player,
-        3,
-        {{_this action [_x, _this]} forEach ["GunLightOn", "IRLaserOn"]}
-    ] call CBA_fnc_waitUntilAndExecute;
+    if (_currentWeapon == "") exitWith {};
+
+    // Ignore in vehicle except FFV
+    if !(ACE_player call CBA_fnc_canUseWeapon) exitWith {};
+
+    private _weaponIndex = [ACE_player, _currentWeapon] call FUNC(getWeaponIndex);
+
+    if (_weaponIndex == -1) exitWith {};
+
+    // Light/laser state only changes in the next frame
+    [{
+        ACE_player setVariable [
+            QGVAR(laserEnabled_) + str (_this select 1),
+            ACE_player isIRLaserOn (_this select 0) || {ACE_player isFlashlightOn (_this select 0)}
+        ];
+    }, [_currentWeapon, _weaponIndex]] call CBA_fnc_execNextFrame;
 };
 
-GVAR(laserLoadoutEH) = ["loadout", _laserEH] call CBA_fnc_addPlayerEventHandler;
-GVAR(laserTurretEH) = ["turret", _laserEH] call CBA_fnc_addPlayerEventHandler;
-GVAR(laserVehicleEH) = ["vehicle", _laserEH] call CBA_fnc_addPlayerEventHandler;
-GVAR(laserWeaponEH) = ["weapon", _laserEH] call CBA_fnc_addPlayerEventHandler;
+// Get current weapon light/laser state
+call _fnc_getLightLaserState;
+
+// Update state every time it's changed
+GVAR(laserKeyDownEH) = addUserActionEventHandler ["headlights", "Activate", _fnc_getLightLaserState];
+
+// Dropping weapons turns off lights/lasers
+GVAR(lastWeapons) = [primaryWeapon ACE_player, handgunWeapon ACE_player, secondaryWeapon ACE_player];
+
+// Monitor weapon addition/removal here
+GVAR(laserLoadoutEH) = ["loadout", {
+    params ["_unit"];
+
+    private _weapons = [primaryWeapon _unit, handgunWeapon _unit, secondaryWeapon _unit];
+
+    if (_weapons isEqualTo GVAR(lastWeapons)) exitWith {};
+
+    GVAR(lastWeapons) = _weapons;
+
+    [
+        _unit,
+        _unit getVariable [QGVAR(laserEnabled_) + str ([_unit, currentWeapon _unit] call FUNC(getWeaponIndex)), false]
+    ] call FUNC(setWeaponLightLaserState);
+}] call CBA_fnc_addPlayerEventHandler;
+
+private _fnc_switchPersistentLaserEH = {
+    params ["_unit"];
+
+    [
+        _unit,
+        _unit getVariable [QGVAR(laserEnabled_) + str ([_unit, currentWeapon _unit] call FUNC(getWeaponIndex)), false]
+    ] call FUNC(setWeaponLightLaserState);
+};
+
+GVAR(laserTurretEH) = ["turret", _fnc_switchPersistentLaserEH] call CBA_fnc_addPlayerEventHandler;
+GVAR(laserVehicleEH) = ["vehicle", _fnc_switchPersistentLaserEH] call CBA_fnc_addPlayerEventHandler;
+GVAR(laserWeaponEH) = ["weapon", _fnc_switchPersistentLaserEH] call CBA_fnc_addPlayerEventHandler;
diff --git a/addons/common/functions/fnc_uniqueItems.sqf b/addons/common/functions/fnc_uniqueItems.sqf
index 204501ca3f..5b2177a376 100644
--- a/addons/common/functions/fnc_uniqueItems.sqf
+++ b/addons/common/functions/fnc_uniqueItems.sqf
@@ -28,10 +28,12 @@ private _fnc_getItems = {
     _inventoryItems append ((getItemCargo vestContainer _target) select 0);
     _inventoryItems append ((getItemCargo backpackContainer _target) select 0);
 
-    _items set [0, _inventoryItems];
-    _items set [1, magazines _target];
+    private _magazines = magazines _target;
 
-    _items arrayIntersect _items
+    _items set [0, _inventoryItems arrayIntersect _inventoryItems];
+    _items set [1, _magazines arrayIntersect _magazines];
+
+    _items
 };
 
 // Cache items list if unit is ACE_player
diff --git a/addons/common/scripts/checkVersionNumber.sqf b/addons/common/scripts/checkVersionNumber.sqf
deleted file mode 100644
index 3ed51120b6..0000000000
--- a/addons/common/scripts/checkVersionNumber.sqf
+++ /dev/null
@@ -1,160 +0,0 @@
-// by commy2
-#include "..\script_component.hpp"
-
-private _aceWhitelist = missionNamespace getVariable ["ACE_Version_Whitelist", []];
-private _files = CBA_common_addons select {
-    (_x select [0,3] != "a3_") &&
-    {_x select [0,4] != "ace_"} &&
-    {!((toLowerANSI _x) in _aceWhitelist)}
-};
-
-private _versions = [];
-{
-    getText (configFile >> "CfgPatches" >> _x >> "version") splitString "." params [["_major", "0"], ["_minor", "0"]];
-    private _version = parseNumber _major + parseNumber _minor/100;
-    _versions set [_forEachIndex, _version];
-} forEach _files;
-
-if (isServer) then {
-    ACE_Version_ServerVersions = [_files, _versions];
-    publicVariable "ACE_Version_ServerVersions";
-} else {
-    ACE_Version_ClientVersions = [_files, _versions];
-};
-
-// Begin client version check
-if (!isServer) then {
-    // Wait for server to send the servers files and version numbers
-    waitUntil {
-        sleep 1;
-        !isNil "ACE_Version_ClientVersions" && {!isNil "ACE_Version_ServerVersions"}
-    };
-
-    private _client = profileName;
-
-    _files = ACE_Version_ClientVersions select 0;
-    _versions = ACE_Version_ClientVersions select 1;
-
-    private _serverFiles = ACE_Version_ServerVersions select 0;
-    private _serverVersions = ACE_Version_ServerVersions select 1;
-
-    // Compare client and server files and versions
-    private _missingAddons = [];
-    private _oldVersionsClient = [];
-    private _oldVersionsServer = [];
-    {
-        private _serverVersion = _serverVersions select _forEachIndex;
-
-        private _index = _files find _x;
-        if (_index == -1) then {
-                if (_x != "ace_server") then {_missingAddons pushBack _x;};
-        } else {
-
-            private _clientVersion = _versions select _index;
-
-            if (_clientVersion < _serverVersion) then {
-                _oldVersionsClient pushBack [_x, _clientVersion, _serverVersion];
-            };
-
-            if (_clientVersion > _serverVersion) then {
-                _oldVersionsServer pushBack [_x, _clientVersion, _serverVersion];
-            };
-        };
-    } forEach _serverFiles;
-
-    // find client files which the server doesn't have
-    private _missingAddonsServer = [];
-    {
-        private _index = _serverFiles find _x;
-        if (_index == -1) then {
-            _missingAddonsServer pushBack _x;
-        }
-    } forEach _files;
-
-    // display and log error messages
-    private _fnc_cutComma = {
-        private _string = _this;
-        _string = toArray _string;
-
-        private _count = count _string;
-        _string set [_count - 2, toArray "." select 0];
-        _string set [_count - 1, -1];
-        _string = _string - [-1];
-
-        toString _string;
-    };
-
-    private _missingAddon = false;
-    if (count _missingAddons > 0) then {
-        _missingAddon = true;
-
-        private _error = format ["[ACE] %1: ERROR client missing addon(s): ", _client];
-        {
-            _error = _error + format ["%1, ", _x];
-
-            if (_forEachIndex > 9) exitWith {};
-        } forEach _missingAddons;
-
-        _error = _error call _fnc_cutComma;
-
-        diag_log text _error;
-        [QGVAR(systemChatGlobal), _error] call CBA_fnc_globalEvent;
-        [QGVAR(serverLog), _error] call CBA_fnc_serverEvent;
-    };
-
-    private _missingAddonServer = false;
-    if (count _missingAddonsServer > 0) then {
-        _missingAddonServer = true;
-
-        private _error = format ["[ACE] %1: ERROR server missing addon(s): ", _client];
-        {
-            _error = _error + format ["%1, ", _x];
-
-            if (_forEachIndex > 9) exitWith {};
-        } forEach _missingAddonsServer;
-
-        _error = _error call _fnc_cutComma;
-
-        diag_log text _error;
-        [QGVAR(systemChatGlobal), _error] call CBA_fnc_globalEvent;
-        [QGVAR(serverLog), _error] call CBA_fnc_serverEvent;
-    };
-
-    private _oldVersionClient = false;
-    if (count _oldVersionsClient > 0) then {
-        _oldVersionClient = true;
-
-        private _error = format ["[ACE] %1: ERROR outdated client addon(s): ", _client];
-        {
-            _error = _error + format ["%1 (client: %2, server: %3), ", _x select 0, _x select 1, _x select 2];
-
-            if (_forEachIndex > 9) exitWith {};
-        } forEach _oldVersionsClient;
-
-        _error = _error call _fnc_cutComma;
-
-        diag_log text _error;
-        [QGVAR(systemChatGlobal), _error] call CBA_fnc_globalEvent;
-        [QGVAR(serverLog), _error] call CBA_fnc_serverEvent;
-    };
-
-    private _oldVersionServer = false;
-    if (count _oldVersionsServer > 0) then {
-        _oldVersionServer = true;
-
-        private _error = format ["[ACE] %1: ERROR outdated server addon(s): ", _client];
-        {
-            _error = _error + format ["%1 (client: %2, server: %3), ", _x select 0, _x select 1, _x select 2];
-
-            if (_forEachIndex > 9) exitWith {};
-        } forEach _oldVersionsServer;
-
-        _error = _error call _fnc_cutComma;
-
-        diag_log text _error;
-        [QGVAR(systemChatGlobal), _error] call CBA_fnc_globalEvent;
-        [QGVAR(serverLog), _error] call CBA_fnc_serverEvent;
-    };
-
-    ACE_Version_ClientErrors = [_missingAddon, _missingAddonServer, _oldVersionClient, _oldVersionServer];
-};
diff --git a/addons/common/stringtable.xml b/addons/common/stringtable.xml
index f49e2cedde..8c59d06516 100644
--- a/addons/common/stringtable.xml
+++ b/addons/common/stringtable.xml
@@ -402,7 +402,7 @@
             <Portuguese>[ACE] Itens diversos</Portuguese>
             <Hungarian>[ACE] Egyéb tárgyak</Hungarian>
             <Italian>[ACE] Oggetti vari</Italian>
-            <Japanese>[ACE] その他アイテム</Japanese>
+            <Japanese>[ACE] その他のアイテム</Japanese>
             <Korean>[ACE] 기타 물품.</Korean>
             <Chinese>[ACE] 雜項</Chinese>
             <Chinesesimp>[ACE] 杂项</Chinesesimp>
@@ -726,7 +726,7 @@
         <Key ID="STR_ACE_Common_SettingPersistentLaserDesc">
             <English>Enable gunlight after weapon switch or vehicle enter/exit if it was previously enabled.</English>
             <Russian>Включать ЛЦУ/тактический фонарь после смены оружия или входа/выхода из машины, если он был до этого включен.</Russian>
-            <Japanese>銃のライト等を点けていると武器を切り替えた後や車両を乗り降りしても、ライト等を点けたままにします。</Japanese>
+            <Japanese>銃のライトをつけていた場合、武器の切り替え後または車両の出入り後にライトを再度点灯します。</Japanese>
             <Italian>Abilita la torcia/laser dopo il cambio dell'arma o l'entrata/uscita del veicolo se precedentemente attiva.</Italian>
             <Korean>이전에 무기의 손전등/레이저를 켠 경우 무기 전환이나 차량 승하차시 켠 상태를 유지합니다.</Korean>
             <German>Aktiviert Laserpointer/Taktisches Licht nach einem Waffenwechsel oder dem Auf-/Absitzen, falls es zuvor aktiv war.</German>
@@ -1360,7 +1360,7 @@
             <Italian>Non hai più spazio</Italian>
             <Hungarian>Nincs több hely</Hungarian>
             <Russian>В инвентаре нет места</Russian>
-            <Japanese>インベントリに空きがない</Japanese>
+            <Japanese>インベントリに空きがありません</Japanese>
             <Korean>넣을 공간이 없습니다</Korean>
             <Chinese>無可用空間</Chinese>
             <Chinesesimp>无可用空间</Chinesesimp>
@@ -1406,7 +1406,7 @@
             <Korean>음악 끄기 허용</Korean>
             <Chinese>允許調低音樂音量</Chinese>
             <Chinesesimp>允许调低音乐音量</Chinesesimp>
-            <Japanese>音楽の音量低下を許可</Japanese>
+            <Japanese>音楽音量の低減を許可</Japanese>
             <Italian>Permesso di abbassare la musica</Italian>
             <Polish>Zezwól na przyciszanie muzyki</Polish>
             <Russian>Разрешить приглушение музыки</Russian>
@@ -1422,7 +1422,7 @@
             <Korean>ACE 스크립트가 음악을 끌 수 있습니다.</Korean>
             <Chinese>允許ACE腳本去控制音樂的音量</Chinese>
             <Chinesesimp>允许 ACE 脚本去控制音乐的音量。</Chinesesimp>
-            <Japanese>ACEのスクリプトに音量低下を許可します。</Japanese>
+            <Japanese>ACEのスクリプトに音楽音量の低減を許可します。</Japanese>
             <Italian>Permetti agli script di ACEdi abbassare la musica.</Italian>
             <Polish>Zezwól skrypty ACE na przyciszanie muzyki.</Polish>
             <Russian>Позволить скриптам ACE приглушать музыку</Russian>
@@ -1435,7 +1435,7 @@
         <Key ID="STR_ACE_Common_EpilepsyFriendlyMode">
             <English>Epilepsy friendly mode</English>
             <German>Epilepsiefreundlicher Modus</German>
-            <Japanese>けいれん回避モード</Japanese>
+            <Japanese>てんかん対応モード</Japanese>
             <Polish>Tryb dla epileptyków</Polish>
             <French>Mode adapté à l'épilepsie</French>
             <Italian>Modalità per Epilettici</Italian>
@@ -1448,7 +1448,7 @@
         <Key ID="STR_ACE_Common_EpilepsyFriendlyModeTooltip">
             <English>Disables some flashing light effects to reduce seizure risk.</English>
             <German>Deaktiviert einige Lichtflackereffekte um das Risiko von Epilepsieanfällen zu reduzieren.</German>
-            <Japanese>いくつかの光点滅エフェクトを無効化し、けいれんの恐れを低下させます。</Japanese>
+            <Japanese>てんかん発作のリスクを軽減するために、一部の点滅する光の効果を無効にします。</Japanese>
             <Polish>Wyłącz część migających efektów w celu zredukowania ryzyka napadu epilepsji</Polish>
             <French>Désactive certains effets de lumière clignotante afin de réduire les risques de crise d'épilepsie.</French>
             <Italian>Disattiva alcuni effetti di luci intermittenti per ridurre il rischio di crisi epilettiche.</Italian>
@@ -1464,7 +1464,7 @@
             <Chinesesimp>旗帜（ACE-黑色）：</Chinesesimp>
             <Chinese>旗幟(ACE-黑色)</Chinese>
             <Italian>Bandiera (ACE - Nera)</Italian>
-            <Japanese>旗 (ACE - 黒)</Japanese>
+            <Japanese>旗 (ACE - 黒色)</Japanese>
             <Polish>Flaga (ACE - Czarna)</Polish>
             <Russian>Флаг (ACE - Черный)</Russian>
             <Portuguese>Bandeira (ACE - Preto)</Portuguese>
@@ -1480,7 +1480,7 @@
             <Chinesesimp>旗帜（ACE-白色）：</Chinesesimp>
             <Chinese>旗幟(ACE-白色)</Chinese>
             <Italian>Bandiera (ACE - Bianca)</Italian>
-            <Japanese>旗 (ACE - 白)</Japanese>
+            <Japanese>旗 (ACE - 白色)</Japanese>
             <Polish>Flaga (ACE - Biała)</Polish>
             <Russian>Флаг (ACE - Белый)</Russian>
             <Portuguese>Bandeira (ACE - Branco)</Portuguese>
@@ -1544,7 +1544,7 @@
             <Chinesesimp>在自我互动菜单内显示动作</Chinesesimp>
             <Polish>Pokaż akcje w menu interakcji własnej</Polish>
             <Portuguese>Mostra a ação no menu de auto-interação</Portuguese>
-            <Japanese>セルフ インタラクションにアクションを表示</Japanese>
+            <Japanese>セルフ・インタラクションにアクションを表示します</Japanese>
             <Italian>Mostra le azioni nel menu di interazione con se stessi</Italian>
             <Spanish>Mostrar la acción en el menú de interacción propio</Spanish>
             <Czech>Zobrazit akci v menu vlastních interakcí</Czech>
@@ -1834,6 +1834,7 @@
             <Korean>무기 흔들림</Korean>
             <French>Oscillation de l'arme</French>
             <Russian>Колебание оружия</Russian>
+            <German>Waffen schwanken</German>
             <Spanish>Oscilación del arma</Spanish>
             <Italian>Oscillazione arma</Italian>
         </Key>
@@ -1843,6 +1844,7 @@
             <Korean>무기 흔들림 추가</Korean>
             <French>Activer l'oscillation de l'arme</French>
             <Russian>Включить колебание оружия</Russian>
+            <German>Aktiviere Waffen schwanken</German>
             <Spanish>Habilitar oscilación del arma</Spanish>
             <Italian>Abilita oscillazione arma</Italian>
         </Key>
@@ -1852,6 +1854,7 @@
             <Korean>흔들림 계수, 자세, 피로도, 건강 상태 등의 요인에 영향을 받는 무기 흔들림을 활성화합니다.\n이 설정을 비활성화하면 바닐라 또는 다른 모드의 흔들림으로 대체됩니다.</Korean>
             <French>Active l'oscillation de l'arme influencé par les facteurs d'oscillation, tels que la position, la fatigue et l'état de santé.\nLa désactivation de ce paramètre reportera l'oscillation à vanilla ou à d'autres mods.</French>
             <Russian>Активируйте колебание оружия в зависимости от таких факторов, как стойка, усталость и состояние здоровья.\nОтключение этого параметра приведет к переносу раскачивания на vanilla или другие моды.</Russian>
+            <German>Ermöglicht die Beeinflussung des Waffen-Schwankens durch Beeinflussungsfaktoren wie Haltung, Müdigkeit und Gesundheitszustand.\nDie Deaktivierung dieser Einstellung erlaubt die Beeinflussung durch Vanilla oder andere Mods.</German>
             <Spanish>Habilita la oscilación del arma afectado por factores como la postura, la fatiga y la condición médica.\nDeshabilitar esta opción hará que el comportamiento de la oscilación venga definido por Vanilla o por otros mods.</Spanish>
             <Italian>Abilita l'oscillazione ACE, influenzata da fattori come postura, fatica e condizione medica.\nDisabilitare questa impostazione farà controllare l'oscillazione al gioco vanilla o altre mod.</Italian>
         </Key>
@@ -1893,7 +1896,7 @@
             <German>Verwacklungsfaktor, wenn aufgelegt</German>
             <Italian>Fattore di Oscillazione Appoggiato</Italian>
             <Japanese>静止依託時の手ぶれ係数</Japanese>
-            <Russian>Коэффициент колебания прицела в состоянии покоя</Russian>
+            <Russian>Коэф. колебания прицела в состоянии покоя</Russian>
             <Spanish>Factor de oscilación apoyado</Spanish>
         </Key>
         <Key ID="STR_ACE_Common_RestedSwayFactor_Description">
@@ -1915,7 +1918,7 @@
             <German>Verwacklungsfaktor, wenn Zweibein aufgestellt ist.</German>
             <Italian>Fattore di Oscillazione su Bipode</Italian>
             <Japanese>接地展開時の手ぶれ係数</Japanese>
-            <Russian>Коэффициент колебания прицела при развертывании</Russian>
+            <Russian>Коэф. колебания прицела при развертывании</Russian>
             <Spanish>Factor de oscilación desplegado</Spanish>
         </Key>
         <Key ID="STR_ACE_Common_DeployedSwayFactor_Description">
diff --git a/addons/compat_cup_units/CfgGlasses.hpp b/addons/compat_cup_units/CfgGlasses.hpp
new file mode 100644
index 0000000000..1620f74212
--- /dev/null
+++ b/addons/compat_cup_units/CfgGlasses.hpp
@@ -0,0 +1,492 @@
+class CfgGlasses {
+
+    #define ESS_OVERLAY \
+        ace_overlay = QPATHTOEF(goggles,textures\hud\combatgoggles.paa); \
+        ace_overlayCracked = QPATHTOEF(goggles,textures\hud\combatgogglescracked.paa)
+
+    class None;
+    class CUP_G_PMC_RadioHeadset_Glasses;
+
+    // ESS Goggles - Dark
+    class CUP_G_ESS_BLK_Dark: None {
+        ace_protection = 1;
+        ace_resistance = 1;
+        ace_tintAmount = 8;
+        ESS_OVERLAY;
+    };
+    class CUP_G_ESS_BLK_Scarf_Blk: None {
+        ace_protection = 1;
+        ace_resistance = 1;
+        ace_tintAmount = 8;
+        ESS_OVERLAY;
+    };
+    class CUP_G_ESS_BLK_Scarf_Blk_Beard: None {
+        ace_protection = 1;
+        ace_resistance = 1;
+        ace_tintAmount = 8;
+        ESS_OVERLAY;
+    };
+    class CUP_G_ESS_BLK_Scarf_Blk_Beard_Blonde: None {
+        ace_protection = 1;
+        ace_resistance = 1;
+        ace_tintAmount = 8;
+        ESS_OVERLAY;
+    };
+    class CUP_G_ESS_BLK_Scarf_Face_Blk: None {
+        ace_protection = 1;
+        ace_resistance = 1;
+        ace_tintAmount = 8;
+        ESS_OVERLAY;
+    };
+    class CUP_G_ESS_CBR_Dark: None {
+        ace_protection = 1;
+        ace_resistance = 1;
+        ace_tintAmount = 8;
+        ESS_OVERLAY;
+    };
+    class CUP_G_ESS_KHK_Dark: None {
+        ace_protection = 1;
+        ace_resistance = 1;
+        ace_tintAmount = 8;
+        ESS_OVERLAY;
+    };
+    class CUP_G_ESS_RGR_Dark: None {
+        ace_protection = 1;
+        ace_resistance = 1;
+        ace_tintAmount = 8;
+        ESS_OVERLAY;
+    };
+
+    // ESS Goggles - Ember
+    class CUP_G_ESS_BLK_Ember: None {
+        ace_color[] = {1, 0, 0};
+        ace_protection = 1;
+        ace_resistance = 1;
+        ace_tintAmount = 8;
+        ESS_OVERLAY;
+    };
+    class CUP_G_ESS_CBR_Ember: None {
+        ace_color[] = {1, 0, 0};
+        ace_protection = 1;
+        ace_resistance = 1;
+        ace_tintAmount = 8;
+        ESS_OVERLAY;
+    };
+    class CUP_G_ESS_RGR_Ember: None {
+        ace_color[] = {1, 0, 0};
+        ace_protection = 1;
+        ace_resistance = 1;
+        ace_tintAmount = 8;
+        ESS_OVERLAY;
+    };
+    class CUP_G_ESS_KHK_Ember: None {
+        ace_color[] = {1, 0, 0};
+        ace_protection = 1;
+        ace_resistance = 1;
+        ace_tintAmount = 8;
+        ESS_OVERLAY;
+    };
+    class CUP_G_ESS_KHK_Facewrap_White: None {
+        ace_color[] = {1, 0, 0};
+        ace_protection = 1;
+        ace_resistance = 1;
+        ace_tintAmount = 8;
+        ESS_OVERLAY;
+    };
+
+    // ESS Goggles - Clear
+    class CUP_G_ESS_BLK: None {
+        ace_protection = 1;
+        ace_resistance = 1;
+        ESS_OVERLAY;
+    };
+    class CUP_G_ESS_CBR: None {
+        ace_protection = 1;
+        ace_resistance = 1;
+        ESS_OVERLAY;
+    };
+    class CUP_G_ESS_KHK: None {
+        ace_protection = 1;
+        ace_resistance = 1;
+        ESS_OVERLAY;
+    };
+    class CUP_G_ESS_RGR: None {
+        ace_protection = 1;
+        ace_resistance = 1;
+        ESS_OVERLAY;
+    };
+    class CUP_G_ESS_BLK_Facewrap_Black: None {
+        ace_protection = 1;
+        ace_resistance = 1;
+        ESS_OVERLAY;
+    };
+    class CUP_G_ESS_BLK_Facewrap_Black_GPS: None {
+        ace_protection = 1;
+        ace_resistance = 1;
+        ESS_OVERLAY;
+    };
+    class CUP_G_ESS_BLK_Scarf_Face_Grn: None {
+        ace_protection = 1;
+        ace_resistance = 1;
+        ESS_OVERLAY;
+    };
+    class CUP_G_ESS_BLK_Scarf_Face_Grn_GPS: None {
+        ace_protection = 1;
+        ace_resistance = 1;
+        ESS_OVERLAY;
+    };
+    class CUP_G_ESS_BLK_Scarf_Face_Red: None {
+        ace_protection = 1;
+        ace_resistance = 1;
+        ESS_OVERLAY;
+    };
+    class CUP_G_ESS_BLK_Scarf_Face_White: None {
+        ace_protection = 1;
+        ace_resistance = 1;
+        ESS_OVERLAY;
+    };
+    class CUP_G_ESS_BLK_Scarf_Face_White_GPS: None {
+        ace_protection = 1;
+        ace_resistance = 1;
+        ESS_OVERLAY;
+    };
+    class CUP_G_ESS_BLK_Scarf_Grn: None {
+        ace_protection = 1;
+        ace_resistance = 1;
+        ESS_OVERLAY;
+    };
+    class CUP_G_ESS_BLK_Scarf_Grn_Beard: None {
+        ace_protection = 1;
+        ace_resistance = 1;
+        ESS_OVERLAY;
+    };
+    class CUP_G_ESS_BLK_Scarf_Grn_Beard_Blonde: None {
+        ace_protection = 1;
+        ace_resistance = 1;
+        ESS_OVERLAY;
+    };
+    class CUP_G_ESS_BLK_Scarf_Grn_GPS: None {
+        ace_protection = 1;
+        ace_resistance = 1;
+        ESS_OVERLAY;
+    };
+    class CUP_G_ESS_BLK_Scarf_Grn_GPS_Beard: None {
+        ace_protection = 1;
+        ace_resistance = 1;
+        ESS_OVERLAY;
+    };
+    class CUP_G_ESS_BLK_Scarf_Grn_GPS_Beard_Blonde: None {
+        ace_protection = 1;
+        ace_resistance = 1;
+        ESS_OVERLAY;
+    };
+    class CUP_G_ESS_BLK_Scarf_Red: None {
+        ace_protection = 1;
+        ace_resistance = 1;
+        ESS_OVERLAY;
+    };
+    class CUP_G_ESS_BLK_Scarf_Red_Beard: None {
+        ace_protection = 1;
+        ace_resistance = 1;
+        ESS_OVERLAY;
+    };
+    class CUP_G_ESS_BLK_Scarf_Red_Beard_Blonde: None {
+        ace_protection = 1;
+        ace_resistance = 1;
+        ESS_OVERLAY;
+    };
+    class CUP_G_ESS_BLK_Scarf_White: None {
+        ace_protection = 1;
+        ace_resistance = 1;
+        ESS_OVERLAY;
+    };
+    class CUP_G_ESS_BLK_Scarf_White_Beard: None {
+        ace_protection = 1;
+        ace_resistance = 1;
+        ESS_OVERLAY;
+    };
+    class CUP_G_ESS_BLK_Scarf_White_Beard_Blonde: None {
+        ace_protection = 1;
+        ace_resistance = 1;
+        ESS_OVERLAY;
+    };
+    class CUP_G_ESS_BLK_Scarf_White_GPS: None {
+        ace_protection = 1;
+        ace_resistance = 1;
+        ESS_OVERLAY;
+    };
+    class CUP_G_ESS_BLK_Scarf_White_GPS_Beard: None {
+        ace_protection = 1;
+        ace_resistance = 1;
+        ESS_OVERLAY;
+    };
+    class CUP_G_ESS_BLK_Scarf_White_GPS_Beard_Blonde: None {
+        ace_protection = 1;
+        ace_resistance = 1;
+        ESS_OVERLAY;
+    };
+    class CUP_G_ESS_CBR_Facewrap_Red: None {
+        ace_protection = 1;
+        ace_resistance = 1;
+        ESS_OVERLAY;
+    };
+    class CUP_G_ESS_KHK_Facewrap_Tan: None {
+        ace_protection = 1;
+        ace_resistance = 1;
+        ESS_OVERLAY;
+    };
+    class CUP_G_ESS_KHK_Scarf_Face_Tan: None {
+        ace_protection = 1;
+        ace_resistance = 1;
+        ESS_OVERLAY;
+    };
+    class CUP_G_ESS_KHK_Scarf_Face_Tan_GPS: None {
+        ace_protection = 1;
+        ace_resistance = 1;
+        ESS_OVERLAY;
+    };
+    class CUP_G_ESS_KHK_Scarf_Tan: None {
+        ace_protection = 1;
+        ace_resistance = 1;
+        ESS_OVERLAY;
+    };
+    class CUP_G_ESS_KHK_Scarf_Tan_Beard: None {
+        ace_protection = 1;
+        ace_resistance = 1;
+        ESS_OVERLAY;
+    };
+    class CUP_G_ESS_KHK_Scarf_Tan_Beard_Blonde: None {
+        ace_protection = 1;
+        ace_resistance = 1;
+        ESS_OVERLAY;
+    };
+    class CUP_G_ESS_KHK_Scarf_Tan_GPS: None {
+        ace_protection = 1;
+        ace_resistance = 1;
+        ESS_OVERLAY;
+    };
+    class CUP_G_ESS_KHK_Scarf_Tan_GPS_Beard: None {
+        ace_protection = 1;
+        ace_resistance = 1;
+        ESS_OVERLAY;
+    };
+    class CUP_G_ESS_KHK_Scarf_Tan_GPS_Beard_Blonde: None {
+        ace_protection = 1;
+        ace_resistance = 1;
+        ESS_OVERLAY;
+    };
+    class CUP_G_ESS_RGR_Facewrap_Ranger: None {
+        ace_protection = 1;
+        ace_resistance = 1;
+        ESS_OVERLAY;
+    };
+    class CUP_G_ESS_RGR_Facewrap_Skull: None {
+        ace_protection = 1;
+        ace_resistance = 1;
+        ESS_OVERLAY;
+    };
+    class CUP_G_ESS_RGR_Facewrap_Tropical: None {
+        ace_protection = 1;
+        ace_resistance = 1;
+        ESS_OVERLAY;
+    };
+
+    // Oakleys - Dark
+    class CUP_G_Oakleys_Drk: None {
+        ace_resistance = 1;
+        ace_tintAmount = 8;
+    };
+    class CUP_G_PMC_Facewrap_Black_Glasses_Dark: None {
+        ace_resistance = 1;
+        ace_tintAmount = 8;
+    };
+    class CUP_G_PMC_Facewrap_Black_Glasses_Dark_Headset: None {
+        ace_resistance = 1;
+        ace_tintAmount = 8;
+    };
+    class CUP_G_PMC_Facewrap_Tan_Glasses_Dark: CUP_G_PMC_Facewrap_Black_Glasses_Dark {
+        ace_resistance = 1;
+        ace_tintAmount = 8;
+    };
+    class CUP_G_PMC_Facewrap_Tan_Glasses_Dark_Headset: None {
+        ace_resistance = 1;
+        ace_tintAmount = 8;
+    };
+    class CUP_G_PMC_Facewrap_Tropical_Glasses_Dark: CUP_G_PMC_Facewrap_Black_Glasses_Dark {
+        ace_resistance = 1;
+        ace_tintAmount = 8;
+    };
+    class CUP_G_PMC_Facewrap_Tropical_Glasses_Dark_Headset: None {
+        ace_resistance = 1;
+        ace_tintAmount = 8;
+    };
+    class CUP_G_PMC_Facewrap_Winter_Glasses_Dark: CUP_G_PMC_Facewrap_Black_Glasses_Dark {
+        ace_resistance = 1;
+        ace_tintAmount = 8;
+    };
+    class CUP_G_PMC_Facewrap_Winter_Glasses_Dark_Headset: None {
+        ace_resistance = 1;
+        ace_tintAmount = 8;
+    };
+    class CUP_G_PMC_RadioHeadset_Glasses_Dark: CUP_G_PMC_RadioHeadset_Glasses {
+        ace_resistance = 1;
+        ace_tintAmount = 8;
+    };
+
+    // Oakleys - Ember
+    class CUP_G_Oakleys_Embr: None {
+        ace_color[] = {1, 0, 0};
+        ace_resistance = 1;
+        ace_tintAmount = 8;
+    };
+    class CUP_G_PMC_Facewrap_Black_Glasses_Ember: CUP_G_PMC_Facewrap_Black_Glasses_Dark {
+        ace_color[] = {1, 0, 0};
+        ace_resistance = 1;
+        ace_tintAmount = 8;
+    };
+    class CUP_G_PMC_Facewrap_Tan_Glasses_Ember: CUP_G_PMC_Facewrap_Black_Glasses_Dark {
+        ace_color[] = {1, 0, 0};
+        ace_resistance = 1;
+        ace_tintAmount = 8;
+    };
+    class CUP_G_PMC_Facewrap_Tropical_Glasses_Ember: CUP_G_PMC_Facewrap_Black_Glasses_Dark {
+        ace_color[] = {1, 0, 0};
+        ace_resistance = 1;
+        ace_tintAmount = 8;
+    };
+    class CUP_G_PMC_Facewrap_Winter_Glasses_Ember: CUP_G_PMC_Facewrap_Black_Glasses_Dark {
+        ace_color[] = {1, 0, 0};
+        ace_resistance = 1;
+        ace_tintAmount = 8;
+    };
+    class CUP_G_PMC_RadioHeadset_Glasses_Ember: CUP_G_PMC_RadioHeadset_Glasses {
+        ace_color[] = {1, 0, 0};
+        ace_resistance = 1;
+        ace_tintAmount = 8;
+    };
+
+    // Shades - Dark
+    class CUP_G_Beard_Shades_Black: None {
+        ace_resistance = 1;
+        ace_tintAmount = 8;
+    };
+    class CUP_G_Beard_Shades_Blonde: CUP_G_Beard_Shades_Black {
+        ace_resistance = 1;
+        ace_tintAmount = 8;
+    };
+
+    // Shades - Clear
+    class CUP_G_Grn_Scarf_Shades: None {
+        ace_protection = 1;
+        ace_resistance = 1;
+    };
+    class CUP_G_Grn_Scarf_Shades_Beard: None {
+        ace_protection = 1;
+        ace_resistance = 1;
+    };
+    class CUP_G_Grn_Scarf_Shades_Beard_Blonde: None {
+        ace_protection = 1;
+        ace_resistance = 1;
+    };
+    class CUP_G_Grn_Scarf_Shades_GPS: None {
+        ace_protection = 1;
+        ace_resistance = 1;
+    };
+    class CUP_G_Grn_Scarf_Shades_GPS_Beard: None {
+        ace_protection = 1;
+        ace_resistance = 1;
+    };
+    class CUP_G_Grn_Scarf_Shades_GPS_Beard_Blonde: None {
+        ace_protection = 1;
+        ace_resistance = 1;
+    };
+    class CUP_G_Grn_Scarf_Shades_GPSCombo: None {
+        ace_protection = 1;
+        ace_resistance = 1;
+    };
+    class CUP_G_Grn_Scarf_Shades_GPSCombo_Beard: None {
+        ace_protection = 1;
+        ace_resistance = 1;
+    };
+    class CUP_G_Grn_Scarf_Shades_GPSCombo_Beard_Blonde: None {
+        ace_protection = 1;
+        ace_resistance = 1;
+    };
+    class CUP_G_Tan_Scarf_Shades: None {
+        ace_protection = 1;
+        ace_resistance = 1;
+    };
+    class CUP_G_Tan_Scarf_Shades_Beard: None {
+        ace_protection = 1;
+        ace_resistance = 1;
+    };
+    class CUP_G_Tan_Scarf_Shades_Beard_Blonde: None {
+        ace_protection = 1;
+        ace_resistance = 1;
+    };
+    class CUP_G_Tan_Scarf_Shades_GPS: None {
+        ace_protection = 1;
+        ace_resistance = 1;
+    };
+    class CUP_G_Tan_Scarf_Shades_GPS_Beard: None {
+        ace_protection = 1;
+        ace_resistance = 1;
+    };
+    class CUP_G_Tan_Scarf_Shades_GPS_Beard_Blonde: None {
+        ace_protection = 1;
+        ace_resistance = 1;
+    };
+    class CUP_G_Tan_Scarf_Shades_GPSCombo: None {
+        ace_protection = 1;
+        ace_resistance = 1;
+    };
+    class CUP_G_Tan_Scarf_Shades_GPSCombo_Beard: None {
+        ace_protection = 1;
+        ace_resistance = 1;
+    };
+    class CUP_G_Tan_Scarf_Shades_GPSCombo_Beard_Blonde: None {
+        ace_protection = 1;
+        ace_resistance = 1;
+    };
+    class CUP_G_White_Scarf_Shades: None {
+        ace_protection = 1;
+        ace_resistance = 1;
+    };
+    class CUP_G_White_Scarf_Shades_Beard: None {
+        ace_protection = 1;
+        ace_resistance = 1;
+    };
+    class CUP_G_White_Scarf_Shades_Beard_Blonde: None {
+        ace_protection = 1;
+        ace_resistance = 1;
+    };
+    class CUP_G_White_Scarf_Shades_GPS: None {
+        ace_protection = 1;
+        ace_resistance = 1;
+    };
+    class CUP_G_White_Scarf_Shades_GPS_Beard: None {
+        ace_protection = 1;
+        ace_resistance = 1;
+    };
+    class CUP_G_White_Scarf_Shades_GPS_Beard_Blonde: None {
+        ace_protection = 1;
+        ace_resistance = 1;
+    };
+    class CUP_G_White_Scarf_Shades_GPSCombo: None {
+        ace_protection = 1;
+        ace_resistance = 1;
+    };
+    class CUP_G_White_Scarf_Shades_GPSCombo_Beard: None {
+        ace_protection = 1;
+        ace_resistance = 1;
+    };
+    class CUP_G_White_Scarf_Shades_GPSCombo_Beard_Blonde: None {
+        ace_protection = 1;
+        ace_resistance = 1;
+    };
+
+    // Thug - Dark
+    class CUP_PMC_G_thug: None {
+        ace_tintAmount = 8;
+    };
+};
diff --git a/addons/compat_cup_units/config.cpp b/addons/compat_cup_units/config.cpp
index bde1052a11..c3ba110e74 100644
--- a/addons/compat_cup_units/config.cpp
+++ b/addons/compat_cup_units/config.cpp
@@ -15,4 +15,5 @@ class CfgPatches {
     };
 };
 
+#include "CfgGlasses.hpp"
 #include "CfgWeapons.hpp"
diff --git a/addons/compat_cup_weapons/compat_cup_weapons_csw/CfgVehicles.hpp b/addons/compat_cup_weapons/compat_cup_weapons_csw/CfgVehicles.hpp
index 3924ae0386..752745fb35 100644
--- a/addons/compat_cup_weapons/compat_cup_weapons_csw/CfgVehicles.hpp
+++ b/addons/compat_cup_weapons/compat_cup_weapons_csw/CfgVehicles.hpp
@@ -65,7 +65,7 @@ class CfgVehicles {
         class ace_csw {
             enabled = 1;
             proxyWeapon = "CUP_proxy_DSHKM";
-            magazineLocation = "_target selectionPosition 'magazine'";
+            magazineLocation = "_target selectionPosition 'otocvez'";
             disassembleWeapon = "CUP_DSHKM_carry";
             disassembleTurret = "ace_csw_kordTripod";
             desiredAmmo = 100;
@@ -119,7 +119,7 @@ class CfgVehicles {
         class ace_csw {
             enabled = 1;
             proxyWeapon = "CUP_proxy_MK19";
-            magazineLocation = "_target selectionPosition 'magazine'";
+            magazineLocation = "_target selectionPosition 'otochlaven'";
             disassembleWeapon = "CUP_MK19_carry";
             disassembleTurret = "ace_csw_m3TripodLow";
             desiredAmmo = 48;
@@ -165,7 +165,7 @@ class CfgVehicles {
         class ace_csw {
             enabled = 1;
             proxyWeapon = "CUP_proxy_SPG9";
-            magazineLocation = "_target selectionPosition 'otochlaven'";
+            magazineLocation = "_target selectionPosition 'handle'";
             disassembleWeapon = "CUP_SPG9_carry";
             disassembleTurret = "ace_csw_spg9Tripod";
             desiredAmmo = 1;
diff --git a/addons/compat_cup_weapons/compat_cup_weapons_csw/stringtable.xml b/addons/compat_cup_weapons/compat_cup_weapons_csw/stringtable.xml
index 4ce86a2606..89b025d647 100644
--- a/addons/compat_cup_weapons/compat_cup_weapons_csw/stringtable.xml
+++ b/addons/compat_cup_weapons/compat_cup_weapons_csw/stringtable.xml
@@ -6,42 +6,60 @@
             <Japanese>[CSW] AGS30 ベルト</Japanese>
             <Russian>[CSW] Лента AGS 30</Russian>
             <Korean>[CSW] AGS-30 벨트</Korean>
+            <German>[CSW] AGS30 Gurt</German>
             <Spanish>[CSW] Cinta de AGS30</Spanish>
+            <Italian>[CSW] Nastro AGS30</Italian>
+            <Portuguese>[CSW] Cinto de AGS30</Portuguese>
         </Key>
         <Key ID="STR_ACE_Compat_CUP_Weapons_CSW_mag_MK19_displayName">
             <English>[CSW] MK19 Belt</English>
             <Japanese>[CSW] Mk19 ベルト</Japanese>
             <Russian>[CSW] Лента Mk19</Russian>
             <Korean>[CSW] Mk.19 벨트</Korean>
+            <German>[CSW] MK19 Gurt</German>
             <Spanish>[CSW] Cinta de MK19</Spanish>
+            <Italian>[CSW] Nastro MK19</Italian>
+            <Portuguese>[CSW] Cinto de MK19</Portuguese>
         </Key>
         <Key ID="STR_ACE_Compat_CUP_Weapons_CSW_mag_TOW_displayName">
             <English>[CSW] TOW Tube</English>
             <Japanese>[CSW] TOW チューブ</Japanese>
             <Russian>[CSW] Туба TOW</Russian>
             <Korean>[CSW] TOW 튜브</Korean>
+            <German>[CSW] TOW Rohr</German>
             <Spanish>[CSW] Tubo de TOW</Spanish>
+            <Italian>[CSW] Tubo TOW</Italian>
+            <Portuguese>[CSW] Tubo de TOW</Portuguese>
         </Key>
         <Key ID="STR_ACE_Compat_CUP_Weapons_CSW_mag_TOW2_displayName">
             <English>[CSW] TOW2 Tube</English>
             <Japanese>[CSW] TOW2 チューブ</Japanese>
             <Russian>[CSW] Туба TOW-2</Russian>
             <Korean>[CSW] TOW2 튜브</Korean>
+            <German>[CSW] TOW2 Rohr</German>
             <Spanish>[CSW] Tubo de TOW2</Spanish>
+            <Italian>[CSW] Tubo TOW2</Italian>
+            <Portuguese>[CSW] Tubo de TOW2</Portuguese>
         </Key>
         <Key ID="STR_ACE_Compat_CUP_Weapons_CSW_mag_PG9_displayName">
             <English>[CSW] PG-9 Round</English>
             <Japanese>[CSW] PG-9 砲弾</Japanese>
             <Russian>[CSW] Снаряд ПГ-9</Russian>
             <Korean>[CSW] PG-9 대전차고폭탄</Korean>
+            <German>[CSW] PG-9 Rakete</German>
             <Spanish>[CSW] Carga de PG-9</Spanish>
+            <Italian>[CSW] Razzo PG-9</Italian>
+            <Portuguese>[CSW] Cartucho PG-9</Portuguese>
         </Key>
         <Key ID="STR_ACE_Compat_CUP_Weapons_CSW_mag_OG9_displayName">
             <English>[CSW] OG-9 Round</English>
             <Japanese>[CSW] OG-9 砲弾</Japanese>
             <Russian>[CSW] Снаряд OГ-9</Russian>
             <Korean>[CSW] OG-9 고폭파편탄</Korean>
+            <German>[CSW] OG-9 Rakete</German>
             <Spanish>[CSW] Carga de OG-9</Spanish>
+            <Italian>[CSW] Razzo OG-9</Italian>
+            <Portuguese>[CSW] Cartucho OG-9</Portuguese>
         </Key>
         <Key ID="STR_ACE_Compat_CUP_Weapons_CSW_mag_M1HE_displayName">
             <English>[CSW] M1 HE</English>
@@ -49,7 +67,9 @@
             <Russian>[CSW] M1 HE</Russian>
             <Korean>[CSW] M1 고폭탄</Korean>
             <French>[CSW] M1 HE</French>
+            <German>[CSW] M1 HE</German>
             <Spanish>[CSW] HE de M1</Spanish>
+            <Italian>[CSW] M1 HE</Italian>
         </Key>
         <Key ID="STR_ACE_Compat_CUP_Weapons_CSW_mag_M84Smoke_displayName">
             <English>[CSW] M84 Smoke</English>
@@ -57,7 +77,10 @@
             <Russian>[CSW] M84 Дымовая</Russian>
             <Korean>[CSW] M84 연막탄</Korean>
             <French>[CSW] M84 Fumigène</French>
+            <German>[CSW] M84 Rauch</German>
             <Spanish>[CSW] Humo M84</Spanish>
+            <Italian>[CSW] M84 Fumogeno</Italian>
+            <Portuguese>[CSW] M84 Fumígeno</Portuguese>
         </Key>
         <Key ID="STR_ACE_Compat_CUP_Weapons_CSW_mag_M60A2_displayName">
             <English>[CSW] M60A2 WP</English>
@@ -65,7 +88,9 @@
             <Russian>[CSW] M60A2 WP</Russian>
             <Korean>[CSW] M60A2 백린연막탄</Korean>
             <French>[CSW] M60A2 WP</French>
+            <German>[CSW] M60A2 WP</German>
             <Spanish>[CSW] M60A2 WP</Spanish>
+            <Italian>[CSW] M60A2 WP</Italian>
         </Key>
         <Key ID="STR_ACE_Compat_CUP_Weapons_CSW_mag_M67AT_displayName">
             <English>[CSW] M67 AT Laser Guided</English>
@@ -73,7 +98,9 @@
             <Russian>[CSW] M67 AT Laser Guided</Russian>
             <Korean>[CSW] M67 레이저유도 대전차탄</Korean>
             <French>[CSW] M67 AT Guidé laser</French>
+            <German>[CSW] M67 AT Lasergelenkt</German>
             <Spanish>[CSW] AT Guiado por Láser M67</Spanish>
+            <Italian>[CSW] M67 AT Laserguidato</Italian>
         </Key>
         <Key ID="STR_ACE_Compat_CUP_Weapons_CSW_mag_M314Illum_displayName">
             <English>[CSW] M314 Illumination</English>
@@ -81,7 +108,9 @@
             <Russian>[CSW] M314 Осветительная</Russian>
             <Korean>[CSW] M314 조명탄</Korean>
             <French>[CSW] M314 Illumination</French>
+            <German>[CSW] M314 Beleuchtung</German>
             <Spanish>[CSW] Iluminación M314</Spanish>
+            <Italian>[CSW] M314 Illuminante</Italian>
         </Key>
         <Key ID="STR_ACE_Compat_CUP_Weapons_CSW_mag_3OF56_displayName">
             <English>[CSW] 3OF56 HE</English>
@@ -89,7 +118,9 @@
             <Russian>[CSW] 3OF56 HE</Russian>
             <Korean>[CSW] 3OF56 고폭탄</Korean>
             <French>[CSW] 3OF56 HE</French>
+            <German>[CSW] 3OF56 HE</German>
             <Spanish>[CSW] HE de 3OF56</Spanish>
+            <Italian>[CSW] 3OF56 HE</Italian>
         </Key>
         <Key ID="STR_ACE_Compat_CUP_Weapons_CSW_mag_3OF69M_displayName">
             <English>[CSW] 3OF69M Laser Guided</English>
@@ -97,7 +128,9 @@
             <Russian>[CSW] 3OF69M Laser Guided</Russian>
             <Korean>[CSW] 3OF69M 레이저유도탄</Korean>
             <French>[CSW] 3OF69M Guidé laser</French>
+            <German>[CSW] 3OF69M Lasergelenkt</German>
             <Spanish>[CSW] 3OF69M Guiado por Láser</Spanish>
+            <Italian>[CSW] 3OF69M Laserguidato</Italian>
         </Key>
         <Key ID="STR_ACE_Compat_CUP_Weapons_CSW_mag_122mmWP_displayName">
             <English>[CSW] 122mm WP</English>
@@ -105,7 +138,9 @@
             <Russian>[CSW] 122mm WP</Russian>
             <Korean>[CSW] 122mm 백린탄</Korean>
             <French>[CSW] 122mm WP</French>
+            <German>[CSW] 122mm WP</German>
             <Spanish>[CSW] WP de 122mm</Spanish>
+            <Italian>[CSW] 122mm WP</Italian>
         </Key>
         <Key ID="STR_ACE_Compat_CUP_Weapons_CSW_mag_122mmSmoke_displayName">
             <English>[CSW] D-462 Smoke</English>
@@ -113,7 +148,9 @@
             <Russian>[CSW] D-462 Дымовая</Russian>
             <Korean>[CSW] D-462 연막탄</Korean>
             <French>[CSW] D-462 Fumigène</French>
+            <German>[CSW] D-462 Rauch</German>
             <Spanish>[CSW] Humo D-462</Spanish>
+            <Italian>[CSW] D-462 Fumogeno</Italian>
         </Key>
         <Key ID="STR_ACE_Compat_CUP_Weapons_CSW_mag_122mmIllum_displayName">
             <English>[CSW] S-463 Illumination</English>
@@ -121,7 +158,9 @@
             <Russian>[CSW] S-463 Осветительная</Russian>
             <Korean>[CSW] S-463 조명탄</Korean>
             <French>[CSW] S-463 Eclairante</French>
+            <German>[CSW] S-463 Beleuchtung</German>
             <Spanish>[CSW] Iluminación S-463</Spanish>
+            <Italian>[CSW] S-463 Illuminante</Italian>
         </Key>
         <Key ID="STR_ACE_Compat_CUP_Weapons_CSW_mag_122mmAT_displayName">
             <English>[CSW] BK-6M HEAT</English>
@@ -129,7 +168,9 @@
             <Russian>[CSW] BK-6M HEAT</Russian>
             <Korean>[CSW] BK-6M 대전차고폭탄</Korean>
             <French>[CSW] BK-6M HEAT</French>
+            <German>[CSW] BK-6M HEAT</German>
             <Spanish>[CSW] BK-6M HEAT</Spanish>
+            <Italian>[CSW] BK-6M HEAT</Italian>
         </Key>
     </Package>
 </Project>
diff --git a/addons/compat_cup_weapons/compat_cup_weapons_nightvision/stringtable.xml b/addons/compat_cup_weapons/compat_cup_weapons_nightvision/stringtable.xml
index e3166d6f42..5e31f93caf 100644
--- a/addons/compat_cup_weapons/compat_cup_weapons_nightvision/stringtable.xml
+++ b/addons/compat_cup_weapons/compat_cup_weapons_nightvision/stringtable.xml
@@ -37,7 +37,7 @@
         <Key ID="STR_ACE_Compat_CUP_Weapons_nightvision_CUP_NVG_PVS15_tan_WP">
             <English>AN/PVS-15 (Tan, WP)</English>
             <Japanese>AN/PVS-15 (タン, 白色蛍光)</Japanese>
-            <Italian>AN/PVS-15 (Marroncina, FB)</Italian>
+            <Italian>AN/PVS-15 (Marroncino, FB)</Italian>
             <Polish>AN/PVS-15 (Jasnobrązowa, WP)</Polish>
             <German>AN/PVS-15 (Hellbraun, WP)</German>
             <Korean>AN/PVS-15 (황갈색, 백색광)</Korean>
@@ -48,9 +48,11 @@
         <Key ID="STR_ACE_Compat_CUP_Weapons_nightvision_CUP_NVG_PVS15_winter_WP">
             <English>AN/PVS-15 (Winter, WP)</English>
             <Japanese>AN/PVS-15 (冬季迷彩, WP)</Japanese>
+            <Italian>AN/PVS-15 (Invernale, FB)</Italian>
             <Korean>AN/PVS-15 (설상, 백색광)</Korean>
             <Russian>AN/PVS-15 (Белый, БФ)</Russian>
             <French>AN/PVS-15 (Blanc, WP)</French>
+            <German>AN/PVS-15 (Winter, WP)</German>
             <Spanish>AN/PVS-15 (Blancas, WP)</Spanish>
         </Key>
         <Key ID="STR_ACE_Compat_CUP_Weapons_nightvision_CUP_NVG_GPNVG_black_WP">
@@ -67,7 +69,7 @@
         <Key ID="STR_ACE_Compat_CUP_Weapons_nightvision_CUP_NVG_GPNVG_tan_WP">
             <English>GPNVG (Tan, WP)</English>
             <Japanese>GPNVG (タン, 白色蛍光)</Japanese>
-            <Italian>GPNVG (Marroncina, FB)</Italian>
+            <Italian>GPNVG (Marroncino, FB)</Italian>
             <Polish>GPNVG (Jasnobrązowa, WP)</Polish>
             <German>GPNVG (Hellbraun, WP)</German>
             <Korean>GPNVG (황갈색, 백색광)</Korean>
@@ -89,9 +91,11 @@
         <Key ID="STR_ACE_Compat_CUP_Weapons_nightvision_CUP_NVG_GPNVG_winter_WP">
             <English>GPNVG (Winter, WP)</English>
             <Japanese>GPNVG (冬季迷彩, WP)</Japanese>
+            <Italian>GPNVG (Invernale, FB)</Italian>
             <Korean>GPNVG (설상, 백색광)</Korean>
             <Russian>AN/PVS-15 (Белый, БФ)</Russian>
             <French>GPNVG (Blanc, WP)</French>
+            <German>GPNVG (Winter, WP)</German>
             <Spanish>GPNVG (Blancas, WP)</Spanish>
         </Key>
     </Package>
diff --git a/addons/compat_gm/compat_gm_explosives/CfgMagazines.hpp b/addons/compat_gm/compat_gm_explosives/CfgMagazines.hpp
index 17d51d3b45..7cbbcd4eab 100644
--- a/addons/compat_gm/compat_gm_explosives/CfgMagazines.hpp
+++ b/addons/compat_gm/compat_gm_explosives/CfgMagazines.hpp
@@ -2,7 +2,6 @@ class CfgMagazines {
     // Explosives
     class gm_explosive_petn_charge_base;
     class gm_explosive_petn_charge: gm_explosive_petn_charge_base {
-        EGVAR(explosives,DelayTime) = 1;
         EGVAR(explosives,Placeable) = 1;
         EGVAR(explosives,SetupObject) =QEGVAR(explosives,Place_gm_explosive_petn);
         useAction = 0;
@@ -21,7 +20,6 @@ class CfgMagazines {
 
     class gm_explosive_plnp_charge_base;
     class gm_explosive_plnp_charge: gm_explosive_plnp_charge_base {
-        EGVAR(explosives,DelayTime) = 1;
         EGVAR(explosives,Placeable) = 1;
         EGVAR(explosives,SetupObject) =QEGVAR(explosives,Place_gm_explosive_plnp);
         useAction = 0;
diff --git a/addons/compat_rf/$PBOPREFIX$ b/addons/compat_rf/$PBOPREFIX$
new file mode 100644
index 0000000000..78e6f45daf
--- /dev/null
+++ b/addons/compat_rf/$PBOPREFIX$
@@ -0,0 +1 @@
+z\ace\addons\compat_rf
diff --git a/addons/compat_rf/CfgWeapons.hpp b/addons/compat_rf/CfgWeapons.hpp
new file mode 100644
index 0000000000..d1daa7c710
--- /dev/null
+++ b/addons/compat_rf/CfgWeapons.hpp
@@ -0,0 +1,42 @@
+class CfgWeapons {
+    // Ballistics
+    class Pistol_Base_F;
+    class hgun_Glock19_RF: Pistol_Base_F {
+        ace_barrelTwist = 254;
+        ace_barrelLength = 102;
+        ace_twistDirection = 1;
+    };
+
+    class hgun_DEagle_RF: Pistol_Base_F {
+        ace_barrelTwist = 482;
+        ace_barrelLength = 127;
+        ace_twistDirection = 1;
+    };
+
+    class Rifle_Long_Base_F;
+    class srifle_h6_base_rf: Rifle_Long_Base_F {
+        ace_barrelTwist = 228.6;
+        ace_barrelLength = 460;
+        ace_twistDirection = 1;
+    };
+
+    class Rifle_Base_F;
+    class arifle_ash12_base_RF: Rifle_Base_F {
+        ace_barrelTwist = 228.6;
+        ace_barrelLength = 400;
+        ace_twistDirection = 1;
+    };
+
+    class arifle_ash12_LR_base_RF: arifle_ash12_base_RF {
+        ace_barrelLength = 450;
+    };
+
+    // Hearing
+    class H_HelmetIA;
+    class H_HelmetIA_sb_arid_RF: H_HelmetIA {
+        ace_hearing_protection = 0.75;
+    };
+    class H_HelmetIA_sb_digital_RF: H_HelmetIA {
+        ace_hearing_protection = 0.75;
+    };
+};
diff --git a/addons/compat_rf/compat_rf_nouniformrestrictions/CfgVehicles.hpp b/addons/compat_rf/compat_rf_nouniformrestrictions/CfgVehicles.hpp
new file mode 100644
index 0000000000..553c199ee6
--- /dev/null
+++ b/addons/compat_rf/compat_rf_nouniformrestrictions/CfgVehicles.hpp
@@ -0,0 +1,12 @@
+// Generated using ace_nouniformrestrictions_fnc_exportConfig
+class CfgVehicles {
+    class B_Helipilot_F;
+    class C_Helipilot_Green_UniformHolder_RF;
+
+    class C_Helipilot_Rescue_UniformHolder_RF: B_Helipilot_F {
+        modelSides[] = {6};
+    };
+    class B_Helipilot_Green_UniformHolder_RF: C_Helipilot_Green_UniformHolder_RF {
+        modelSides[] = {6};
+    };
+};
diff --git a/addons/compat_rf/compat_rf_nouniformrestrictions/config.cpp b/addons/compat_rf/compat_rf_nouniformrestrictions/config.cpp
new file mode 100644
index 0000000000..2de1cf9673
--- /dev/null
+++ b/addons/compat_rf/compat_rf_nouniformrestrictions/config.cpp
@@ -0,0 +1,21 @@
+#include "script_component.hpp"
+
+class CfgPatches {
+    class SUBADDON {
+        name = COMPONENT_NAME;
+        units[] = {};
+        weapons[] = {};
+        requiredVersion = REQUIRED_VERSION;
+        requiredAddons[] = {
+            "RF_Data_Loadorder",
+            "ace_nouniformrestrictions"
+        };
+        skipWhenMissingDependencies = 1;
+        author = ECSTRING(common,ACETeam);
+        authors[] = {"Mike"};
+        url = ECSTRING(main,URL);
+        VERSION_CONFIG;
+    };
+};
+
+#include "CfgVehicles.hpp"
diff --git a/addons/compat_rf/compat_rf_nouniformrestrictions/script_component.hpp b/addons/compat_rf/compat_rf_nouniformrestrictions/script_component.hpp
new file mode 100644
index 0000000000..0b98185fa0
--- /dev/null
+++ b/addons/compat_rf/compat_rf_nouniformrestrictions/script_component.hpp
@@ -0,0 +1,3 @@
+#define SUBCOMPONENT nouniformrestrictions
+#define SUBCOMPONENT_BEAUTIFIED No Uniform Restrictions
+#include "..\script_component.hpp"
diff --git a/addons/compat_rf/compat_rf_realisticnames/Attachments.hpp b/addons/compat_rf/compat_rf_realisticnames/Attachments.hpp
new file mode 100644
index 0000000000..9915ad1d44
--- /dev/null
+++ b/addons/compat_rf/compat_rf_realisticnames/Attachments.hpp
@@ -0,0 +1,41 @@
+class optic_MRD;
+class optic_MRD_khk_RF: optic_MRD {
+    displayName = SUBCSTRING(optic_mrd_khk_Name);
+};
+class optic_MRD_tan_RF: optic_MRD {
+    displayName = SUBCSTRING(optic_mrd_tan_Name);
+};
+
+class optic_ACO_grn;
+class optic_ACO_grn_desert_RF: optic_ACO_grn {
+    displayName = SUBCSTRING(optic_aco_grn_desert_Name);
+};
+class optic_ACO_grn_wood_RF: optic_ACO_grn {
+    displayName = SUBCSTRING(optic_aco_grn_wood_Name);
+};
+
+class optic_Aco;
+class optic_ACO_desert_RF: optic_Aco {
+    displayName = SUBCSTRING(optic_aco_desert_Name);
+};
+class optic_ACO_wood_RF: optic_Aco {
+    displayName = SUBCSTRING(optic_aco_wood_Name);
+};
+
+class ItemCore;
+class optic_rds_RF: ItemCore {
+    displayName = SUBCSTRING(optic_rds_Name);
+};
+
+class optic_VRCO_RF: ItemCore {
+    displayName = SUBCSTRING(optic_vrco_Name);
+};
+class optic_VRCO_tan_RF: optic_VRCO_RF {
+    displayName = SUBCSTRING(optic_vrco_tan_Name);
+};
+class optic_VRCO_khk_RF: optic_VRCO_RF {
+    displayName = SUBCSTRING(optic_vrco_khk_Name);
+};
+class optic_VRCO_pistol_RF: optic_VRCO_RF {
+    displayName = SUBCSTRING(optic_vrco_pistol_Name);
+};
diff --git a/addons/compat_rf/compat_rf_realisticnames/CfgMagazines.hpp b/addons/compat_rf/compat_rf_realisticnames/CfgMagazines.hpp
new file mode 100644
index 0000000000..52231bcf07
--- /dev/null
+++ b/addons/compat_rf/compat_rf_realisticnames/CfgMagazines.hpp
@@ -0,0 +1,24 @@
+class CfgMagazines {
+    class CA_Magazine;
+    class 1Rnd_RC40_shell_RF: CA_Magazine {
+        displayName = SUBCSTRING(rc40_Name);
+    };
+    class 1Rnd_RC40_HE_shell_RF: 1Rnd_RC40_shell_RF {
+        displayName = SUBCSTRING(rc40_he_Name);
+    };
+    class 1Rnd_RC40_SmokeWhite_shell_RF: 1Rnd_RC40_shell_RF {
+        displayName = SUBCSTRING(rc40_white_Name);
+    };
+    class 1Rnd_RC40_SmokeBlue_shell_RF: 1Rnd_RC40_shell_RF {
+        displayName = SUBCSTRING(rc40_blue_Name);
+    };
+    class 1Rnd_RC40_SmokeRed_shell_RF: 1Rnd_RC40_shell_RF {
+        displayName = SUBCSTRING(rc40_red_Name);
+    };
+    class 1Rnd_RC40_SmokeGreen_shell_RF: 1Rnd_RC40_shell_RF {
+        displayName = SUBCSTRING(rc40_green_Name);
+    };
+    class 1Rnd_RC40_SmokeOrange_shell_RF: 1Rnd_RC40_shell_RF {
+        displayName = SUBCSTRING(rc40_orange_Name);
+    };
+};
diff --git a/addons/compat_rf/compat_rf_realisticnames/CfgVehicles.hpp b/addons/compat_rf/compat_rf_realisticnames/CfgVehicles.hpp
new file mode 100644
index 0000000000..2983525ec8
--- /dev/null
+++ b/addons/compat_rf/compat_rf_realisticnames/CfgVehicles.hpp
@@ -0,0 +1,152 @@
+class CfgVehicles {
+    class Heli_light_03_dynamicLoadout_base_F;
+    class B_Heli_light_03_dynamicLoadout_RF: Heli_light_03_dynamicLoadout_base_F {
+        displayName = SUBCSTRING(heli_light_03_Name);
+    };
+
+    class Heli_light_03_unarmed_base_F;
+    class B_Heli_light_03_unarmed_RF: Heli_light_03_unarmed_base_F {
+        displayName = SUBCSTRING(heli_light_03_unarmed_Name);
+    };
+
+    class I_Heli_light_03_dynamicLoadout_RF;
+    class I_E_Heli_light_03_dynamicLoadout_RF: I_Heli_light_03_dynamicLoadout_RF {
+        displayName = SUBCSTRING(heli_light_03_Name);
+    };
+
+    class I_Heli_light_03_unarmed_RF;
+    class I_E_Heli_light_03_unarmed_RF: I_Heli_light_03_unarmed_RF {
+        displayName = SUBCSTRING(heli_light_03_unarmed_Name);
+    };
+
+    // H240 Transport, Gendarmerie/ION Transport
+    class Helicopter_Base_H;
+    class Heli_EC_01_base_RF: Helicopter_Base_H {
+        displayName = SUBCSTRING(ec_01_base_Name);
+    };
+    // H240C Transport, CIV Transport
+    class Heli_EC_01_civ_base_RF: Heli_EC_01_base_RF {
+        displayName = SUBCSTRING(ec_01_civ_base_Name);
+    };
+    // H235 Transport, CIV Transport Float-less (not used)
+    class Heli_EC_01A_base_RF: Heli_EC_01_base_RF {
+        displayName = SUBCSTRING(ec_01a_base_Name);
+    };
+    // H235C Transport, CIV Transport Float-less
+    class Heli_EC_01A_civ_base_RF: Heli_EC_01A_base_RF {
+        displayName = SUBCSTRING(ec_01a_civ_base_Name);
+    };
+    // RAI-350M Cougar (Unarmed), IND/UNA Transport Float-less
+    class Heli_EC_01A_military_base_RF: Heli_EC_01A_base_RF {
+        displayName = SUBCSTRING(ec_01a_military_base_Name);
+    };
+    // RAI-360M Cougar, IND/OPF SOCAT Float-less
+    class Heli_EC_02_base_RF: Heli_EC_01_base_RF {
+        displayName = SUBCSTRING(ec_02_base_Name);
+    };
+    // MH-360M Cougar, NATO SOCAT (not used) Float-less
+    class B_Heli_EC_02_RF: Heli_EC_02_base_RF {
+        displayName = SUBCSTRING(ec_02_nato_Name);
+    };
+    // MH-245 Cougar, NATO Combat Type
+    class Heli_EC_03_base_RF: Heli_EC_01_base_RF {
+        displayName = SUBCSTRING(ec_03_base_Name);
+    };
+    // H245 SAR, CIV SAR Type
+    class Heli_EC_04_base_RF: Heli_EC_01_base_RF {
+        displayName = SUBCSTRING(ec_04_base_Name);
+    };
+    // MH-245 Cougar (Unarmed), NATO Transport Type (Maybe SAR?)
+    class Heli_EC_04_military_base_RF: Heli_EC_04_base_RF {
+        displayName = SUBCSTRING(ec_04_military_base_Name);
+    };
+
+    // HEMTT
+    class B_Truck_01_fuel_F;
+    class C_Truck_01_water_rf: B_Truck_01_fuel_F {
+        displayName = SUBCSTRING(truck_01_water_Name);
+    };
+    
+    // Typhoon
+    class O_Truck_03_fuel_F;
+    class C_Truck_03_water_rf: O_Truck_03_fuel_F {
+        displayName = SUBCSTRING(truck_03_water_Name);
+    };
+
+    // RAM 1500 (Pickup)
+    class Offroad_01_unarmed_base_F;
+    class Pickup_01_base_rf: Offroad_01_unarmed_base_F {
+        displayName = SUBCSTRING(pickup_01_Name);
+    };
+    class Pickup_fuel_base_rf: Pickup_01_base_rf {
+        displayName = SUBCSTRING(pickup_01_fuel_Name);
+    };
+    class Pickup_service_base_rf: Pickup_01_base_rf {
+        displayName = SUBCSTRING(pickup_01_service_Name);
+    };
+    class Pickup_repair_base_rf: Pickup_service_base_rf {
+        displayName = SUBCSTRING(pickup_01_repair_Name);
+    };
+    class Pickup_comms_base_rf: Pickup_service_base_rf {
+        displayName = SUBCSTRING(pickup_01_comms_Name);
+    };
+    class Pickup_repair_ig_base_rf: Pickup_repair_base_rf {
+        displayName = SUBCSTRING(pickup_01_repair_Name);
+    };
+    class Pickup_01_hmg_base_rf: Pickup_01_base_rf {
+        displayName = SUBCSTRING(pickup_01_hmg_Name);
+    };
+    class Pickup_01_mmg_base_rf: Pickup_01_base_rf {
+        displayName = SUBCSTRING(pickup_01_mmg_Name);
+    };
+    class Pickup_01_mrl_base_rf: Pickup_01_base_rf {
+        displayName = SUBCSTRING(pickup_01_mrl_Name);
+    };
+    class Pickup_01_aat_base_rf: Pickup_01_base_rf {
+        displayName = SUBCSTRING(pickup_01_aa_Name);
+    };
+    class Pickup_covered_base_rf: Pickup_service_base_rf {
+        displayName = SUBCSTRING(pickup_01_covered_Name);
+    };
+
+    class C_IDAP_Pickup_rf;
+    class C_IDAP_Pickup_water_rf: C_IDAP_Pickup_rf {
+        displayName = SUBCSTRING(pickup_01_water_Name);
+    };
+
+    class StaticMortar;
+    class CommandoMortar_base_RF: StaticMortar {
+        displayName = SUBCSTRING(commando_Name);
+    };
+
+    class StaticMGWeapon;
+    class TwinMortar_base_RF: StaticMGWeapon {
+        displayName = SUBCSTRING(twinmortar_Name);
+    };
+
+    class Helicopter_Base_F;
+    class UAV_RC40_Base_RF: Helicopter_Base_F {
+        displayName = SUBCSTRING(rc40_base_Name);
+    };
+    class UAV_RC40_Base_Sensor_RF: UAV_RC40_Base_RF {
+        displayName = SUBCSTRING(rc40_Name);
+    };
+    class UAV_RC40_Base_HE_RF: UAV_RC40_Base_RF {
+        displayName = SUBCSTRING(rc40_he_Name);
+    };
+    class UAV_RC40_Base_SmokeWhite_RF: UAV_RC40_Base_HE_RF {
+        displayName = SUBCSTRING(rc40_white_Name);
+    };
+    class UAV_RC40_Base_SmokeBlue_RF: UAV_RC40_Base_HE_RF {
+        displayName = SUBCSTRING(rc40_blue_Name);
+    };
+    class UAV_RC40_Base_SmokeRed_RF: UAV_RC40_Base_HE_RF {
+        displayName = SUBCSTRING(rc40_red_Name);
+    };
+    class UAV_RC40_Base_SmokeGreen_RF: UAV_RC40_Base_HE_RF {
+        displayName = SUBCSTRING(rc40_green_Name);
+    };
+    class UAV_RC40_Base_SmokeOrange_RF: UAV_RC40_Base_HE_RF {
+        displayName = SUBCSTRING(rc40_orange_Name);
+    };
+};
diff --git a/addons/compat_rf/compat_rf_realisticnames/CfgWeapons.hpp b/addons/compat_rf/compat_rf_realisticnames/CfgWeapons.hpp
new file mode 100644
index 0000000000..c2d9003f11
--- /dev/null
+++ b/addons/compat_rf/compat_rf_realisticnames/CfgWeapons.hpp
@@ -0,0 +1,111 @@
+class CfgWeapons {
+    #include "Attachments.hpp"
+
+    class Pistol_Base_F;
+    class hgun_Glock19_RF: Pistol_Base_F {
+        displayName = SUBCSTRING(glock19_Name);
+    };
+    class hgun_Glock19_khk_RF: hgun_Glock19_RF {
+        displayName = SUBCSTRING(glock19_khk_Name);
+    };
+    class hgun_Glock19_Tan_RF: hgun_Glock19_RF {
+        displayName = SUBCSTRING(glock19_tan_Name);
+    };
+    class hgun_Glock19_auto_RF: hgun_Glock19_RF {
+        displayName = SUBCSTRING(glock19_auto_Name);
+    };
+    class hgun_Glock19_auto_khk_RF: hgun_Glock19_auto_RF {
+        displayName = SUBCSTRING(glock19_auto_khk_Name);
+    };
+    class hgun_Glock19_auto_Tan_RF: hgun_Glock19_auto_RF {
+        displayName = SUBCSTRING(glock19_auto_tan_Name);
+    };
+
+    class hgun_DEagle_RF: Pistol_Base_F {
+        displayName = SUBCSTRING(deagle_Name);
+    };
+    class hgun_DEagle_classic_RF: hgun_DEagle_RF {
+        displayName = SUBCSTRING(deagle_classic_Name);
+    };
+    class hgun_DEagle_bronze_RF: hgun_DEagle_RF {
+        displayName = SUBCSTRING(deagle_bronze_Name);
+    };
+    class hgun_DEagle_copper_RF: hgun_DEagle_RF {
+        displayName = SUBCSTRING(deagle_copper_Name);
+    };
+    class hgun_DEagle_gold_RF: hgun_DEagle_RF {
+        displayName = SUBCSTRING(deagle_gold_Name);
+    };
+
+    class srifle_h6_base_rf;
+    class srifle_h6_tan_rf: srifle_h6_base_rf {
+        displayName = SUBCSTRING(h6_tan_Name);
+    };
+    class srifle_h6_oli_rf: srifle_h6_tan_rf {
+        displayName = SUBCSTRING(h6_oli_Name);
+    };
+    class srifle_h6_blk_rf: srifle_h6_tan_rf {
+        displayName = SUBCSTRING(h6_blk_Name);
+    };
+    class srifle_h6_digi_rf: srifle_h6_tan_rf {
+        displayName = SUBCSTRING(h6_digi_Name);
+    };
+    class srifle_h6_gold_rf: srifle_h6_tan_rf {
+        displayName = SUBCSTRING(h6_gold_Name);
+    };
+
+    class srifle_DMR_01_F;
+    class srifle_DMR_01_black_RF: srifle_DMR_01_F {
+        displayName = SUBCSTRING(dmr_01_black_Name);
+    };
+    class srifle_DMR_01_tan_RF: srifle_DMR_01_black_RF {
+        displayName = SUBCSTRING(dmr_01_tan_Name);
+    };
+
+    class SMG_01_F;
+    class SMG_01_black_RF: SMG_01_F {
+        displayName = SUBCSTRING(smg_01_black_Name);
+    };
+
+    class arifle_ash12_base_RF;
+    class arifle_ash12_blk_RF: arifle_ash12_base_RF {
+        displayName = SUBCSTRING(ash12_blk_Name);
+    };
+    class arifle_ash12_desert_RF: arifle_ash12_base_RF {
+        displayName = SUBCSTRING(ash12_desert_Name);
+    };
+    class arifle_ash12_urban_RF: arifle_ash12_base_RF {
+        displayName = SUBCSTRING(ash12_urban_Name);
+    };
+    class arifle_ash12_wood_RF: arifle_ash12_base_RF {
+        displayName = SUBCSTRING(ash12_wood_Name);
+    };
+
+    class arifle_ash12_GL_base_RF;
+    class arifle_ash12_GL_blk_RF: arifle_ash12_GL_base_RF {
+        displayName = SUBCSTRING(ash12_gl_blk_Name);
+    };
+    class arifle_ash12_GL_desert_RF: arifle_ash12_GL_blk_RF {
+        displayName = SUBCSTRING(ash12_gl_desert_Name);
+    };
+    class arifle_ash12_GL_urban_RF: arifle_ash12_GL_blk_RF {
+        displayName = SUBCSTRING(ash12_gl_urban_Name);
+    };
+    class arifle_ash12_GL_wood_RF: arifle_ash12_GL_blk_RF {
+        displayName = SUBCSTRING(ash12_gl_wood_Name);
+    };
+
+    class arifle_ash12_LR_base_RF;
+    class arifle_ash12_LR_blk_RF: arifle_ash12_LR_base_RF {
+        displayName = SUBCSTRING(ash12_lr_blk_Name);
+    };
+    class arifle_ash12_LR_desert_RF: arifle_ash12_LR_blk_RF {
+        displayName = SUBCSTRING(ash12_lr_desert_Name);
+    };
+    class arifle_ash12_LR_urban_RF: arifle_ash12_LR_blk_RF {
+        displayName = SUBCSTRING(ash12_lr_urban_Name);
+    };
+    class arifle_ash12_LR_wood_RF: arifle_ash12_LR_blk_RF {
+        displayName = SUBCSTRING(ash12_lr_wood_Name);
+    };
+};
diff --git a/addons/compat_rf/compat_rf_realisticnames/config.cpp b/addons/compat_rf/compat_rf_realisticnames/config.cpp
new file mode 100644
index 0000000000..47003c4a42
--- /dev/null
+++ b/addons/compat_rf/compat_rf_realisticnames/config.cpp
@@ -0,0 +1,23 @@
+#include "script_component.hpp"
+
+class CfgPatches {
+    class SUBADDON {
+        name = COMPONENT_NAME;
+        units[] = {};
+        weapons[] = {};
+        requiredVersion = REQUIRED_VERSION;
+        requiredAddons[] = {
+            "RF_Data_Loadorder",
+            "ace_realisticnames"
+        };
+        skipWhenMissingDependencies = 1;
+        author = ECSTRING(common,ACETeam);
+        authors[] = {"Mike", "Marc"};
+        url = ECSTRING(main,URL);
+        VERSION_CONFIG;
+    };
+};
+
+#include "CfgMagazines.hpp"
+#include "CfgWeapons.hpp"
+#include "CfgVehicles.hpp"
diff --git a/addons/compat_rf/compat_rf_realisticnames/script_component.hpp b/addons/compat_rf/compat_rf_realisticnames/script_component.hpp
new file mode 100644
index 0000000000..b8d0682fa4
--- /dev/null
+++ b/addons/compat_rf/compat_rf_realisticnames/script_component.hpp
@@ -0,0 +1,3 @@
+#define SUBCOMPONENT realisticnames
+#define SUBCOMPONENT_BEAUTIFIED Realistic Names
+#include "..\script_component.hpp"
diff --git a/addons/compat_rf/compat_rf_realisticnames/stringtable.xml b/addons/compat_rf/compat_rf_realisticnames/stringtable.xml
new file mode 100644
index 0000000000..03d5003a62
--- /dev/null
+++ b/addons/compat_rf/compat_rf_realisticnames/stringtable.xml
@@ -0,0 +1,550 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project name="ACE">
+    <Package name="Compat_RF_RealisticNames">
+        <Key ID="STR_ACE_Compat_RF_RealisticNames_optic_mrd_khk_Name">
+            <English>EOTech MRDS (Khaki)</English>
+            <Japanese>EOTech MRDS (カーキ)</Japanese>
+            <Korean>이오텍 MRDS (카키)</Korean>
+            <German>EOTech MRDS (Khaki)</German>
+            <Italian>EOTech MRDS (Cachi)</Italian>
+        </Key>
+        <Key ID="STR_ACE_Compat_RF_RealisticNames_optic_mrd_tan_Name">
+            <English>EOTech MRDS (Tan)</English>
+            <Japanese>EOTech MRDS (タン)</Japanese>
+            <Korean>이오텍 MRDS (황갈)</Korean>
+            <German>EOTech MRDS (Hellbraun)</German>
+            <Italian>EOTech MRDS (Marroncino)</Italian>
+        </Key>
+        <Key ID="STR_ACE_Compat_RF_RealisticNames_optic_aco_grn_desert_Name">
+            <English>C-More Railway (Green, Desert)</English>
+            <Japanese>C-More レイルウェイ (グリーン、砂漠迷彩)</Japanese>
+            <Korean>씨모어 레일웨이 (녹색, 사막)</Korean>
+            <German>C-More Railway (Grün, Wüste)</German>
+            <Italian>C-More Railway (Verde, Deserto)</Italian>
+        </Key>
+        <Key ID="STR_ACE_Compat_RF_RealisticNames_optic_aco_grn_wood_Name">
+            <English>C-More Railway (Green, Woodland)</English>
+            <Japanese>C-More レイルウェイ (グリーン、森林迷彩)</Japanese>
+            <Korean>씨모어 레일웨이 (녹색, 수풀 위장)</Korean>
+            <German>C-More Railway (Grün, Grünes Tarnmuster)</German>
+            <Italian>C-More Railway (Verde, Boschivo)</Italian>
+        </Key>
+        <Key ID="STR_ACE_Compat_RF_RealisticNames_optic_aco_desert_Name">
+            <English>C-More Railway (Red, Desert)</English>
+            <Japanese>C-More レイルウェイ (グリーン、砂漠迷彩)</Japanese>
+            <Korean>씨모어 레일웨이 (빨강, 사막)</Korean>
+            <German>C-More Railway (Rot, Wüste)</German>
+            <Italian>C-More Railway (Rosso, Desert)</Italian>
+        </Key>
+        <Key ID="STR_ACE_Compat_RF_RealisticNames_optic_aco_wood_Name">
+            <English>C-More Railway (Red, Woodland)</English>
+            <Japanese>C-More レイルウェイ (グリーン、森林迷彩)</Japanese>
+            <Korean>씨모어 레일웨이 (빨강, 수풀)</Korean>
+            <German>C-More Railway (Rot, Grünes Tarnmuster)</German>
+            <Italian>C-More Railway (Rosso, Boschivo)</Italian>
+        </Key>
+        <Key ID="STR_ACE_Compat_RF_RealisticNames_optic_rds_Name">
+            <English>Aimpoint Micro R-1</English>
+            <Japanese>Aimpoint マイクロ R-1</Japanese>
+            <Korean>에임포인트 마이크로 R-1</Korean>
+            <German>Aimpoint Micro R-1</German>
+            <Italian>Aimpoint Micro R-1</Italian>
+        </Key>
+        <Key ID="STR_ACE_Compat_RF_RealisticNames_optic_vrco_Name">
+            <English>Vortex Spitfire Prism</English>
+            <Japanese>Vortex スピットファイア プリズム</Japanese>
+            <Korean>버텍스 스핏파이어 프리즘</Korean>
+            <German>Vortex Spitfire Prism</German>
+            <Italian>Vortex Spitfire Prism</Italian>
+        </Key>
+        <Key ID="STR_ACE_Compat_RF_RealisticNames_optic_vrco_tan_Name">
+            <English>Vortex Spitfire Prism (Tan)</English>
+            <Japanese>Vortex スピットファイア プリズム (タン)</Japanese>
+            <Korean>버텍스 스핏파이어 프리즘 (황갈)</Korean>
+            <German>Vortex Spitfire Prism (Hellbraun)</German>
+            <Italian>Vortex Spitfire Prism (Marroncino)</Italian>
+        </Key>
+        <Key ID="STR_ACE_Compat_RF_RealisticNames_optic_vrco_khk_Name">
+            <English>Vortex Spitfire Prism (Khaki)</English>
+            <Japanese>Vortex スピットファイア プリズム (カーキ)</Japanese>
+            <Korean>버텍스 스핏파이어 프리즘 (카키)</Korean>
+            <German>Vortex Spitfire Prism (Khaki)</German>
+            <Italian>Vortex Spitfire Prism (Cachi)</Italian>
+        </Key>
+        <Key ID="STR_ACE_Compat_RF_RealisticNames_optic_vrco_pistol_Name">
+            <English>Vortex Spitfire Prism (Pistol)</English>
+            <Japanese>Vortex スピットファイア プリズム (ピストル用)</Japanese>
+            <Korean>버텍스 스핏파이어 프리즘 (권총용)</Korean>
+            <German>Vortex Spitfire Prism (Pistole)</German>
+            <Italian>Vortex Spitfire Prism (Pistola)</Italian>
+        </Key>
+        <Key ID="STR_ACE_Compat_RF_RealisticNames_glock19_Name">
+            <English>Glock 19X</English>
+            <Japanese>グロック 19X</Japanese>
+            <Korean>글록 19X</Korean>
+            <German>Glock 19X</German>
+            <Italian>Glock 19X</Italian>
+        </Key>
+        <Key ID="STR_ACE_Compat_RF_RealisticNames_glock19_khk_Name">
+            <English>Glock 19X (Khaki)</English>
+            <Japanese>グロック 19X (カーキ)</Japanese>
+            <Korean>글록 19X (카키)</Korean>
+            <German>Glock 19X (Khaki)</German>
+            <Italian>Glock 19X (Cachi)</Italian>
+        </Key>
+        <Key ID="STR_ACE_Compat_RF_RealisticNames_glock19_tan_Name">
+            <English>Glock 19X (Tan)</English>
+            <Japanese>グロック 19X (タン)</Japanese>
+            <Korean>글록 19X (황갈)</Korean>
+            <German>Glock 19X (Hellbraun)</German>
+            <Italian>Glock 19X (Marroncino)</Italian>
+        </Key>
+        <Key ID="STR_ACE_Compat_RF_RealisticNames_glock19_auto_Name">
+            <English>Glock 19X Auto</English>
+            <Japanese>グロック 19X オート</Japanese>
+            <Korean>글록 19X 기관권총</Korean>
+            <German>Glock 19X Auto</German>
+            <Italian>Glock 19X Auto</Italian>
+        </Key>
+        <Key ID="STR_ACE_Compat_RF_RealisticNames_glock19_auto_khk_Name">
+            <English>Glock 19X Auto (Khaki)</English>
+            <Japanese>グロック 19X オート (カーキ)</Japanese>
+            <Korean>글록 19X 기관권총 (카키)</Korean>
+            <German>Glock 19X Auto (Khaki)</German>
+            <Italian>Glock 19X Auto (Cachi)</Italian>
+        </Key>
+        <Key ID="STR_ACE_Compat_RF_RealisticNames_glock19_auto_tan_Name">
+            <English>Glock 19X Auto (Tan)</English>
+            <Japanese>グロック 19X オート (タン)</Japanese>
+            <Korean>글록 19X 기관권총 (황갈)</Korean>
+            <German>Glock 19X Auto (Hellbraun)</German>
+            <Italian>Glock 19X Auto (Marroncino)</Italian>
+        </Key>
+        <Key ID="STR_ACE_Compat_RF_RealisticNames_deagle_Name">
+            <English>Desert Eagle Mark XIX L5</English>
+            <Japanese>デザートイーグル Mark XIX L5</Japanese>
+            <Korean>데저트 이글 마크 XIX L5</Korean>
+            <German>Desert Eagle Mark XIX L5</German>
+            <Italian>Desert Eagle Mark XIX L5</Italian>
+        </Key>
+        <Key ID="STR_ACE_Compat_RF_RealisticNames_deagle_classic_Name">
+            <English>Desert Eagle Mark XIX L5 (Classic)</English>
+            <Japanese>デザートイーグル Mark XIX L5 (クラシック)</Japanese>
+            <Korean>데저트 이글 마크 XIX L5 (클래식)</Korean>
+            <German>Desert Eagle Mark XIX L5 (Klassisch)</German>
+            <Italian>Desert Eagle Mark XIX L5 (Classico)</Italian>
+        </Key>
+        <Key ID="STR_ACE_Compat_RF_RealisticNames_deagle_bronze_Name">
+            <English>Desert Eagle Mark XIX L5 (Bronze)</English>
+            <Japanese>デザートイーグル Mark XIX L5 (ブロンズ)</Japanese>
+            <Korean>데저트 이글 마크 XIX L5 (브론즈)</Korean>
+            <German>Desert Eagle Mark XIX L5 (Bronze)</German>
+            <Italian>Desert Eagle Mark XIX L5 (Bronzo)</Italian>
+        </Key>
+        <Key ID="STR_ACE_Compat_RF_RealisticNames_deagle_copper_Name">
+            <English>Desert Eagle Mark XIX L5 (Copper)</English>
+            <Japanese>デザートイーグル Mark XIX L5 (カッパー)</Japanese>
+            <Korean>데저트 이글 마크 XIX L5 (구리)</Korean>
+            <German>Desert Eagle Mark XIX L5 (Kupfer)</German>
+            <Italian>Desert Eagle Mark XIX L5 (Rame)</Italian>
+        </Key>
+        <Key ID="STR_ACE_Compat_RF_RealisticNames_deagle_gold_Name">
+            <English>Desert Eagle Mark XIX L5 (Gold)</English>
+            <Japanese>デザートイーグル Mark XIX L5 (ゴールド)</Japanese>
+            <Korean>데저트 이글 마크 XIX L5 (금색)</Korean>
+            <German>Desert Eagle Mark XIX L5 (Gold)</German>
+            <Italian>Desert Eagle Mark XIX L5 (Oro)</Italian>
+        </Key>
+        <Key ID="STR_ACE_Compat_RF_RealisticNames_h6_tan_Name">
+            <English>HERA H6 (Tan)</English>
+            <Japanese>HERA H6 (タン)</Japanese>
+            <Korean>헤라 H6 (황갈)</Korean>
+            <German>HERA H6 (Hellbraun)</German>
+            <Italian>HERA H6 (Marroncino)</Italian>
+        </Key>
+        <Key ID="STR_ACE_Compat_RF_RealisticNames_h6_oli_Name">
+            <English>HERA H6 (Olive)</English>
+            <Japanese>HERA H6 (オリーブ)</Japanese>
+            <Korean>헤라 H6 (올리브)</Korean>
+            <German>HERA H6 (Olivgrün)</German>
+            <Italian>HERA H6 (Oliva)</Italian>
+        </Key>
+        <Key ID="STR_ACE_Compat_RF_RealisticNames_h6_blk_Name">
+            <English>HERA H6 (Black)</English>
+            <Japanese>HERA H6 (ブラック)</Japanese>
+            <Korean>헤라 H6 (검정)</Korean>
+            <German>HERA H6 (Schwarz)</German>
+            <Italian>HERA H6 (Nero)</Italian>
+        </Key>
+        <Key ID="STR_ACE_Compat_RF_RealisticNames_h6_digi_Name">
+            <English>HERA H6 (Digital)</English>
+            <Japanese>HERA H6 (AAF迷彩)</Japanese>
+            <Korean>헤라 H6 (AAF 디지털)</Korean>
+            <German>HERA H6 (Digital)</German>
+            <Italian>HERA H6 (Digitale)</Italian>
+        </Key>
+        <Key ID="STR_ACE_Compat_RF_RealisticNames_h6_gold_Name">
+            <English>HERA H6 (Gold)</English>
+            <Japanese>HERA H6 (ゴールド)</Japanese>
+            <Korean>헤라 H6 (금색)</Korean>
+            <German>HERA H6 (Gold)</German>
+            <Italian>HERA H6 (Oro)</Italian>
+        </Key>
+        <Key ID="STR_ACE_Compat_RF_RealisticNames_dmr_01_black_Name">
+            <English>VS-121 (Black)</English>
+            <Japanese>VS-121 (ブラック)</Japanese>
+            <Korean>VS-121 (검정)</Korean>
+            <German>VS-121 (Schwarz)</German>
+            <Italian>VS-121 (Nero)</Italian>
+        </Key>
+        <Key ID="STR_ACE_Compat_RF_RealisticNames_dmr_01_tan_Name">
+            <English>VS-121 (Tan)</English>
+            <Japanese>VS-121 (タン)</Japanese>
+            <Korean>VS-121 (황갈)</Korean>
+            <German>VS-121 (Hellbraun)</German>
+            <Italian>VS-121 (Marroncino)</Italian>
+        </Key>
+        <Key ID="STR_ACE_Compat_RF_RealisticNames_smg_01_black_Name">
+            <English>Vector SMG (Black)</English>
+            <Japanese>ベクター SMG (ブラック)</Japanese>
+            <Korean>벡터 SMG (검정)</Korean>
+            <German>Vector SMG (Schwarz)</German>
+            <Italian>Vector SMG (Nero)</Italian>
+        </Key>
+        <Key ID="STR_ACE_Compat_RF_RealisticNames_ash12_blk_Name">
+            <English>ASh-12 (Black)</English>
+            <Japanese>ASh-12 (ブラック)</Japanese>
+            <Korean>ASh-12 (검정)</Korean>
+            <German>ASh-12 (Schwarz)</German>
+            <Italian>ASh-12 (Nero)</Italian>
+        </Key>
+        <Key ID="STR_ACE_Compat_RF_RealisticNames_ash12_desert_Name">
+            <English>ASh-12 (Desert)</English>
+            <Japanese>ASh-12 (砂漠迷彩)</Japanese>
+            <Korean>ASh-12 (사막)</Korean>
+            <German>ASh-12 (Wüste)</German>
+            <Italian>ASh-12 (Deserto)</Italian>
+        </Key>
+        <Key ID="STR_ACE_Compat_RF_RealisticNames_ash12_urban_Name">
+            <English>ASh-12 (Urban)</English>
+            <Japanese>ASh-12 (市街地迷彩)</Japanese>
+            <Korean>ASh-12 (도심)</Korean>
+            <German>ASh-12 (Urban)</German>
+            <Italian>ASh-12 (Urbano)</Italian>
+        </Key>
+        <Key ID="STR_ACE_Compat_RF_RealisticNames_ash12_wood_Name">
+            <English>ASh-12 (Woodland)</English>
+            <Japanese>ASh-12 (森林迷彩)</Japanese>
+            <Korean>ASh-12 (수풀)</Korean>
+            <German>ASh-12 (Grünes Tarnmuster)</German>
+            <Italian>ASh-12 (Boschivo)</Italian>
+        </Key>
+        <Key ID="STR_ACE_Compat_RF_RealisticNames_ash12_gl_blk_Name">
+            <English>ASh-12 GL (Black)</English>
+            <Japanese>ASh-12 GL (ブラック)</Japanese>
+            <Korean>ASh-12 GL (검정)</Korean>
+            <German>ASh-12 GL (Schwarz)</German>
+            <Italian>ASh-12 GL (Nero)</Italian>
+        </Key>
+        <Key ID="STR_ACE_Compat_RF_RealisticNames_ash12_gl_desert_Name">
+            <English>ASh-12 GL (Desert)</English>
+            <Japanese>ASh-12 GL (砂漠迷彩)</Japanese>
+            <Korean>ASh-12 GL (사막)</Korean>
+            <German>ASh-12 GL (Wüste)</German>
+            <Italian>ASh-12 GL (Deserto)</Italian>
+        </Key>
+        <Key ID="STR_ACE_Compat_RF_RealisticNames_ash12_gl_urban_Name">
+            <English>ASh-12 GL (Urban)</English>
+            <Japanese>ASh-12 GL (市街地迷彩)</Japanese>
+            <Korean>ASh-12 GL (도심)</Korean>
+            <German>ASh-12 GL (Urban)</German>
+            <Italian>ASh-12 GL (Urbano)</Italian>
+        </Key>
+        <Key ID="STR_ACE_Compat_RF_RealisticNames_ash12_gl_wood_Name">
+            <English>ASh-12 GL (Woodland)</English>
+            <Japanese>ASh-12 GL (森林迷彩)</Japanese>
+            <Korean>ASh-12 GL (수풀)</Korean>
+            <German>ASh-12 GL (Grünes Tarnmuster)</German>
+            <Italian>ASh-12 GL (Boschivo)</Italian>
+        </Key>
+        <Key ID="STR_ACE_Compat_RF_RealisticNames_ash12_lr_blk_Name">
+            <English>ASh-12 LR (Black)</English>
+            <Japanese>ASh-12 LR (ブラック)</Japanese>
+            <Korean>ASh-12 LR (검정)</Korean>
+            <German>ASh-12 LR (Schwarz)</German>
+            <Italian>ASh-12 LR (Nero)</Italian>
+        </Key>
+        <Key ID="STR_ACE_Compat_RF_RealisticNames_ash12_lr_desert_Name">
+            <English>ASh-12 LR (Desert)</English>
+            <Japanese>ASh-12 LR (砂漠迷彩)</Japanese>
+            <Korean>ASh-12 LR (사막)</Korean>
+            <German>ASh-12 LR (Wüste)</German>
+            <Italian>ASh-12 LR (Deserto)</Italian>
+        </Key>
+        <Key ID="STR_ACE_Compat_RF_RealisticNames_ash12_lr_urban_Name">
+            <English>ASh-12 LR (Urban)</English>
+            <Japanese>ASh-12 LR (市街地迷彩)</Japanese>
+            <Korean>ASh-12 LR (도심)</Korean>
+            <German>ASh-12 LR (Urban)</German>
+            <Italian>ASh-12 LR (Urbano)</Italian>
+        </Key>
+        <Key ID="STR_ACE_Compat_RF_RealisticNames_ash12_lr_wood_Name">
+            <English>ASh-12 LR (Woodland)</English>
+            <Japanese>ASh-12 LR (森林迷彩)</Japanese>
+            <Korean>ASh-12 LR (수풀)</Korean>
+            <German>ASh-12 LR (Grünes Tarnmuster)</German>
+            <Italian>ASh-12 LR (Boschivo)</Italian>
+        </Key>
+        <Key ID="STR_ACE_Compat_RF_RealisticNames_heli_light_03_Name">
+            <English>AW159 Wildcat ASW</English>
+            <Japanese>AW159 ワイルドキャット ASW</Japanese>
+            <Korean>AW159 와일드캣 ASW</Korean>
+            <German>AW159 Wildcat ASW</German>
+            <Italian>AW159 Wildcat ASW</Italian>
+        </Key>
+        <Key ID="STR_ACE_Compat_RF_RealisticNames_heli_light_03_unarmed_Name">
+            <English>AW159 Wildcat ASW (Unarmed)</English>
+            <Japanese>AW159 ワイルドキャット ASW (非武装)</Japanese>
+            <Korean>AW159 와일드캣 ASW (비무장)</Korean>
+            <German>AW159 Wildcat ASW (Unbewaffnet)</German>
+            <Italian>AW159 Wildcat ASW (Disarmato)</Italian>
+        </Key>
+        <Key ID="STR_ACE_Compat_RF_RealisticNames_ec_01_base_Name">
+            <English>H225 Super Puma (Transport)</English>
+            <Japanese>H225 シュペル ピューマ (輸送型)</Japanese>
+            <Korean>H225 슈퍼 퓨마 (비무장)</Korean>
+            <German>H225 Super Puma (Transport)</German>
+            <Italian>H225 Super Puma (Trasporto)</Italian>
+        </Key>
+        <Key ID="STR_ACE_Compat_RF_RealisticNames_ec_01_civ_base_Name">
+            <English>H225 Super Puma (Civilian)</English>
+            <Japanese>H225 シュペル ピューマ (民生型)</Japanese>
+            <Korean>H225 슈퍼 퓨마 (비무장)</Korean>
+            <German>H225 Super Puma (Zivil)</German>
+            <Italian>H225 Super Puma (Civile)</Italian>
+        </Key>
+        <Key ID="STR_ACE_Compat_RF_RealisticNames_ec_01a_base_Name">
+            <English>H215 Super Puma (Transport)</English>
+            <Japanese>H215 シュペル ピューマ (輸送型)</Japanese>
+            <Korean>H215 슈퍼 퓨마 (비무장)</Korean>
+            <German>H215 Super Puma (Transport)</German>
+            <Italian>H215 Super Puma (Trasporto)</Italian>
+        </Key>
+        <Key ID="STR_ACE_Compat_RF_RealisticNames_ec_01a_civ_base_Name">
+            <English>H215 Super Puma (Civilian)</English>
+            <Japanese>H215 シュペル ピューマ (民生型)</Japanese>
+            <Korean>H215 슈퍼 퓨마 (비무장)</Korean>
+            <German>H215 Super Puma (Zivil)</German>
+            <Italian>H215 Super Puma (Civile)</Italian>
+        </Key>
+        <Key ID="STR_ACE_Compat_RF_RealisticNames_ec_01a_military_base_Name">
+            <English>H215 Super Puma (Unarmed)</English>
+            <Japanese>H215 シュペル ピューマ (非武装)</Japanese>
+            <Korean>H215 슈퍼 퓨마 (비무장)</Korean>
+            <German>H215 Super Puma (Unbewaffnet)</German>
+            <Italian>H215 Super Puma (Disarmato)</Italian>
+        </Key>
+        <Key ID="STR_ACE_Compat_RF_RealisticNames_ec_02_base_Name">
+            <English>H225M Super Cougar SOCAT</English>
+            <Japanese>H225M シュペル クーガー SOCAT</Japanese>
+            <Korean>H225M 슈퍼 쿠거 SOCAT</Korean>
+            <German>H225M Super Cougar SOCAT</German>
+            <Italian>H225M Super Cougar SOCAT</Italian>
+        </Key>
+        <Key ID="STR_ACE_Compat_RF_RealisticNames_ec_02_nato_Name">
+            <English>H225M Super Cougar SOCAT</English>
+            <Japanese>H225M シュペル クーガー SOCAT</Japanese>
+            <Korean>H225M 슈퍼 쿠거 SOCAT</Korean>
+            <German>H225M Super Cougar SOCAT</German>
+            <Italian>H225M Super Cougar SOCAT</Italian>
+        </Key>
+        <Key ID="STR_ACE_Compat_RF_RealisticNames_ec_03_base_Name">
+            <English>H225M Super Cougar</English>
+            <Japanese>H225M シュペル クーガー</Japanese>
+            <Korean>H225M 슈퍼 쿠거</Korean>
+            <German>H225M Super Cougar</German>
+            <Italian>H225M Super Cougar</Italian>
+        </Key>
+        <Key ID="STR_ACE_Compat_RF_RealisticNames_ec_04_base_Name">
+            <English>H225 Super Puma SAR</English>
+            <Japanese>H225 シュペル ピューマ 捜索救難型</Japanese>
+            <Korean>H225 슈퍼 퓨마 SAR</Korean>
+            <German>H225 Super Puma SAR</German>
+            <Italian>H225 Super Puma SAR</Italian>
+        </Key>
+        <Key ID="STR_ACE_Compat_RF_RealisticNames_ec_04_military_base_Name">
+            <English>H225M Super Cougar (Unarmed)</English>
+            <Japanese>H225M シュペル クーガー (非武装)</Japanese>
+            <German>H225M Super Cougar (Unbewaffnet)</German>
+            <Italian>H225M Super Cougar (Disarmato)</Italian>
+            <Korean>H225M 슈퍼 쿠거 (비무장)</Korean>
+        </Key>
+        <Key ID="STR_ACE_Compat_RF_RealisticNames_truck_01_water_Name">
+            <English>HEMTT Fire Truck</English>
+            <French>HEMTT anti-incendie</French>
+            <Polish>HEMTT (wersja pożarnicza)</Polish>
+            <German>HEMTT-Löschfahrzeug</German>
+            <Spanish>HEMTT (camión de bomberos)</Spanish>
+            <Russian>Пожарная машина HEMTT</Russian>
+            <Chinesesimp>HEMTT 消防卡车</Chinesesimp>
+            <Portuguese>HEMTT contra incêndio</Portuguese>
+            <Japanese>HEMTT 消防車</Japanese>
+            <Italian>HEMTT Autobotte</Italian>
+            <Korean>HEMTT 소방트럭</Korean>
+        </Key>
+        <Key ID="STR_ACE_Compat_RF_RealisticNames_truck_03_water_Name">
+            <English>Typhoon Water</English>
+            <Japanese>タイフーン 給水</Japanese>
+            <Korean>타이푼 급수</Korean>
+            <German>Typhoon Water</German>
+            <Italian>Typhoon Acqua</Italian>
+        </Key>
+        <Key ID="STR_ACE_Compat_RF_RealisticNames_pickup_01_Name">
+            <English>Ram 1500</English>
+            <Japanese>ラム 1500</Japanese>
+            <Korean>램 1500</Korean>
+            <German>Ram 1500</German>
+            <Italian>Ram 1500</Italian>
+        </Key>
+        <Key ID="STR_ACE_Compat_RF_RealisticNames_pickup_01_Fuel_Name">
+            <English>Ram 1500 (Fuel)</English>
+            <Japanese>ラム 1500 (燃料)</Japanese>
+            <Korean>램 1500 (연료)</Korean>
+            <German>Ram 1500 (Treibstoff)</German>
+            <Italian>Ram 1500 (Carburante)</Italian>
+        </Key>
+        <Key ID="STR_ACE_Compat_RF_RealisticNames_pickup_01_service_Name">
+            <English>Ram 1500 (Services)</English>
+            <Japanese>ラム 1500 (サービス)</Japanese>
+            <Korean>램 1500 (서비스)</Korean>
+            <German>Ram 1500 (Pannenhilfe)</German>
+            <Italian>Ram 1500 (Servizi)</Italian>
+        </Key>
+        <Key ID="STR_ACE_Compat_RF_RealisticNames_pickup_01_repair_Name">
+            <English>Ram 1500 (Repair)</English>
+            <Japanese>ラム 1500 (修理)</Japanese>
+            <Korean>램 1500 (정비)</Korean>
+            <German>Ram 1500 (Instandsetzung)</German>
+            <Italian>Ram 1500 (Riparazioni)</Italian>
+        </Key>
+        <Key ID="STR_ACE_Compat_RF_RealisticNames_pickup_01_comms_Name">
+            <English>Ram 1500 (Comms)</English>
+            <Japanese>ラム 1500 (通信)</Japanese>
+            <Korean>램 1500 (통신)</Korean>
+            <German>Ram 1500 (Kommunikation)</German>
+            <Italian>Ram 1500 (Comunicazioni)</Italian>
+        </Key>
+        <Key ID="STR_ACE_Compat_RF_RealisticNames_pickup_01_hmg_Name">
+            <English>Ram 1500 (HMG)</English>
+            <Japanese>ラム 1500 (HMG)</Japanese>
+            <Korean>램 1500 (중기관총)</Korean>
+            <German>Ram 1500 (HMG)</German>
+            <Italian>Ram 1500 (HMG)</Italian>
+        </Key>
+        <Key ID="STR_ACE_Compat_RF_RealisticNames_pickup_01_mmg_Name">
+            <English>Ram 1500 (MMG)</English>
+            <Japanese>ラム 1500 (MMG)</Japanese>
+            <Korean>램 1500 (중형기관총)</Korean>
+            <German>Ram 1500 (MMG)</German>
+            <Italian>Ram 1500 (MMG)</Italian>
+        </Key>
+        <Key ID="STR_ACE_Compat_RF_RealisticNames_pickup_01_mrl_Name">
+            <English>Ram 1500 (MRL)</English>
+            <Japanese>ラム 1500 (MRL)</Japanese>
+            <Korean>램 1500 (다연장로켓)</Korean>
+            <German>Ram 1500 (MRL)</German>
+            <Italian>Ram 1500 (MRL)</Italian>
+        </Key>
+        <Key ID="STR_ACE_Compat_RF_RealisticNames_pickup_01_aa_Name">
+            <English>Ram 1500 (AA)</English>
+            <Japanese>ラム 1500 (対空)</Japanese>
+            <Korean>램 1500 (대공)</Korean>
+            <German>Ram 1500 (AA)</German>
+            <Italian>Ram 1500 (AA)</Italian>
+        </Key>
+        <Key ID="STR_ACE_Compat_RF_RealisticNames_pickup_01_covered_Name">
+            <English>Ram 1500 (Covered)</English>
+            <Japanese>ラム 1500 (カバー)</Japanese>
+            <Korean>램 1500 (커버)</Korean>
+            <German>Ram 1500 (Abgedeckt)</German>
+            <Italian>Ram 1500 (Coperto)</Italian>
+        </Key>
+        <Key ID="STR_ACE_Compat_RF_RealisticNames_pickup_01_water_Name">
+            <English>Ram 1500 (Water)</English>
+            <Japanese>ラム 1500 (給水)</Japanese>
+            <Korean>램 1500 (급수)</Korean>
+            <German>Ram 1500 (Wasser)</German>
+            <Italian>Ram 1500 (Acqua)</Italian>
+        </Key>
+        <Key ID="STR_ACE_Compat_RF_RealisticNames_commando_Name">
+            <English>RSG60</English>
+            <Japanese>RSG60</Japanese>
+            <Korean>RSG60</Korean>
+            <German>RSG60</German>
+            <Italian>RSG60</Italian>
+        </Key>
+        <Key ID="STR_ACE_Compat_RF_RealisticNames_twinmortar_Name">
+            <English>AMOS Container</English>
+            <Japanese>AMOS コンテナ</Japanese>
+            <Korean>AMOS 컨테이너</Korean>
+            <German>AMOS Container</German>
+            <Italian>AMOS Container</Italian>
+        </Key>
+        <Key ID="STR_ACE_Compat_RF_RealisticNames_rc40_base_Name">
+            <English>Drone40</English>
+            <Japanese>ドローン40</Japanese>
+            <Korean>드론40</Korean>
+            <German>Drone40</German>
+            <Italian>Drone40</Italian>
+        </Key>
+        <Key ID="STR_ACE_Compat_RF_RealisticNames_rc40_Name">
+            <English>Drone40 Scout</English>
+            <Japanese>ドローン40 偵察型</Japanese>
+            <Korean>드론40 정찰</Korean>
+            <German>Drone40 Scout</German>
+            <Italian>Drone40 Scout</Italian>
+        </Key>
+        <Key ID="STR_ACE_Compat_RF_RealisticNames_rc40_he_Name">
+            <English>Drone40 HE</English>
+            <Japanese>ドローン40 榴弾</Japanese>
+            <Korean>드론40 고폭</Korean>
+            <German>Drone40 HE</German>
+            <Italian>Drone40 HE</Italian>
+        </Key>
+        <Key ID="STR_ACE_Compat_RF_RealisticNames_rc40_white_Name">
+            <English>Drone40 Smoke (White)</English>
+            <Japanese>ドローン40 発煙弾 (白)</Japanese>
+            <Korean>드론40 연막 (백색)</Korean>
+            <German>Drone40 Smoke (Weiß)</German>
+            <Italian>Drone40 Smoke (Bianco)</Italian>
+        </Key>
+        <Key ID="STR_ACE_Compat_RF_RealisticNames_rc40_blue_Name">
+            <English>Drone40 Smoke (Blue)</English>
+            <Japanese>ドローン40 発煙弾 (青)</Japanese>
+            <Korean>드론40 연막 (청색)</Korean>
+            <German>Drone40 Smoke (Blau)</German>
+            <Italian>Drone40 Smoke (Blu)</Italian>
+        </Key>
+        <Key ID="STR_ACE_Compat_RF_RealisticNames_rc40_red_Name">
+            <English>Drone40 Smoke (Red)</English>
+            <Japanese>ドローン40 発煙弾 (赤)</Japanese>
+            <Korean>드론40 연막 (적색)</Korean>
+            <German>Drone40 Smoke (Rot)</German>
+            <Italian>Drone40 Smoke (Rosso)</Italian>
+        </Key>
+        <Key ID="STR_ACE_Compat_RF_RealisticNames_rc40_green_Name">
+            <English>Drone40 Smoke (Green)</English>
+            <Japanese>ドローン40 発煙弾 (緑)</Japanese>
+            <Korean>드론40 연막 (녹색)</Korean>
+            <German>Drone40 Smoke (Grün)</German>
+            <Italian>Drone40 Smoke (Verde)</Italian>
+        </Key>
+        <Key ID="STR_ACE_Compat_RF_RealisticNames_rc40_orange_Name">
+            <English>Drone40 Smoke (Orange)</English>
+            <Japanese>ドローン40 発煙弾 (橙)</Japanese>
+            <Korean>드론40 연막 (주황색)</Korean>
+            <German>Drone40 Smoke (Orange)</German>
+            <Italian>Drone40 Smoke (Arancione)</Italian>
+        </Key>
+    </Package>
+</Project>
diff --git a/addons/compat_rf/config.cpp b/addons/compat_rf/config.cpp
new file mode 100644
index 0000000000..ab6fb94275
--- /dev/null
+++ b/addons/compat_rf/config.cpp
@@ -0,0 +1,18 @@
+#include "script_component.hpp"
+
+class CfgPatches {
+    class ADDON {
+        name = COMPONENT_NAME;
+        units[] = {};
+        weapons[] = {};
+        requiredVersion = REQUIRED_VERSION;
+        requiredAddons[] = {"RF_Data_Loadorder"};
+        skipWhenMissingDependencies = 1;
+        author = ECSTRING(common,ACETeam);
+        authors[] = {"Mike"};
+        url = ECSTRING(main,URL);
+        VERSION_CONFIG;
+    };
+};
+
+#include "CfgWeapons.hpp"
diff --git a/addons/compat_rf/script_component.hpp b/addons/compat_rf/script_component.hpp
new file mode 100644
index 0000000000..2cc45da490
--- /dev/null
+++ b/addons/compat_rf/script_component.hpp
@@ -0,0 +1,6 @@
+#define COMPONENT compat_rf
+#define COMPONENT_BEAUTIFIED Reaction Forces Compatibility
+
+#include "\z\ace\addons\main\script_mod.hpp"
+
+#include "\z\ace\addons\main\script_macros.hpp"
diff --git a/addons/compat_rhs_afrf3/CfgWeapons.hpp b/addons/compat_rhs_afrf3/CfgWeapons.hpp
index a6def44c40..a25d1f7cd0 100644
--- a/addons/compat_rhs_afrf3/CfgWeapons.hpp
+++ b/addons/compat_rhs_afrf3/CfgWeapons.hpp
@@ -108,19 +108,7 @@ class CfgWeapons {
         EGVAR(overpressure,offset) = 1.65;
     };
 
-    class H_HelmetB;
-    class rhs_tsh4: H_HelmetB {
-        HEARING_PROTECTION_VICCREW;
-    };
-
-    class rhs_6b47_bare;
-    class rhs_6b48: rhs_6b47_bare {
-        HEARING_PROTECTION_VICCREW;
-    };
-
-    class rhs_zsh7a: H_HelmetB {
-        HEARING_PROTECTION_VICCREW;
-    };
+    class rhs_zsh7a;
     class rhs_zsh7a_alt: rhs_zsh7a {
         ACE_Protection = 1;
     };
@@ -133,22 +121,6 @@ class CfgWeapons {
         ACE_Protection = 1;
     };
 
-    class rhs_gssh18: H_HelmetB {
-        HEARING_PROTECTION_EARMUFF;
-    };
-
-    class rhs_6b47;
-    class rhs_6b47_6m2: rhs_6b47 {
-        HEARING_PROTECTION_PELTOR;
-    };
-    class rhs_6b47_6m2_1: rhs_6b47 {
-        HEARING_PROTECTION_PELTOR;
-    };
-
-    class rhs_6m2: H_HelmetB {
-        HEARING_PROTECTION_PELTOR;
-    };
-
     class rhs_weap_d81;
     class rhs_weap_2a70: rhs_weap_d81 { // "Low pressure" 100mm cannon
         EGVAR(overpressure,range) = 15;
diff --git a/addons/compat_rhs_afrf3/XEH_postInit.sqf b/addons/compat_rhs_afrf3/XEH_postInit.sqf
index be180179a5..e740d0d8a6 100644
--- a/addons/compat_rhs_afrf3/XEH_postInit.sqf
+++ b/addons/compat_rhs_afrf3/XEH_postInit.sqf
@@ -1,5 +1,7 @@
 #include "script_component.hpp"
 
+if !(["ace_nametags"] call EFUNC(common,isModLoaded)) exitWith {};
+
 private _russianRankIcons = [
     QPATHTOEF(nametags,UI\icons_russia\private_gs.paa),
     QPATHTOEF(nametags,UI\icons_russia\corporal_gs.paa),
diff --git a/addons/compat_rhs_afrf3/XEH_preInit.sqf b/addons/compat_rhs_afrf3/XEH_preInit.sqf
index b47cf6628d..2ca4338e90 100644
--- a/addons/compat_rhs_afrf3/XEH_preInit.sqf
+++ b/addons/compat_rhs_afrf3/XEH_preInit.sqf
@@ -6,4 +6,12 @@ PREP_RECOMPILE_START;
 #include "XEH_PREP.hpp"
 PREP_RECOMPILE_END;
 
+// Disable RHS' wheel replacement mechanic
+if (["ace_repair"] call EFUNC(common,isModLoaded)) then {
+    RHS_Retread_Enabled = false;
+    rhs_btr70_EnableRetread = false;
+    rhs_TypeTirePressure = 1;
+    RHS_BTR_Effects_Init = true;
+};
+
 ADDON = true;
diff --git a/addons/compat_rhs_afrf3/compat_rhs_afrf3_explosives/CfgMagazines.hpp b/addons/compat_rhs_afrf3/compat_rhs_afrf3_explosives/CfgMagazines.hpp
index 4f8e808bd5..3b9be4a3a6 100644
--- a/addons/compat_rhs_afrf3/compat_rhs_afrf3_explosives/CfgMagazines.hpp
+++ b/addons/compat_rhs_afrf3/compat_rhs_afrf3_explosives/CfgMagazines.hpp
@@ -42,7 +42,6 @@ class CfgMagazines {
     };
 
     class rhs_ec75_mag: ATMine_Range_Mag {
-        EGVAR(explosives,DelayTime) = 1;
         EGVAR(explosives,SetupObject) = QEGVAR(explosives,Place_rhs_ec75);
         useAction = 0;
         class ACE_Triggers {
@@ -133,7 +132,6 @@ class CfgMagazines {
     };
 
     class rhs_mine_ozm72_c_mag: rhs_mine_ozm72_a_mag {
-        EGVAR(explosives,DelayTime) = 1;
         EGVAR(explosives,SetupObject) = QEGVAR(explosives,Place_rhs_mine_ozm72_c);
         useAction = 0;
         class ACE_Triggers {
diff --git a/addons/compat_rhs_afrf3/compat_rhs_afrf3_hearing/CfgWeapons.hpp b/addons/compat_rhs_afrf3/compat_rhs_afrf3_hearing/CfgWeapons.hpp
new file mode 100644
index 0000000000..04edf4d754
--- /dev/null
+++ b/addons/compat_rhs_afrf3/compat_rhs_afrf3_hearing/CfgWeapons.hpp
@@ -0,0 +1,28 @@
+class CfgWeapons {
+    class H_HelmetB;
+    class rhs_tsh4: H_HelmetB {
+        HEARING_PROTECTION_VICCREW;
+    };
+    class rhs_zsh7a: H_HelmetB {
+        HEARING_PROTECTION_VICCREW;
+    };
+    class rhs_gssh18: H_HelmetB {
+        HEARING_PROTECTION_EARMUFF;
+    };
+    class rhs_6m2: H_HelmetB {
+        HEARING_PROTECTION_PELTOR;
+    };
+
+    class rhs_6b47;
+    class rhs_6b47_6m2: rhs_6b47 {
+        HEARING_PROTECTION_PELTOR;
+    };
+    class rhs_6b47_6m2_1: rhs_6b47 {
+        HEARING_PROTECTION_PELTOR;
+    };
+
+    class rhs_6b47_bare;
+    class rhs_6b48: rhs_6b47_bare {
+        HEARING_PROTECTION_VICCREW;
+    };
+};
diff --git a/addons/compat_rhs_afrf3/compat_rhs_afrf3_hearing/config.cpp b/addons/compat_rhs_afrf3/compat_rhs_afrf3_hearing/config.cpp
new file mode 100644
index 0000000000..4a8056bf0c
--- /dev/null
+++ b/addons/compat_rhs_afrf3/compat_rhs_afrf3_hearing/config.cpp
@@ -0,0 +1,19 @@
+#include "script_component.hpp"
+#include "\z\ace\addons\hearing\script_macros_hearingProtection.hpp"
+
+class CfgPatches {
+    class SUBADDON {
+        addonRootClass = QUOTE(COMPONENT);
+        units[] = {};
+        weapons[] = {};
+        requiredVersion = REQUIRED_VERSION;
+        requiredAddons[] = {
+            "rhs_main_loadorder",
+            "ace_hearing"
+        };
+        skipWhenMissingDependencies = 1;
+        VERSION_CONFIG;
+    };
+};
+
+#include "CfgWeapons.hpp"
diff --git a/addons/compat_rhs_afrf3/compat_rhs_afrf3_hearing/script_component.hpp b/addons/compat_rhs_afrf3/compat_rhs_afrf3_hearing/script_component.hpp
new file mode 100644
index 0000000000..8edb825af3
--- /dev/null
+++ b/addons/compat_rhs_afrf3/compat_rhs_afrf3_hearing/script_component.hpp
@@ -0,0 +1,3 @@
+#define SUBCOMPONENT hearing
+#define SUBCOMPONENT_BEAUTIFIED Hearing
+#include "..\script_component.hpp"
diff --git a/addons/compat_rhs_afrf3/compat_rhs_afrf3_repair/CfgVehicles.hpp b/addons/compat_rhs_afrf3/compat_rhs_afrf3_repair/CfgVehicles.hpp
new file mode 100644
index 0000000000..1acd977b99
--- /dev/null
+++ b/addons/compat_rhs_afrf3/compat_rhs_afrf3_repair/CfgVehicles.hpp
@@ -0,0 +1,123 @@
+class CfgVehicles {
+    class Wheeled_APC_F;
+    class rhs_btr_base: Wheeled_APC_F {
+        class EGVAR(interaction,anims) {
+            class wheel_1_unhide {
+                positions[] = {{-0.8, -1.7, 0}};
+                items[] = {"ACE_Wheel"};
+                name = ECSTRING(repair,RemoveWheel);
+                text = ECSTRING(repair,RemovingWheel);
+            };
+            class wheel_2_unhide {
+                positions[] = {{0.35, -2.9, -0.1}};
+                items[] = {"ACE_Wheel"};
+                name = ECSTRING(repair,RemoveWheel);
+                text = ECSTRING(repair,RemovingWheel);
+            };
+        };
+    };
+    class rhs_btr70_vmf: rhs_btr_base {
+        class EGVAR(interaction,anims): EGVAR(interaction,anims) {
+            class wheel_1_unhide: wheel_1_unhide {
+                positions[] = {{-1.2, -2.6, 0.2}};
+            };
+            class wheel_2_unhide: wheel_2_unhide {
+                positions[] = {{-0.3, -3.8, 0}};
+            };
+        };
+    };
+
+    class rhs_btr70_msv: rhs_btr70_vmf {};
+    class rhs_btr80_msv: rhs_btr70_msv {
+        class EGVAR(interaction,anims): EGVAR(interaction,anims) {
+            class wheel_1_unhide: wheel_1_unhide {
+                positions[] = {{-1, -2.5, 0.6}};
+            };
+            class wheel_2_unhide: wheel_2_unhide {
+                enabled = 0;
+            };
+        };
+    };
+
+    class Truck_F;
+    class rhs_truck: Truck_F {
+        class EGVAR(interaction,anims) {
+            class spare_hide {
+                selections[] = {"spare"};
+                items[] = {"ACE_Wheel"};
+                name = ECSTRING(repair,RemoveWheel);
+                text = ECSTRING(repair,RemovingWheel);
+            };
+        };
+    };
+
+    class RHS_Ural_BaseTurret: Truck_F {
+        class EGVAR(interaction,anims) {
+           class spare_hide {
+               selections[] = {"spare"};
+               items[] = {"ACE_Wheel"};
+               name = ECSTRING(repair,RemoveWheel);
+               text = ECSTRING(repair,RemovingWheel);
+           };
+       };
+    };
+
+    class rhs_zil131_base: Truck_F {
+        class EGVAR(interaction,anims) {
+            class spare_hide {
+                selections[] = {"spare"};
+                items[] = {"ACE_Wheel"};
+                name = ECSTRING(repair,RemoveWheel);
+                text = ECSTRING(repair,RemovingWheel);
+            };
+        };
+    };
+
+    class rhs_kraz255_base;
+    class rhs_kraz255b1_base: rhs_kraz255_base {
+        class EGVAR(interaction,anims) {
+            class spare_hide {
+                selections[] = {"spare"};
+                items[] = {"ACE_Wheel"};
+                name = ECSTRING(repair,RemoveWheel);
+                text = ECSTRING(repair,RemovingWheel);
+            };
+        };
+    };
+
+    class O_Truck_02_covered_F;
+    class rhs_kamaz5350: O_Truck_02_covered_F {
+        class EGVAR(interaction,anims) {
+            class spare_hide {
+                selections[] = {"spare"};
+                items[] = {"ACE_Wheel"};
+                name = ECSTRING(repair,RemoveWheel);
+                text = ECSTRING(repair,RemovingWheel);
+            };
+        };
+    };
+
+    class MRAP_02_base_F;
+    class rhs_tigr_base: MRAP_02_base_F {
+        class EGVAR(interaction,anims) {
+            class spare_hide {
+                selections[] = {"spare"};
+                items[] = {"ACE_Wheel"};
+                name = ECSTRING(repair,RemoveWheel);
+                text = ECSTRING(repair,RemovingWheel);
+            };
+        };
+    };
+
+    class Offroad_01_base_f;
+    class RHS_UAZ_Base: Offroad_01_base_f {
+        class EGVAR(interaction,anims) {
+            class spare_hide {
+                selections[] = {"spare"};
+                items[] = {"ACE_Wheel"};
+                name = ECSTRING(repair,RemoveWheel);
+                text = ECSTRING(repair,RemovingWheel);
+            };
+        };
+    };
+};
diff --git a/addons/compat_rhs_afrf3/compat_rhs_afrf3_repair/config.cpp b/addons/compat_rhs_afrf3/compat_rhs_afrf3_repair/config.cpp
new file mode 100644
index 0000000000..d6d4fab107
--- /dev/null
+++ b/addons/compat_rhs_afrf3/compat_rhs_afrf3_repair/config.cpp
@@ -0,0 +1,21 @@
+#include "script_component.hpp"
+
+class CfgPatches {
+    class SUBADDON {
+        name = COMPONENT_NAME;
+        units[] = {};
+        weapons[] = {};
+        requiredVersion = REQUIRED_VERSION;
+        requiredAddons[] = {
+            "rhs_main_loadorder",
+            "ace_repair"
+        };
+        skipWhenMissingDependencies = 1;
+        author = ECSTRING(common,ACETeam);
+        authors[] = {"Dystopian", "johnb43"};
+        url = ECSTRING(main,URL);
+        VERSION_CONFIG;
+    };
+};
+
+#include "CfgVehicles.hpp"
diff --git a/addons/compat_rhs_afrf3/compat_rhs_afrf3_repair/script_component.hpp b/addons/compat_rhs_afrf3/compat_rhs_afrf3_repair/script_component.hpp
new file mode 100644
index 0000000000..1af928486c
--- /dev/null
+++ b/addons/compat_rhs_afrf3/compat_rhs_afrf3_repair/script_component.hpp
@@ -0,0 +1,3 @@
+#define SUBCOMPONENT repair
+#define SUBCOMPONENT_BEAUTIFIED Repair
+#include "..\script_component.hpp"
diff --git a/addons/compat_rhs_afrf3/config.cpp b/addons/compat_rhs_afrf3/config.cpp
index 44fcd30fcb..8bf5668485 100644
--- a/addons/compat_rhs_afrf3/config.cpp
+++ b/addons/compat_rhs_afrf3/config.cpp
@@ -1,5 +1,4 @@
 #include "script_component.hpp"
-#include "\z\ace\addons\hearing\script_macros_hearingProtection.hpp"
 
 class CfgPatches {
     class ADDON {
@@ -7,7 +6,7 @@ class CfgPatches {
         units[] = {};
         weapons[] = {};
         requiredVersion = REQUIRED_VERSION;
-        requiredAddons[] = {"rhs_main_loadorder"};
+        requiredAddons[] = {"ace_common", "rhs_main_loadorder"};
         author = ECSTRING(common,ACETeam);
         authors[] = {"Ruthberg", "GitHawk", "BaerMitUmlaut", "commy2", "Skengman2"};
         url = ECSTRING(main,URL);
diff --git a/addons/compat_rhs_gref3/config.cpp b/addons/compat_rhs_gref3/config.cpp
index f2e7aeacde..84717435be 100644
--- a/addons/compat_rhs_gref3/config.cpp
+++ b/addons/compat_rhs_gref3/config.cpp
@@ -6,7 +6,7 @@ class CfgPatches {
         units[] = {};
         weapons[] = {};
         requiredVersion = REQUIRED_VERSION;
-        requiredAddons[] = {"rhsgref_main_loadorder"};
+        requiredAddons[] = {"ace_common", "rhsgref_main_loadorder"};
         skipWhenMissingDependencies = 1;
         author = ECSTRING(common,ACETeam);
         authors[] = {"PabstMirror", "Ruthberg", "Anton"};
diff --git a/addons/compat_rhs_saf3/compat_rhs_saf3_explosives/CfgMagazines.hpp b/addons/compat_rhs_saf3/compat_rhs_saf3_explosives/CfgMagazines.hpp
index c004f58446..2cda6e7265 100644
--- a/addons/compat_rhs_saf3/compat_rhs_saf3_explosives/CfgMagazines.hpp
+++ b/addons/compat_rhs_saf3/compat_rhs_saf3_explosives/CfgMagazines.hpp
@@ -51,7 +51,6 @@ class CfgMagazines {
     class CA_Magazine;
     class rhssaf_tm100_mag: CA_Magazine {
         useAction = 0;
-        EGVAR(explosives,DelayTime) = 1;
         EGVAR(explosives,Placeable) = 1;
         EGVAR(explosives,SetupObject) = QEGVAR(explosives,Place_rhssaf_tm100);
         class ACE_Triggers {
diff --git a/addons/compat_rhs_saf3/config.cpp b/addons/compat_rhs_saf3/config.cpp
index 75ee4f5530..71340640ce 100644
--- a/addons/compat_rhs_saf3/config.cpp
+++ b/addons/compat_rhs_saf3/config.cpp
@@ -6,7 +6,7 @@ class CfgPatches {
         units[] = {};
         weapons[] = {};
         requiredVersion = REQUIRED_VERSION;
-        requiredAddons[] = {"rhssaf_main_loadorder"};
+        requiredAddons[] = {"ace_common", "rhssaf_main_loadorder"};
         skipWhenMissingDependencies = 1;
         author = ECSTRING(common,ACETeam);
         authors[] = {};
diff --git a/addons/compat_rhs_usf3/CfgMagazineWells.hpp b/addons/compat_rhs_usf3/CfgMagazineWells.hpp
deleted file mode 100644
index 01223ec141..0000000000
--- a/addons/compat_rhs_usf3/CfgMagazineWells.hpp
+++ /dev/null
@@ -1,11 +0,0 @@
-class CfgMagazineWells {
-    class ace_hellfire_K {
-        ADDON[] = {QGVAR(pylon_mag_2rnd_hellfire_k)};
-    };
-    class ace_hellfire_N {
-        ADDON[] = {QGVAR(pylon_mag_2rnd_hellfire_n)};
-    };
-    class ace_hellfire_L {
-        ADDON[] = {QGVAR(pylon_mag_2rnd_hellfire_l)};
-    };
-};
diff --git a/addons/compat_rhs_usf3/CfgMagazines.hpp b/addons/compat_rhs_usf3/CfgMagazines.hpp
index f11dad081c..471b345dcd 100644
--- a/addons/compat_rhs_usf3/CfgMagazines.hpp
+++ b/addons/compat_rhs_usf3/CfgMagazines.hpp
@@ -38,21 +38,4 @@ class cfgMagazines {
         EGVAR(overpressure,range) = 0;
         EGVAR(overpressure,damage) = 0;
     };
-
-    class rhs_mag_AGM114K_2;
-    class GVAR(pylon_mag_2rnd_hellfire_k): rhs_mag_AGM114K_2 {
-        displayName = "2x AGM-114K [ACE]";
-        pylonWeapon = "ace_hellfire_launcher";
-        ammo = "ACE_Hellfire_AGM114K";
-    };
-    class GVAR(pylon_mag_2rnd_hellfire_n): rhs_mag_AGM114K_2 {
-        displayName = "2x AGM-114N [ACE]";
-        pylonWeapon = "ace_hellfire_launcher_N";
-        ammo = "ACE_Hellfire_AGM114N";
-    };
-    class GVAR(pylon_mag_2rnd_hellfire_l): rhs_mag_AGM114K_2 {
-        displayName = "2x AGM-114L [ACE]";
-        pylonWeapon = "ace_hellfire_launcher_L";
-        ammo = "ACE_Hellfire_AGM114L";
-    };
 };
diff --git a/addons/compat_rhs_usf3/CfgVehicles.hpp b/addons/compat_rhs_usf3/CfgVehicles.hpp
index 0593c5a868..3933e543ec 100644
--- a/addons/compat_rhs_usf3/CfgVehicles.hpp
+++ b/addons/compat_rhs_usf3/CfgVehicles.hpp
@@ -43,8 +43,7 @@ class CfgVehicles {
         EGVAR(refuel,fuelCapacity) = 302;
     };
 
-    class Truck_F;
-    class Truck_01_base_F: Truck_F {};
+    class Truck_01_base_F;
     class rhsusf_fmtv_base: Truck_01_base_F {
         EGVAR(refuel,fuelCapacity) = 219;
     };
@@ -55,8 +54,7 @@ class CfgVehicles {
         EGVAR(refuel,fuelCargo) = 900; // 45 jerrycans
     };
 
-    class rhsusf_HEMTT_A4_base: Truck_01_base_F {};
-    class rhsusf_M977A4_usarmy_wd: rhsusf_HEMTT_A4_base {};
+    class rhsusf_M977A4_usarmy_wd;
     class rhsusf_M977A4_AMMO_usarmy_wd: rhsusf_M977A4_usarmy_wd {
         EGVAR(rearm,defaultSupply) = 1200;
     };
diff --git a/addons/compat_rhs_usf3/CfgWeapons.hpp b/addons/compat_rhs_usf3/CfgWeapons.hpp
index 46ac7e56ba..50b09c760f 100644
--- a/addons/compat_rhs_usf3/CfgWeapons.hpp
+++ b/addons/compat_rhs_usf3/CfgWeapons.hpp
@@ -206,170 +206,7 @@ class CfgWeapons {
         EGVAR(overpressure,offset) = 0.9;
     };
 
-    // Fast Helmets
-    class rhsusf_opscore_01;
-    class rhsusf_opscore_ut_pelt_nsw: rhsusf_opscore_01 {
-        HEARING_PROTECTION_PELTOR;
-    };
-    class rhsusf_opscore_aor1_pelt: rhsusf_opscore_01 {
-        HEARING_PROTECTION_PELTOR;
-    };
-    class rhsusf_opscore_aor1_pelt_nsw: rhsusf_opscore_01 {
-        HEARING_PROTECTION_PELTOR;
-    };
-    class rhsusf_opscore_bk_pelt: rhsusf_opscore_01 {
-        HEARING_PROTECTION_PELTOR;
-    };
-    class rhsusf_opscore_fg_pelt: rhsusf_opscore_01 {
-        HEARING_PROTECTION_PELTOR;
-    };
-    class rhsusf_opscore_fg_pelt_nsw: rhsusf_opscore_01 {
-        HEARING_PROTECTION_PELTOR;
-    };
-    class rhsusf_opscore_fg_pelt_cam: rhsusf_opscore_01 {
-        HEARING_PROTECTION_PELTOR;
-    };
-    class rhsusf_opscore_paint_pelt: rhsusf_opscore_01 {
-        HEARING_PROTECTION_PELTOR;
-    };
-    class rhsusf_opscore_paint_pelt_nsw: rhsusf_opscore_01 {
-        HEARING_PROTECTION_PELTOR;
-    };
-    class rhsusf_opscore_paint_pelt_nsw_cam: rhsusf_opscore_01 {
-        HEARING_PROTECTION_PELTOR;
-    };
-    class rhsusf_opscore_aor2_pelt: rhsusf_opscore_01 {
-        HEARING_PROTECTION_PELTOR;
-    };
-    class rhsusf_opscore_aor2_pelt_nsw: rhsusf_opscore_01 {
-        HEARING_PROTECTION_PELTOR;
-    };
-    class rhsusf_opscore_ut_pelt: rhsusf_opscore_01 {
-        HEARING_PROTECTION_PELTOR;
-    };
-    class rhsusf_opscore_ut_pelt_cam: rhsusf_opscore_01 {
-        HEARING_PROTECTION_PELTOR;
-    };
-    class rhsusf_opscore_ut_pelt_nsw_cam: rhsusf_opscore_01 {
-        HEARING_PROTECTION_PELTOR;
-    };
-    class rhsusf_opscore_mc_pelt: rhsusf_opscore_01 {
-        HEARING_PROTECTION_PELTOR;
-    };
-    class rhsusf_opscore_mc_pelt_nsw: rhsusf_opscore_01 {
-        HEARING_PROTECTION_PELTOR;
-    };
-    class rhsusf_opscore_cover;
-    class rhsusf_opscore_mc_cover_pelt_nsw: rhsusf_opscore_cover {
-        HEARING_PROTECTION_PELTOR;
-    };
-    class rhsusf_opscore_mc_cover_pelt: rhsusf_opscore_cover {
-        HEARING_PROTECTION_PELTOR;
-    };
-    class rhsusf_opscore_mc_cover_pelt_cam: rhsusf_opscore_cover {
-        HEARING_PROTECTION_PELTOR;
-    };
-    class rhsusf_opscore_rg_cover_pelt: rhsusf_opscore_cover {
-        HEARING_PROTECTION_PELTOR;
-    };
-    class rhsusf_opscore_coy_cover_pelt: rhsusf_opscore_cover {
-        HEARING_PROTECTION_PELTOR;
-    };
-    class rhsusf_opscore_mar_01;
-    class rhsusf_opscore_mar_ut_pelt: rhsusf_opscore_mar_01 {
-        HEARING_PROTECTION_PELTOR;
-    };
-    class rhsusf_opscore_mar_fg_pelt: rhsusf_opscore_mar_01 {
-        HEARING_PROTECTION_PELTOR;
-    };
-
-    // ACH Helmets
-    class rhsusf_ach_helmet_ocp;
-    class rhsusf_ach_bare_des_headset: rhsusf_ach_helmet_ocp {
-        HEARING_PROTECTION_PELTOR;
-    };
-    class rhsusf_ach_bare_des_headset_ess: rhsusf_ach_helmet_ocp {
-        HEARING_PROTECTION_PELTOR;
-    };
-    class rhsusf_ach_bare_headset: rhsusf_ach_helmet_ocp {
-        HEARING_PROTECTION_PELTOR;
-    };
-    class rhsusf_ach_bare_headset_ess: rhsusf_ach_helmet_ocp {
-        HEARING_PROTECTION_PELTOR;
-    };
-    class rhsusf_ach_bare_semi_headset: rhsusf_ach_helmet_ocp {
-        HEARING_PROTECTION_PELTOR;
-    };
-    class rhsusf_ach_bare_semi_headset_ess: rhsusf_ach_helmet_ocp {
-        HEARING_PROTECTION_PELTOR;
-    };
-    class rhsusf_ach_bare_tan_headset: rhsusf_ach_helmet_ocp {
-        HEARING_PROTECTION_PELTOR;
-    };
-    class rhsusf_ach_bare_tan_headset_ess: rhsusf_ach_helmet_ocp {
-        HEARING_PROTECTION_PELTOR;
-    };
-    class rhsusf_ach_bare_wood_headset: rhsusf_ach_helmet_ocp {
-        HEARING_PROTECTION_PELTOR;
-    };
-    class rhsusf_ach_bare_wood_headset_ess: rhsusf_ach_helmet_ocp {
-        HEARING_PROTECTION_PELTOR;
-    };
-    class rhsusf_ach_helmet_headset_ocp: rhsusf_ach_helmet_ocp {
-        HEARING_PROTECTION_PELTOR;
-    };
-    class rhsusf_ach_helmet_headset_ess_ocp: rhsusf_ach_helmet_ocp {
-        HEARING_PROTECTION_PELTOR;
-    };
-
-    // ACVC Helmets
-    class rhsusf_cvc_helmet: rhsusf_opscore_01 {
-        HEARING_PROTECTION_VICCREW;
-    };
-
-    // MICH Helmets
-    class rhsusf_mich_bare;
-    class rhsusf_mich_bare_alt: rhsusf_mich_bare {
-        HEARING_PROTECTION_PELTOR;
-    };
-    class rhsusf_mich_bare_norotos;
-    class rhsusf_mich_bare_norotos_alt: rhsusf_mich_bare_norotos {
-        HEARING_PROTECTION_PELTOR;
-    };
-    class rhsusf_mich_bare_norotos_arc;
-    class rhsusf_mich_bare_norotos_arc_alt: rhsusf_mich_bare_norotos_arc {
-        HEARING_PROTECTION_PELTOR;
-    };
-    class rhsusf_mich_bare_semi;
-    class rhsusf_mich_bare_alt_semi: rhsusf_mich_bare_semi {
-        HEARING_PROTECTION_PELTOR;
-    };
-    class rhsusf_mich_bare_norotos_semi;
-    class rhsusf_mich_bare_norotos_alt_semi: rhsusf_mich_bare_norotos_semi {
-        HEARING_PROTECTION_PELTOR;
-    };
-    class rhsusf_mich_bare_norotos_arc_semi: rhsusf_mich_bare_norotos_alt_semi {
-        HEARING_PROTECTION_OPEN;
-    };
-    class rhsusf_mich_bare_norotos_arc_alt_semi: rhsusf_mich_bare_norotos_arc_semi {
-        HEARING_PROTECTION_PELTOR;
-    };
-    class rhsusf_mich_bare_tan;
-    class rhsusf_mich_bare_alt_tan: rhsusf_mich_bare_tan {
-        HEARING_PROTECTION_PELTOR;
-    };
-    class rhsusf_mich_bare_norotos_tan;
-    class rhsusf_mich_bare_norotos_alt_tan: rhsusf_mich_bare_norotos_tan {
-        HEARING_PROTECTION_PELTOR;
-    };
-    class rhsusf_mich_bare_norotos_arc_tan;
-    class rhsusf_mich_bare_norotos_arc_alt_tan: rhsusf_mich_bare_norotos_arc_tan {
-        HEARING_PROTECTION_PELTOR;
-    };
-
-    class rhsusf_hgu56p: rhsusf_opscore_01 {
-        HEARING_PROTECTION_VICCREW;
-    };
+    class rhsusf_hgu56p;
     class rhsusf_hgu56p_visor: rhsusf_hgu56p {
         ACE_Protection = 1;
     };
@@ -420,13 +257,9 @@ class CfgWeapons {
     class rhsusf_hgu56p_mask_black_skull: rhsusf_hgu56p_visor_mask_black_skull {
         ACE_Protection = 0;
     };
-    class rhsusf_ihadss: rhsusf_opscore_01 {
-        HEARING_PROTECTION_VICCREW;
-    };
 
     class H_HelmetB;
     class RHS_jetpilot_usaf: H_HelmetB {
         ACE_Protection = 1;
-        HEARING_PROTECTION_VICCREW;
     };
 };
diff --git a/addons/compat_rhs_usf3/compat_rhs_usf3_explosives/CfgMagazines.hpp b/addons/compat_rhs_usf3/compat_rhs_usf3_explosives/CfgMagazines.hpp
index 332c2bf1f2..aa2485dcdc 100644
--- a/addons/compat_rhs_usf3/compat_rhs_usf3_explosives/CfgMagazines.hpp
+++ b/addons/compat_rhs_usf3/compat_rhs_usf3_explosives/CfgMagazines.hpp
@@ -1,7 +1,6 @@
 class CfgMagazines {
     class CA_Magazine;
     class rhsusf_m112_mag: CA_Magazine {
-        EGVAR(explosives,delayTime) = 1;
         EGVAR(explosives,placeable) = 1;
         EGVAR(explosives,setupObject) = QEGVAR(explosives,Place_rhsusf_explosive_m112);
         useAction = 0;
diff --git a/addons/compat_rhs_usf3/compat_rhs_usf3_hearing/CfgWeapons.hpp b/addons/compat_rhs_usf3/compat_rhs_usf3_hearing/CfgWeapons.hpp
new file mode 100644
index 0000000000..f0571e876f
--- /dev/null
+++ b/addons/compat_rhs_usf3/compat_rhs_usf3_hearing/CfgWeapons.hpp
@@ -0,0 +1,174 @@
+class CfgWeapons {
+    // Fast Helmets
+    class rhsusf_opscore_01;
+    class rhsusf_opscore_ut_pelt_nsw: rhsusf_opscore_01 {
+        HEARING_PROTECTION_PELTOR;
+    };
+    class rhsusf_opscore_aor1_pelt: rhsusf_opscore_01 {
+        HEARING_PROTECTION_PELTOR;
+    };
+    class rhsusf_opscore_aor1_pelt_nsw: rhsusf_opscore_01 {
+        HEARING_PROTECTION_PELTOR;
+    };
+    class rhsusf_opscore_bk_pelt: rhsusf_opscore_01 {
+        HEARING_PROTECTION_PELTOR;
+    };
+    class rhsusf_opscore_fg_pelt: rhsusf_opscore_01 {
+        HEARING_PROTECTION_PELTOR;
+    };
+    class rhsusf_opscore_fg_pelt_nsw: rhsusf_opscore_01 {
+        HEARING_PROTECTION_PELTOR;
+    };
+    class rhsusf_opscore_fg_pelt_cam: rhsusf_opscore_01 {
+        HEARING_PROTECTION_PELTOR;
+    };
+    class rhsusf_opscore_paint_pelt: rhsusf_opscore_01 {
+        HEARING_PROTECTION_PELTOR;
+    };
+    class rhsusf_opscore_paint_pelt_nsw: rhsusf_opscore_01 {
+        HEARING_PROTECTION_PELTOR;
+    };
+    class rhsusf_opscore_paint_pelt_nsw_cam: rhsusf_opscore_01 {
+        HEARING_PROTECTION_PELTOR;
+    };
+    class rhsusf_opscore_aor2_pelt: rhsusf_opscore_01 {
+        HEARING_PROTECTION_PELTOR;
+    };
+    class rhsusf_opscore_aor2_pelt_nsw: rhsusf_opscore_01 {
+        HEARING_PROTECTION_PELTOR;
+    };
+    class rhsusf_opscore_ut_pelt: rhsusf_opscore_01 {
+        HEARING_PROTECTION_PELTOR;
+    };
+    class rhsusf_opscore_ut_pelt_cam: rhsusf_opscore_01 {
+        HEARING_PROTECTION_PELTOR;
+    };
+    class rhsusf_opscore_ut_pelt_nsw_cam: rhsusf_opscore_01 {
+        HEARING_PROTECTION_PELTOR;
+    };
+    class rhsusf_opscore_mc_pelt: rhsusf_opscore_01 {
+        HEARING_PROTECTION_PELTOR;
+    };
+    class rhsusf_opscore_mc_pelt_nsw: rhsusf_opscore_01 {
+        HEARING_PROTECTION_PELTOR;
+    };
+    class rhsusf_opscore_cover;
+    class rhsusf_opscore_mc_cover_pelt_nsw: rhsusf_opscore_cover {
+        HEARING_PROTECTION_PELTOR;
+    };
+    class rhsusf_opscore_mc_cover_pelt: rhsusf_opscore_cover {
+        HEARING_PROTECTION_PELTOR;
+    };
+    class rhsusf_opscore_mc_cover_pelt_cam: rhsusf_opscore_cover {
+        HEARING_PROTECTION_PELTOR;
+    };
+    class rhsusf_opscore_rg_cover_pelt: rhsusf_opscore_cover {
+        HEARING_PROTECTION_PELTOR;
+    };
+    class rhsusf_opscore_coy_cover_pelt: rhsusf_opscore_cover {
+        HEARING_PROTECTION_PELTOR;
+    };
+    class rhsusf_opscore_mar_01;
+    class rhsusf_opscore_mar_ut_pelt: rhsusf_opscore_mar_01 {
+        HEARING_PROTECTION_PELTOR;
+    };
+    class rhsusf_opscore_mar_fg_pelt: rhsusf_opscore_mar_01 {
+        HEARING_PROTECTION_PELTOR;
+    };
+
+    // ACH Helmets
+    class rhsusf_ach_helmet_ocp;
+    class rhsusf_ach_bare_des_headset: rhsusf_ach_helmet_ocp {
+        HEARING_PROTECTION_PELTOR;
+    };
+    class rhsusf_ach_bare_des_headset_ess: rhsusf_ach_helmet_ocp {
+        HEARING_PROTECTION_PELTOR;
+    };
+    class rhsusf_ach_bare_headset: rhsusf_ach_helmet_ocp {
+        HEARING_PROTECTION_PELTOR;
+    };
+    class rhsusf_ach_bare_headset_ess: rhsusf_ach_helmet_ocp {
+        HEARING_PROTECTION_PELTOR;
+    };
+    class rhsusf_ach_bare_semi_headset: rhsusf_ach_helmet_ocp {
+        HEARING_PROTECTION_PELTOR;
+    };
+    class rhsusf_ach_bare_semi_headset_ess: rhsusf_ach_helmet_ocp {
+        HEARING_PROTECTION_PELTOR;
+    };
+    class rhsusf_ach_bare_tan_headset: rhsusf_ach_helmet_ocp {
+        HEARING_PROTECTION_PELTOR;
+    };
+    class rhsusf_ach_bare_tan_headset_ess: rhsusf_ach_helmet_ocp {
+        HEARING_PROTECTION_PELTOR;
+    };
+    class rhsusf_ach_bare_wood_headset: rhsusf_ach_helmet_ocp {
+        HEARING_PROTECTION_PELTOR;
+    };
+    class rhsusf_ach_bare_wood_headset_ess: rhsusf_ach_helmet_ocp {
+        HEARING_PROTECTION_PELTOR;
+    };
+    class rhsusf_ach_helmet_headset_ocp: rhsusf_ach_helmet_ocp {
+        HEARING_PROTECTION_PELTOR;
+    };
+    class rhsusf_ach_helmet_headset_ess_ocp: rhsusf_ach_helmet_ocp {
+        HEARING_PROTECTION_PELTOR;
+    };
+
+    // ACVC Helmets
+    class rhsusf_cvc_helmet: rhsusf_opscore_01 {
+        HEARING_PROTECTION_VICCREW;
+    };
+
+    // MICH Helmets
+    class rhsusf_mich_bare;
+    class rhsusf_mich_bare_alt: rhsusf_mich_bare {
+        HEARING_PROTECTION_PELTOR;
+    };
+    class rhsusf_mich_bare_norotos;
+    class rhsusf_mich_bare_norotos_alt: rhsusf_mich_bare_norotos {
+        HEARING_PROTECTION_PELTOR;
+    };
+    class rhsusf_mich_bare_norotos_arc;
+    class rhsusf_mich_bare_norotos_arc_alt: rhsusf_mich_bare_norotos_arc {
+        HEARING_PROTECTION_PELTOR;
+    };
+    class rhsusf_mich_bare_semi;
+    class rhsusf_mich_bare_alt_semi: rhsusf_mich_bare_semi {
+        HEARING_PROTECTION_PELTOR;
+    };
+    class rhsusf_mich_bare_norotos_semi;
+    class rhsusf_mich_bare_norotos_alt_semi: rhsusf_mich_bare_norotos_semi {
+        HEARING_PROTECTION_PELTOR;
+    };
+    class rhsusf_mich_bare_norotos_arc_semi: rhsusf_mich_bare_norotos_alt_semi {
+        HEARING_PROTECTION_OPEN;
+    };
+    class rhsusf_mich_bare_norotos_arc_alt_semi: rhsusf_mich_bare_norotos_arc_semi {
+        HEARING_PROTECTION_PELTOR;
+    };
+    class rhsusf_mich_bare_tan;
+    class rhsusf_mich_bare_alt_tan: rhsusf_mich_bare_tan {
+        HEARING_PROTECTION_PELTOR;
+    };
+    class rhsusf_mich_bare_norotos_tan;
+    class rhsusf_mich_bare_norotos_alt_tan: rhsusf_mich_bare_norotos_tan {
+        HEARING_PROTECTION_PELTOR;
+    };
+    class rhsusf_mich_bare_norotos_arc_tan;
+    class rhsusf_mich_bare_norotos_arc_alt_tan: rhsusf_mich_bare_norotos_arc_tan {
+        HEARING_PROTECTION_PELTOR;
+    };
+
+    class rhsusf_hgu56p: rhsusf_opscore_01 {
+        HEARING_PROTECTION_VICCREW;
+    };
+    class rhsusf_ihadss: rhsusf_opscore_01 {
+        HEARING_PROTECTION_VICCREW;
+    };
+
+    class H_HelmetB;
+    class RHS_jetpilot_usaf: H_HelmetB {
+        HEARING_PROTECTION_VICCREW;
+    };
+};
diff --git a/addons/compat_rhs_usf3/compat_rhs_usf3_hearing/config.cpp b/addons/compat_rhs_usf3/compat_rhs_usf3_hearing/config.cpp
new file mode 100644
index 0000000000..e52454b184
--- /dev/null
+++ b/addons/compat_rhs_usf3/compat_rhs_usf3_hearing/config.cpp
@@ -0,0 +1,19 @@
+#include "script_component.hpp"
+#include "\z\ace\addons\hearing\script_macros_hearingProtection.hpp"
+
+class CfgPatches {
+    class SUBADDON {
+        addonRootClass = QUOTE(COMPONENT);
+        units[] = {};
+        weapons[] = {};
+        requiredVersion = REQUIRED_VERSION;
+        requiredAddons[] = {
+            "rhsusf_main_loadorder",
+            "ace_hearing"
+        };
+        skipWhenMissingDependencies = 1;
+        VERSION_CONFIG;
+    };
+};
+
+#include "CfgWeapons.hpp"
diff --git a/addons/compat_rhs_usf3/compat_rhs_usf3_hearing/script_component.hpp b/addons/compat_rhs_usf3/compat_rhs_usf3_hearing/script_component.hpp
new file mode 100644
index 0000000000..8edb825af3
--- /dev/null
+++ b/addons/compat_rhs_usf3/compat_rhs_usf3_hearing/script_component.hpp
@@ -0,0 +1,3 @@
+#define SUBCOMPONENT hearing
+#define SUBCOMPONENT_BEAUTIFIED Hearing
+#include "..\script_component.hpp"
diff --git a/addons/compat_rhs_usf3/compat_rhs_usf3_hellfire/CfgAmmo.hpp b/addons/compat_rhs_usf3/compat_rhs_usf3_hellfire/CfgAmmo.hpp
new file mode 100644
index 0000000000..16a0628d1f
--- /dev/null
+++ b/addons/compat_rhs_usf3/compat_rhs_usf3_hellfire/CfgAmmo.hpp
@@ -0,0 +1,8 @@
+class CfgAmmo {
+    // Use RHS Hellfire 3D Model on ACE Hellfires
+    class M_Scalpel_AT;
+    class ACE_Hellfire_AGM114K: M_Scalpel_AT {
+        model = "\rhsusf\addons\rhsusf_airweapons\proxyammo\rhsusf_m_AGM114K_fly";
+        proxyShape = "\rhsusf\addons\rhsusf_airweapons\proxyammo\rhsusf_m_AGM114K";
+    };
+};
diff --git a/addons/compat_rhs_usf3/compat_rhs_usf3_hellfire/CfgMagazineWells.hpp b/addons/compat_rhs_usf3/compat_rhs_usf3_hellfire/CfgMagazineWells.hpp
new file mode 100644
index 0000000000..e574b123a2
--- /dev/null
+++ b/addons/compat_rhs_usf3/compat_rhs_usf3_hellfire/CfgMagazineWells.hpp
@@ -0,0 +1,11 @@
+class CfgMagazineWells {
+    class ace_hellfire_K {
+        ADDON[] = {QGVAR(pylon_mag_2rnd_hellfire_k), QGVAR(pylon_mag_4rnd_hellfire_k)};
+    };
+    class ace_hellfire_N {
+        ADDON[] = {QGVAR(pylon_mag_2rnd_hellfire_n), QGVAR(pylon_mag_4rnd_hellfire_n)};
+    };
+    class ace_hellfire_L {
+        ADDON[] = {QGVAR(pylon_mag_2rnd_hellfire_l), QGVAR(pylon_mag_4rnd_hellfire_l)};
+    };
+};
diff --git a/addons/compat_rhs_usf3/compat_rhs_usf3_hellfire/CfgMagazines.hpp b/addons/compat_rhs_usf3/compat_rhs_usf3_hellfire/CfgMagazines.hpp
new file mode 100644
index 0000000000..9d96974ab8
--- /dev/null
+++ b/addons/compat_rhs_usf3/compat_rhs_usf3_hellfire/CfgMagazines.hpp
@@ -0,0 +1,37 @@
+class CfgMagazines {
+    // 2x ACE Hellfire racks
+    class rhs_mag_AGM114K_2;
+    class GVAR(pylon_mag_2rnd_hellfire_k): rhs_mag_AGM114K_2 {
+        displayName = "2x AGM-114K [ACE]";
+        pylonWeapon = "ace_hellfire_launcher";
+        ammo = "ACE_Hellfire_AGM114K";
+    };
+    class GVAR(pylon_mag_2rnd_hellfire_n): rhs_mag_AGM114K_2 {
+        displayName = "2x AGM-114N [ACE]";
+        pylonWeapon = "ace_hellfire_launcher_N";
+        ammo = "ACE_Hellfire_AGM114N";
+    };
+    class GVAR(pylon_mag_2rnd_hellfire_l): rhs_mag_AGM114K_2 {
+        displayName = "2x AGM-114L [ACE]";
+        pylonWeapon = "ace_hellfire_launcher_L";
+        ammo = "ACE_Hellfire_AGM114L";
+    };
+
+    // 4x ACE Hellfire racks that align better on RHS Apaches and Blackhawks than the standard ACE 4x racks
+    class rhs_mag_AGM114K_4;
+    class GVAR(pylon_mag_4rnd_hellfire_k): rhs_mag_AGM114K_4 {
+        displayName = "4x AGM-114K [ACE]";
+        pylonWeapon = "ace_hellfire_launcher";
+        ammo = "ACE_Hellfire_AGM114K";
+    };
+    class GVAR(pylon_mag_4rnd_hellfire_n): rhs_mag_AGM114K_4 {
+        displayName = "4x AGM-114N [ACE]";
+        pylonWeapon = "ace_hellfire_launcher_N";
+        ammo = "ACE_Hellfire_AGM114N";
+    };
+    class GVAR(pylon_mag_4rnd_hellfire_l): rhs_mag_AGM114K_4 {
+        displayName = "4x AGM-114L [ACE]";
+        pylonWeapon = "ace_hellfire_launcher_L";
+        ammo = "ACE_Hellfire_AGM114L";
+    };
+};
diff --git a/addons/compat_rhs_usf3/compat_rhs_usf3_hellfire/config.cpp b/addons/compat_rhs_usf3/compat_rhs_usf3_hellfire/config.cpp
new file mode 100644
index 0000000000..f460508a18
--- /dev/null
+++ b/addons/compat_rhs_usf3/compat_rhs_usf3_hellfire/config.cpp
@@ -0,0 +1,25 @@
+#include "script_component.hpp"
+
+class CfgPatches {
+    class SUBADDON {
+        name = COMPONENT_NAME;
+        units[] = {};
+        weapons[] = {};
+        requiredVersion = REQUIRED_VERSION;
+        requiredAddons[] = {
+            "rhsusf_main_loadorder",
+            "ace_hellfire"
+        };
+        skipWhenMissingDependencies = 1;
+        author = ECSTRING(common,ACETeam);
+        authors[] = {};
+        url = ECSTRING(main,URL);
+        VERSION_CONFIG;
+
+        addonRootClass = QUOTE(ADDON);
+    };
+};
+
+#include "CfgAmmo.hpp"
+#include "CfgMagazines.hpp"
+#include "CfgMagazineWells.hpp"
diff --git a/addons/compat_rhs_usf3/compat_rhs_usf3_hellfire/script_component.hpp b/addons/compat_rhs_usf3/compat_rhs_usf3_hellfire/script_component.hpp
new file mode 100644
index 0000000000..387de2d3ad
--- /dev/null
+++ b/addons/compat_rhs_usf3/compat_rhs_usf3_hellfire/script_component.hpp
@@ -0,0 +1,3 @@
+#define SUBCOMPONENT hellfire
+#define SUBCOMPONENT_BEAUTIFIED Hellfire
+#include "..\script_component.hpp"
diff --git a/addons/compat_rhs_usf3/compat_rhs_usf3_refuel/CfgVehicles.hpp b/addons/compat_rhs_usf3/compat_rhs_usf3_refuel/CfgVehicles.hpp
new file mode 100644
index 0000000000..445cab8226
--- /dev/null
+++ b/addons/compat_rhs_usf3/compat_rhs_usf3_refuel/CfgVehicles.hpp
@@ -0,0 +1,52 @@
+class CfgVehicles {
+    class rhsusf_stryker_base;
+    class rhsusf_stryker_m1126_base: rhsusf_stryker_base {
+        class EGVAR(interaction,anims) {
+            class Hide_FCans {
+                positions[] = {{-0.7, -3, -0.4}};
+                items[] = {"Land_CanisterFuel_F", "Land_CanisterFuel_F"};
+                name = ECSTRING(refuel,TakeFuelCanister);
+                text = ECSTRING(refuel,TakeFuelCanisterAction);
+            };
+        };
+    };
+    class rhsusf_stryker_m1127_base: rhsusf_stryker_m1126_base {
+        class EGVAR(interaction,anims): EGVAR(interaction,anims) {
+            class Hide_FCans: Hide_FCans {
+                positions[] = {{-0.5, -3, -0.4}};
+            };
+        };
+    };
+
+    class rhsusf_stryker_m1126_m2_base: rhsusf_stryker_m1126_base {};
+    class rhsusf_stryker_m1132_m2_base: rhsusf_stryker_m1126_m2_base {
+        class EGVAR(interaction,anims): EGVAR(interaction,anims) {
+            class Hide_FCans: Hide_FCans {
+                positions[] = {{-1, -4, -0.4}};
+            };
+        };
+    };
+    class rhsusf_stryker_m1134_base: rhsusf_stryker_m1132_m2_base {
+        class EGVAR(interaction,anims): EGVAR(interaction,anims) {
+            class Hide_FCans: Hide_FCans {
+                positions[] = {{-0.7, -3, -0.7}};
+            };
+        };
+    };
+
+    class rhsusf_m1a2tank_base;
+    class rhsusf_m1a2sep2_base: rhsusf_m1a2tank_base {
+        class EGVAR(interaction,anims) {
+            class fuelcans_hide {
+                // Rotate interactions with turret rotation
+                positions[] = {
+                    "[0.23, -0.6, 0] vectorAdd ([[1.1, -3.6, 0.6], [0, 0, 1], deg (_target animationPhase 'MainTurret')] call CBA_fnc_vectRotate3D)",
+                    "[0.23, -0.6, 0] vectorAdd ([[-1.1, -3.6, 0.6], [0, 0, 1], deg (_target animationPhase 'MainTurret')] call CBA_fnc_vectRotate3D)"
+                };
+                items[] = {"Land_CanisterFuel_F", "Land_CanisterFuel_F"};
+                name = ECSTRING(refuel,TakeFuelCanister);
+                text = ECSTRING(refuel,TakeFuelCanisterAction);
+            };
+        };
+    };
+};
diff --git a/addons/compat_rhs_usf3/compat_rhs_usf3_refuel/config.cpp b/addons/compat_rhs_usf3/compat_rhs_usf3_refuel/config.cpp
index bf600d5d5a..391e22d95e 100644
--- a/addons/compat_rhs_usf3/compat_rhs_usf3_refuel/config.cpp
+++ b/addons/compat_rhs_usf3/compat_rhs_usf3_refuel/config.cpp
@@ -21,3 +21,4 @@ class CfgPatches {
 };
 
 #include "CfgEventHandlers.hpp"
+#include "CfgVehicles.hpp"
diff --git a/addons/compat_rhs_usf3/compat_rhs_usf3_repair/CfgVehicles.hpp b/addons/compat_rhs_usf3/compat_rhs_usf3_repair/CfgVehicles.hpp
new file mode 100644
index 0000000000..26341db1da
--- /dev/null
+++ b/addons/compat_rhs_usf3/compat_rhs_usf3_repair/CfgVehicles.hpp
@@ -0,0 +1,126 @@
+class CfgVehicles {
+    class Truck_01_base_F;
+    class rhsusf_fmtv_base: Truck_01_base_F {
+        class EGVAR(interaction,anims) {
+            class hide_spare {
+                positions[] = {{1, 1.4, 0}};
+                items[] = {"ACE_Wheel"};
+                name = ECSTRING(repair,RemoveWheel);
+                text = ECSTRING(repair,RemovingWheel);
+            };
+        };
+    };
+    class rhsusf_M1078A1P2_fmtv_usarmy: rhsusf_fmtv_base {};
+    class rhsusf_M1078A1P2_B_fmtv_usarmy: rhsusf_M1078A1P2_fmtv_usarmy {};
+    class rhsusf_M1078A1P2_B_M2_fmtv_usarmy: rhsusf_M1078A1P2_B_fmtv_usarmy {
+        class EGVAR(interaction,anims): EGVAR(interaction,anims) {
+            class hide_spare: hide_spare {
+                positions[] = {{1, 1.4, -0.5}};
+            };
+        };
+    };
+    class rhsusf_M1078A1R_SOV_M2_D_fmtv_socom: rhsusf_M1078A1P2_B_M2_fmtv_usarmy {
+        class EGVAR(interaction,anims): EGVAR(interaction,anims) {
+            class hide_spare: hide_spare {
+                positions[] = {{1, 1, -0.5}};
+            };
+        };
+    };
+    class rhsusf_M1083A1P2_fmtv_usarmy: rhsusf_M1078A1P2_fmtv_usarmy {};
+    class rhsusf_M1083A1P2_B_fmtv_usarmy: rhsusf_M1083A1P2_fmtv_usarmy {};
+    class rhsusf_M1083A1P2_B_M2_fmtv_usarmy: rhsusf_M1083A1P2_B_fmtv_usarmy {
+        class EGVAR(interaction,anims): EGVAR(interaction,anims) {
+            class hide_spare: hide_spare {
+                positions[] = {{1, 1.4, -0.5}};
+            };
+        };
+    };
+    class rhsusf_M1084A1P2_fmtv_usarmy: rhsusf_M1083A1P2_fmtv_usarmy {
+        class EGVAR(interaction,anims): EGVAR(interaction,anims) {
+            class hide_spare: hide_spare {
+                positions[] = {{1, 1.8, 0}};
+            };
+        };
+    };
+    class rhsusf_M1084A1P2_B_M2_fmtv_usarmy: rhsusf_M1083A1P2_B_M2_fmtv_usarmy {
+        class EGVAR(interaction,anims): EGVAR(interaction,anims) {
+            class hide_spare: hide_spare {
+                positions[] = {{1, 1.8, -0.5}};
+            };
+        };
+    };
+    class rhsusf_M1085A1P2_B_Medical_fmtv_usarmy: rhsusf_M1083A1P2_B_fmtv_usarmy {
+        class EGVAR(interaction,anims): EGVAR(interaction,anims) {
+            class hide_spare: hide_spare {
+                positions[] = {{1, 6.1, 0}};
+            };
+        };
+    };
+
+    class rhsusf_HEMTT_A4_base: Truck_01_base_F {
+        class EGVAR(interaction,anims) {
+            class hide_spare {
+                positions[] = {"_target selectionPosition 'sparewheel' vectorAdd [0.6, 0.6, -0.4]"};
+                items[] = {"ACE_Wheel"};
+                name = ECSTRING(repair,RemoveWheel);
+                text = ECSTRING(repair,RemovingWheel);
+            };
+        };
+    };
+
+    class MRAP_01_base_F;
+    class rhsusf_m1151_base: MRAP_01_base_F {
+        class EGVAR(interaction,anims) {
+            class hide_spare {
+                positions[] = {"_target selectionPosition 'sparewheel' vectorAdd [-0.465, 0, 0]"};
+                items[] = {"ACE_Wheel"};
+                name = ECSTRING(repair,RemoveWheel);
+                text = ECSTRING(repair,RemovingWheel);
+            };
+        };
+    };
+    // Don't inherit, as it's easier for the trenches compat
+    class rhsusf_M1165A1_GMV_SAG2_base: rhsusf_m1151_base {
+        class EGVAR(interaction,anims) {
+            class hide_spare {
+                positions[] = {"_target selectionPosition 'sparewheel_gmv' vectorAdd [0, -0.44, 0]"};
+                items[] = {"ACE_Wheel"};
+                name = ECSTRING(repair,RemoveWheel);
+                text = ECSTRING(repair,RemovingWheel);
+            };
+        };
+    };
+
+    class rhsusf_rg33_base: MRAP_01_base_F {
+        class EGVAR(interaction,anims) {
+            class hide_spare {
+                selections[] = {"sparewheel"};
+                items[] = {"ACE_Wheel"};
+                name = ECSTRING(repair,RemoveWheel);
+                text = ECSTRING(repair,RemovingWheel);
+            };
+        };
+    };
+
+    class rhsusf_M1239_base: MRAP_01_base_F {
+        class EGVAR(interaction,anims) {
+            class hide_spare {
+                selections[] = {"sparewheel"};
+                items[] = {"ACE_Wheel"};
+                name = ECSTRING(repair,RemoveWheel);
+                text = ECSTRING(repair,RemovingWheel);
+            };
+        };
+    };
+
+    class rhsusf_MATV_base: MRAP_01_base_F {
+        class EGVAR(interaction,anims) {
+            class hide_spare {
+                selections[] = {"sparewheel"};
+                items[] = {"ACE_Wheel"};
+                name = ECSTRING(repair,RemoveWheel);
+                text = ECSTRING(repair,RemovingWheel);
+            };
+        };
+    };
+};
diff --git a/addons/compat_rhs_usf3/compat_rhs_usf3_repair/config.cpp b/addons/compat_rhs_usf3/compat_rhs_usf3_repair/config.cpp
new file mode 100644
index 0000000000..b204f64166
--- /dev/null
+++ b/addons/compat_rhs_usf3/compat_rhs_usf3_repair/config.cpp
@@ -0,0 +1,23 @@
+#include "script_component.hpp"
+
+class CfgPatches {
+    class SUBADDON {
+        name = COMPONENT_NAME;
+        units[] = {};
+        weapons[] = {};
+        requiredVersion = REQUIRED_VERSION;
+        requiredAddons[] = {
+            "rhsusf_main_loadorder",
+            "ace_repair"
+        };
+        skipWhenMissingDependencies = 1;
+        author = ECSTRING(common,ACETeam);
+        authors[] = {"johnb43"};
+        url = ECSTRING(main,URL);
+        VERSION_CONFIG;
+
+        addonRootClass = QUOTE(ADDON);
+    };
+};
+
+#include "CfgVehicles.hpp"
diff --git a/addons/compat_rhs_usf3/compat_rhs_usf3_repair/script_component.hpp b/addons/compat_rhs_usf3/compat_rhs_usf3_repair/script_component.hpp
new file mode 100644
index 0000000000..1af928486c
--- /dev/null
+++ b/addons/compat_rhs_usf3/compat_rhs_usf3_repair/script_component.hpp
@@ -0,0 +1,3 @@
+#define SUBCOMPONENT repair
+#define SUBCOMPONENT_BEAUTIFIED Repair
+#include "..\script_component.hpp"
diff --git a/addons/compat_rhs_usf3/compat_rhs_usf3_trenches/CfgVehicles.hpp b/addons/compat_rhs_usf3/compat_rhs_usf3_trenches/CfgVehicles.hpp
new file mode 100644
index 0000000000..ba4dd16cd7
--- /dev/null
+++ b/addons/compat_rhs_usf3/compat_rhs_usf3_trenches/CfgVehicles.hpp
@@ -0,0 +1,48 @@
+class CfgVehicles {
+    class rhsusf_stryker_base;
+    class rhsusf_stryker_m1126_base: rhsusf_stryker_base {
+        class EGVAR(interaction,anims) {
+            class Hide_PioKit {
+                positions[] = {{-1, -2.2, -0.5}};
+                items[] = {"ACE_EntrenchingTool"};
+                name = ECSTRING(trenches,EntrenchingToolName);
+                text = ECSTRING(trenches,EntrenchingToolName);
+            };
+        };
+    };
+    class rhsusf_stryker_m1127_base: rhsusf_stryker_m1126_base {
+        class EGVAR(interaction,anims): EGVAR(interaction,anims) {
+            class Hide_PioKit: Hide_PioKit {
+                positions[] = {{-0.8, -2.2, -0.5}};
+            };
+        };
+    };
+
+    class rhsusf_stryker_m1126_m2_base: rhsusf_stryker_m1126_base {};
+    class rhsusf_stryker_m1132_m2_base: rhsusf_stryker_m1126_m2_base {
+        class EGVAR(interaction,anims): EGVAR(interaction,anims) {
+            class Hide_PioKit: Hide_PioKit {
+                positions[] = {{-1.3, -3.3, -0.5}};
+            };
+        };
+    };
+    class rhsusf_stryker_m1134_base: rhsusf_stryker_m1132_m2_base {
+        class EGVAR(interaction,anims): EGVAR(interaction,anims) {
+            class Hide_PioKit: Hide_PioKit {
+                positions[] = {{-1, -2.2, -0.8}};
+            };
+        };
+    };
+
+    class rhsusf_m1151_base;
+    class rhsusf_M1165A1_GMV_SAG2_base: rhsusf_m1151_base {
+        class EGVAR(interaction,anims) {
+            class tools_hide {
+                positions[] = {{0.365, 1.5, -0.4}};
+                items[] = {"ACE_EntrenchingTool"};
+                name = ECSTRING(trenches,EntrenchingToolName);
+                text = ECSTRING(trenches,EntrenchingToolName);
+            };
+        };
+    };
+};
diff --git a/addons/compat_rhs_usf3/compat_rhs_usf3_trenches/config.cpp b/addons/compat_rhs_usf3/compat_rhs_usf3_trenches/config.cpp
new file mode 100644
index 0000000000..aea4c9daeb
--- /dev/null
+++ b/addons/compat_rhs_usf3/compat_rhs_usf3_trenches/config.cpp
@@ -0,0 +1,23 @@
+#include "script_component.hpp"
+
+class CfgPatches {
+    class SUBADDON {
+        name = COMPONENT_NAME;
+        units[] = {};
+        weapons[] = {};
+        requiredVersion = REQUIRED_VERSION;
+        requiredAddons[] = {
+            "rhsusf_main_loadorder",
+            "ace_trenches"
+        };
+        skipWhenMissingDependencies = 1;
+        author = ECSTRING(common,ACETeam);
+        authors[] = {"johnb43"};
+        url = ECSTRING(main,URL);
+        VERSION_CONFIG;
+
+        addonRootClass = QUOTE(ADDON);
+    };
+};
+
+#include "CfgVehicles.hpp"
diff --git a/addons/compat_rhs_usf3/compat_rhs_usf3_trenches/script_component.hpp b/addons/compat_rhs_usf3/compat_rhs_usf3_trenches/script_component.hpp
new file mode 100644
index 0000000000..10b90eb71e
--- /dev/null
+++ b/addons/compat_rhs_usf3/compat_rhs_usf3_trenches/script_component.hpp
@@ -0,0 +1,3 @@
+#define SUBCOMPONENT trenches
+#define SUBCOMPONENT_BEAUTIFIED Trenches
+#include "..\script_component.hpp"
diff --git a/addons/compat_rhs_usf3/config.cpp b/addons/compat_rhs_usf3/config.cpp
index 1e67b1e007..b28a08b22e 100644
--- a/addons/compat_rhs_usf3/config.cpp
+++ b/addons/compat_rhs_usf3/config.cpp
@@ -1,5 +1,4 @@
 #include "script_component.hpp"
-#include "\z\ace\addons\hearing\script_macros_hearingProtection.hpp"
 
 class CfgPatches {
     class ADDON {
@@ -7,7 +6,7 @@ class CfgPatches {
         units[] = {};
         weapons[] = {};
         requiredVersion = REQUIRED_VERSION;
-        requiredAddons[] = {"rhsusf_main_loadorder"};
+        requiredAddons[] = {"ace_common", "rhsusf_main_loadorder"};
         skipWhenMissingDependencies = 1;
         author = ECSTRING(common,ACETeam);
         authors[] = {"Ruthberg", "GitHawk", "BaerMitUmlaut", "Fyuran"};
@@ -19,7 +18,6 @@ class CfgPatches {
 #include "CfgAmmo.hpp"
 #include "CfgEventHandlers.hpp"
 #include "CfgMagazines.hpp"
-#include "CfgMagazineWells.hpp"
 #include "CfgWeapons.hpp"
 #include "CfgVehicles.hpp"
 #include "CfgGlasses.hpp"
diff --git a/addons/compat_sog/functions/fnc_handlePunjiTrapTrigger.sqf b/addons/compat_sog/functions/fnc_handlePunjiTrapTrigger.sqf
index d2e9abdbbc..7cac6829c5 100644
--- a/addons/compat_sog/functions/fnc_handlePunjiTrapTrigger.sqf
+++ b/addons/compat_sog/functions/fnc_handlePunjiTrapTrigger.sqf
@@ -14,8 +14,10 @@
  *
  * Public: No
  */
+
 params ["_trap"];
-if (!(["ace_medical"] call EFUNC(common,isModLoaded))) exitWith {};
+
+if !(GETEGVAR(medical,enabled,false)) exitWith {};
 
 private _radius = getNumber (configOf _trap >> "indirectHitRange");
 private _affectedUnits = _trap nearEntities ["CAManBase", _radius];
diff --git a/addons/compat_spe/compat_spe_explosives/CfgMagazines.hpp b/addons/compat_spe/compat_spe_explosives/CfgMagazines.hpp
index 7c1945fcb8..27c0ff68aa 100644
--- a/addons/compat_spe/compat_spe_explosives/CfgMagazines.hpp
+++ b/addons/compat_spe/compat_spe_explosives/CfgMagazines.hpp
@@ -1,7 +1,6 @@
 class CfgMagazines {
     class SPE_Mine_Magazine;
     class SPE_US_TNT_4pound_mag: SPE_Mine_Magazine {
-        EGVAR(explosives,DelayTime) = 1;
         EGVAR(explosives,Placeable) = 1;
         EGVAR(explosives,SetupObject) = QEXPLOSIVES_PLACE(4LBTNT);
         useAction = 0;
@@ -19,7 +18,6 @@ class CfgMagazines {
     };
 
     class SPE_US_TNT_half_pound_mag: SPE_Mine_Magazine {
-        EGVAR(explosives,DelayTime) = 1;
         EGVAR(explosives,Placeable) = 1;
         EGVAR(explosives,SetupObject) = QEXPLOSIVES_PLACE(halfLBTNT);
         useAction = 0;
@@ -37,7 +35,6 @@ class CfgMagazines {
     };
 
     class SPE_US_Bangalore_mag: SPE_Mine_Magazine {
-        EGVAR(explosives,DelayTime) = 1;
         EGVAR(explosives,Placeable) = 1;
         EGVAR(explosives,SetupObject) = QEXPLOSIVES_PLACE(bangalore);
         useAction = 0;
@@ -55,7 +52,6 @@ class CfgMagazines {
     };
 
     class SPE_Ladung_Small_MINE_mag: SPE_Mine_Magazine {
-        EGVAR(explosives,DelayTime) = 1;
         EGVAR(explosives,Placeable) = 1;
         EGVAR(explosives,SetupObject) = QEXPLOSIVES_PLACE(smallLadung);
         useAction = 0;
@@ -73,7 +69,6 @@ class CfgMagazines {
     };
 
     class SPE_Ladung_Big_MINE_mag: SPE_Mine_Magazine {
-        EGVAR(explosives,DelayTime) = 1;
         EGVAR(explosives,Placeable) = 1;
         EGVAR(explosives,SetupObject) = QEXPLOSIVES_PLACE(bigLadung);
         useAction = 0;
diff --git a/addons/compat_ws/compat_ws_realisticnames/stringtable.xml b/addons/compat_ws/compat_ws_realisticnames/stringtable.xml
index 26504b497f..606bbb7932 100644
--- a/addons/compat_ws/compat_ws_realisticnames/stringtable.xml
+++ b/addons/compat_ws/compat_ws_realisticnames/stringtable.xml
@@ -26,7 +26,7 @@
             <Korean>AA-12 (뱀 위장)</Korean>
             <German>AA12 (Schlange)</German>
             <Italian>AA12 (Serpe)</Italian>
-            <Japanese>AA12 (ヘビ柄)</Japanese>
+            <Japanese>AA12 (ヘビ柄迷彩)</Japanese>
             <Russian>AA12 (Змея)</Russian>
             <Spanish>AA12 (Serpiente)</Spanish>
         </Key>
@@ -45,7 +45,7 @@
             <Korean>갈릴 ARM (낡음)</Korean>
             <German>Galil ARM (Alt)</German>
             <Italian>Galil ARM (Vecchio)</Italian>
-            <Japanese>ガリル ARM (使い古し)</Japanese>
+            <Japanese>ガリル ARM (古びた)</Japanese>
             <Russian>Galil ARM (Старый)</Russian>
             <French>Galil ARM (Ancien)</French>
             <Spanish>Galil ARM (Vieja)</Spanish>
@@ -65,7 +65,7 @@
             <Korean>GLX-160 (뱀 위장)</Korean>
             <German>GLX 160 (Schlange)</German>
             <Italian>GLX-160 (Serpe)</Italian>
-            <Japanese>GLX 160 (ヘビ柄)</Japanese>
+            <Japanese>GLX 160 (ヘビ柄迷彩)</Japanese>
             <Russian>GLX 160 (Змея)</Russian>
             <Spanish>GLX 160 (Serpiente)</Spanish>
         </Key>
@@ -94,7 +94,7 @@
             <Korean>GLX-160 (위장)</Korean>
             <German>GLX 160 (Tarn)</German>
             <Italian>GLX-160 (Mimetica)</Italian>
-            <Japanese>GLX 160 (迷彩)</Japanese>
+            <Japanese>GLX 160 (AAF迷彩)</Japanese>
             <Russian>GLX 160 (Камуфляж)</Russian>
             <French>GLX 160 (Camo)</French>
             <Spanish>GLX 160 (Camo)</Spanish>
@@ -124,7 +124,7 @@
             <Korean>Mk.14 Mod 1 EBR (뱀 위장)</Korean>
             <German>Mk14 Mod 1 EBR (Schlange)</German>
             <Italian>Mk14 Mod 1 EBR (Serpe)</Italian>
-            <Japanese>Mk14 Mod 1 EBR (ヘビ柄)</Japanese>
+            <Japanese>Mk14 Mod 1 EBR (ヘビ柄迷彩)</Japanese>
             <Russian>Mk14 Mod 1 EBR (Змея)</Russian>
             <Spanish>Mk14 Mod 1 EBR (Serpiente)</Spanish>
         </Key>
@@ -142,7 +142,7 @@
             <Korean>벡터 SS-77 (위장)</Korean>
             <German>Vektor SS-77 (Tarn)</German>
             <Italian>Vektor SS-77 (Mimetica)</Italian>
-            <Japanese>ヴェクター SS-77 (迷彩)</Japanese>
+            <Japanese>ヴェクター SS-77 (AAF迷彩)</Japanese>
             <Russian>Vektor SS-77 (Камуфляж)</Russian>
             <French>Vektor SS-77 (Camo)</French>
             <Spanish>Vektor SS-77 (Camo)</Spanish>
@@ -192,7 +192,7 @@
             <Korean>벡터 SS-77 단축형 (뱀 위장)</Korean>
             <German>Vektor SS-77 Compact (Schlange)</German>
             <Italian>Vektor SS-77 Compatto (Serpe)</Italian>
-            <Japanese>ヴェクター SS-77 コンパクト (ヘビ柄)</Japanese>
+            <Japanese>ヴェクター SS-77 コンパクト (ヘビ柄迷彩)</Japanese>
             <Russian>Vektor SS-77 Compact (змея)</Russian>
             <Spanish>Vektor SS-77 Compacta (Serpiente)</Spanish>
         </Key>
@@ -201,7 +201,7 @@
             <Korean>FN FAL 50.00 (목재)</Korean>
             <German>FN FAL 50.00 (Holz)</German>
             <Italian>FN FAL 50.00 (Legno)</Italian>
-            <Japanese>FN FAL 50.00 (森林迷彩)</Japanese>
+            <Japanese>FN FAL 50.00 (木製)</Japanese>
             <Russian>FN FAL 50.00 (лесной)</Russian>
             <French>FN FAL 50.00 (Bois)</French>
             <Spanish>FN FAL 50.00 (Madera)</Spanish>
@@ -211,7 +211,7 @@
             <Korean>FN FAL 50.00 GL (목재)</Korean>
             <German>FN FAL 50.00 GL (Holz)</German>
             <Italian>FN FAL 50.00 GL (Legno)</Italian>
-            <Japanese>FN FAL 50.00 GL (森林迷彩)</Japanese>
+            <Japanese>FN FAL 50.00 GL (木製)</Japanese>
             <Russian>FN FAL 50.00 GL (лесной)</Russian>
             <French>FN FAL 50.00 GL (Bois)</French>
             <Spanish>FN FAL 50.00 GL (Madera)</Spanish>
@@ -257,17 +257,25 @@
             <Spanish>FN FAL 50.00 (Jungla)</Spanish>
         </Key>
         <Key ID="STR_ACE_Compat_WS_RealisticNames_SLR_Para_Name">
-            <English>FN FAL 50.00 Para</English>
+            <English>FN FAL OSW Para</English>
+            <Japanese>FN FAL OSW パラ</Japanese>
+            <Korean>FN FAL OSW 파라</Korean>
+            <German>FN FAL OSW Fallschirmjäger</German>
+            <Italian>FN FAL OSW Para</Italian>
         </Key>
         <Key ID="STR_ACE_Compat_WS_RealisticNames_SLR_Para_Snake_Name">
-            <English>FN FAL 50.00 Para (Snake)</English>
+            <English>FN FAL OSW Para (Snake)</English>
+            <Japanese>FN FAL OSW パラ (ヘビ柄迷彩)</Japanese>
+            <Korean>FN FAL OSW 파라 (뱀 위장)</Korean>
+            <German>FN FAL OSW Fallschirmjäger (Schlange)</German>
+            <Italian>FN FAL OSW Para (Serpe)</Italian>
         </Key>
         <Key ID="STR_ACE_Compat_WS_RealisticNames_Velko_R4_Name">
             <English>Vektor R4</English>
             <Korean>벡터 R4</Korean>
             <German>Vektor R4</German>
             <Italian>Vektor R4</Italian>
-            <Japanese>ヴェクター R5</Japanese>
+            <Japanese>ヴェクター R4</Japanese>
             <Russian>Vektor R4</Russian>
             <French>Vektor R4</French>
             <Spanish>Vektor R4</Spanish>
@@ -297,7 +305,7 @@
             <Korean>벡터 R5 카빈 (뱀 위장)</Korean>
             <German>Vektor R5 Carbine (Schlange)</German>
             <Italian>Vektor R5 Carabina (Serpe)</Italian>
-            <Japanese>ヴェクター R5 カービン (ヘビ柄)</Japanese>
+            <Japanese>ヴェクター R5 カービン (ヘビ柄迷彩)</Japanese>
             <Russian>Vektor R5 Carbine (Змея)</Russian>
             <Spanish>Vektor R5 Carabina (Serpiente)</Spanish>
         </Key>
@@ -306,7 +314,7 @@
             <Korean>벡터 R5 카빈 GL (뱀 위장)</Korean>
             <German>Vektor R5 Carbine GL (Schlange)</German>
             <Italian>Vektor R5 Carabina GL (Serpe)</Italian>
-            <Japanese>ヴェクター R5 カービン GL (ヘビ柄)</Japanese>
+            <Japanese>ヴェクター R5 カービン GL (ヘビ柄迷彩)</Japanese>
             <Russian>Vektor R5 Carbine GL (Змея)</Russian>
             <Spanish>Vektor R5 Carabina GL (Serpiente)</Spanish>
         </Key>
@@ -456,117 +464,269 @@
         </Key>
         <Key ID="STR_ACE_Compat_WS_RealisticNames_gm6_snake_Name">
             <English>GM6 Lynx (Snake)</English>
+            <Japanese>GM6 リンクス (ヘビ柄迷彩)</Japanese>
+            <Korean>GM6 링스 (뱀 위장)</Korean>
+            <German>GM6 Lynx (Schlange)</German>
+            <Italian>GM6 Lynx (Serpe)</Italian>
         </Key>
         <Key ID="STR_ACE_Compat_WS_RealisticNames_rpg32_tan_Name">
             <English>RPG-32 (Sand)</English>
+            <Japanese>RPG-32 (サンド)</Japanese>
+            <Korean>RPG-32 (모래)</Korean>
+            <German>RPG-32 (Sand)</German>
+            <Italian>RPG-32 (Sabbia)</Italian>
         </Key>
         <Key ID="STR_ACE_Compat_WS_RealisticNames_arco_hex_Name">
             <English>ELCAN SpecterOS (Hex)</English>
+            <Japanese>ELCAN SpecterOS (六角形迷彩)</Japanese>
+            <Korean>엘칸 스펙터OS (육각)</Korean>
+            <German>ELCAN SpecterOS (Hex)</German>
+            <Italian>ELCAN SpecterOS (Hex)</Italian>
         </Key>
         <Key ID="STR_ACE_Compat_WS_RealisticNames_holosight_snake_Name">
             <English>EOTech XPS3 (Snake)</English>
+            <Japanese>EOTech XPS3 (ヘビ柄迷彩)</Japanese>
+            <Korean>이오텍 XPS3 (뱀 위장)</Korean>
+            <German>EOTech XPS3 (Schlange)</German>
+            <Italian>EOTech XPS3 (Serpe)</Italian>
         </Key>
         <Key ID="STR_ACE_Compat_WS_RealisticNames_holosight_snake_smg_Name">
             <English>EOTech XPS3 SMG (Snake)</English>
+            <Japanese>EOTech XPS3 SMG (ヘビ柄迷彩)</Japanese>
+            <Korean>이오텍 XPS3 SMG (뱀 위장)</Korean>
+            <German>EOTech XPS3 SMG (Schlange)</German>
+            <Italian>EOTech XPS3 SMG (Serpe)</Italian>
         </Key>
         <Key ID="STR_ACE_Compat_WS_RealisticNames_hamr_arid_Name">
             <English>Leupold Mark 4 HAMR (Arid)</English>
+            <Japanese>Leupold Mark 4 HAMR (乾燥地帯迷彩)</Japanese>
+            <Korean>류폴드 마크 4 HAMR (건조)</Korean>
+            <German>Leupold Mark 4 HAMR (Trocken)</German>
+            <Italian>Leupold Mark 4 HAMR (Arido)</Italian>
         </Key>
         <Key ID="STR_ACE_Compat_WS_RealisticNames_hamr_lush_Name">
             <English>Leupold Mark 4 HAMR (Lush)</English>
+            <Japanese>Leupold Mark 4 HAMR (緑地迷彩)</Japanese>
+            <Korean>류폴드 마크 4 HAMR (초목)</Korean>
+            <German>Leupold Mark 4 HAMR (Grün)</German>
+            <Italian>Leupold Mark 4 HAMR (Verdeggiante)</Italian>
         </Key>
         <Key ID="STR_ACE_Compat_WS_RealisticNames_hamr_sand_Name">
             <English>Leupold Mark 4 HAMR (Sand)</English>
+            <Japanese>Leupold Mark 4 HAMR (サンド)</Japanese>
+            <Korean>류폴드 마크 4 HAMR (모래)</Korean>
+            <German>Leupold Mark 4 HAMR (Sand)</German>
+            <Italian>Leupold Mark 4 HAMR (Sabbia)</Italian>
         </Key>
         <Key ID="STR_ACE_Compat_WS_RealisticNames_hamr_snake_Name">
             <English>Leupold Mark 4 HAMR (Snake)</English>
+            <Japanese>Leupold Mark 4 HAMR (ヘビ柄迷彩)</Japanese>
+            <Korean>류폴드 마크 4 HAMR (뱀 위장)</Korean>
+            <German>Leupold Mark 4 HAMR (Schlange)</German>
+            <Italian>Leupold Mark 4 HAMR (Serpe)</Italian>
         </Key>
         <Key ID="STR_ACE_Compat_WS_RealisticNames_r1_high_black_Name">
             <English>Aimpoint Micro R-1 (High, Black)</English>
+            <Japanese>Aimpoint マイクロ R-1 (ハイマウント、ブラック)</Japanese>
+            <Korean>에임포인트 마이크로 R-1 (높음, 검정)</Korean>
+            <German>Aimpoint Micro R-1 (Hoch, Schwarz)</German>
+            <Italian>Aimpoint Micro R-1 (Alto, Nero)</Italian>
         </Key>
         <Key ID="STR_ACE_Compat_WS_RealisticNames_r1_high_khaki_Name">
             <English>Aimpoint Micro R-1 (High, Khaki)</English>
+            <Japanese>Aimpoint マイクロ R-1 (ハイマウント、カーキ)</Japanese>
+            <Korean>에임포인트 마이크로 R-1 (높음, 카키)</Korean>
+            <German>Aimpoint Micro R-1 (Hoch, Khaki)</German>
+            <Italian>Aimpoint Micro R-1 (Alto, Cachi)</Italian>
         </Key>
         <Key ID="STR_ACE_Compat_WS_RealisticNames_r1_high_sand_Name">
             <English>Aimpoint Micro R-1 (High, Sand)</English>
+            <Japanese>Aimpoint マイクロ R-1 (ハイマウント、サンド)</Japanese>
+            <Korean>에임포인트 마이크로 R-1 (높음, 모래)</Korean>
+            <German>Aimpoint Micro R-1 (Hoch, Sand)</German>
+            <Italian>Aimpoint Micro R-1 (Alto, Sabbia)</Italian>
         </Key>
         <Key ID="STR_ACE_Compat_WS_RealisticNames_r1_high_snake_Name">
             <English>Aimpoint Micro R-1 (High, Snake)</English>
+            <Japanese>Aimpoint マイクロ R-1 (ハイマウント、ヘビ柄迷彩)</Japanese>
+            <Korean>에임포인트 마이크로 R-1 (높음, 뱀 위장)</Korean>
+            <German>Aimpoint Micro R-1 (Hoch, Schlange)</German>
+            <Italian>Aimpoint Micro R-1 (Alto, Serpe)</Italian>
         </Key>
         <Key ID="STR_ACE_Compat_WS_RealisticNames_r1_high_arid_Name">
             <English>Aimpoint Micro R-1 (High, Arid)</English>
+            <Japanese>Aimpoint マイクロ R-1 (ハイマウント、乾燥地帯迷彩)</Japanese>
+            <Korean>에임포인트 마이크로 R-1 (높음, 건조)</Korean>
+            <German>Aimpoint Micro R-1 (Hoch, Trocken)</German>
+            <Italian>Aimpoint Micro R-1 (Alto, Arido)</Italian>
         </Key>
         <Key ID="STR_ACE_Compat_WS_RealisticNames_r1_high_lush_Name">
             <English>Aimpoint Micro R-1 (High, Lush)</English>
+            <Japanese>Aimpoint マイクロ R-1 (ハイマウント、緑地迷彩)</Japanese>
+            <Korean>에임포인트 마이크로 R-1 (높음, 초목)</Korean>
+            <German>Aimpoint Micro R-1 (Hoch, Grün)</German>
+            <Italian>Aimpoint Micro R-1 (Alto, Verdeggiante)</Italian>
         </Key>
         <Key ID="STR_ACE_Compat_WS_RealisticNames_r1_high_black_sand_Name">
             <English>Aimpoint Micro R-1 (High, Black/Sand)</English>
+            <Japanese>Aimpoint マイクロ R-1 (ハイマウント、ブラック/サンド)</Japanese>
+            <Korean>에임포인트 마이크로 R-1 (높음, 검정/모래)</Korean>
+            <German>Aimpoint Micro R-1 (Hoch, Schwarz/Sand)</German>
+            <Italian>Aimpoint Micro R-1 (Alto, Nero/Sabbia)</Italian>
         </Key>
         <Key ID="STR_ACE_Compat_WS_RealisticNames_r1_low_black_Name">
             <English>Aimpoint Micro R-1 (Low, Black)</English>
+            <Japanese>Aimpoint マイクロ R-1 (ローマウント、ブラック)</Japanese>
+            <Korean>에임포인트 마이크로 R-1 (낮음, 검정)</Korean>
+            <German>Aimpoint Micro R-1 (Tief, Schwarz)</German>
+            <Italian>Aimpoint Micro R-1 (Basso, Nero)</Italian>
         </Key>
         <Key ID="STR_ACE_Compat_WS_RealisticNames_r1_low_khaki_Name">
             <English>Aimpoint Micro R-1 (Low, Khaki)</English>
+            <Japanese>Aimpoint マイクロ R-1 (ローマウント、カーキ)</Japanese>
+            <Korean>에임포인트 마이크로 R-1 (낮음, 카키)</Korean>
+            <German>Aimpoint Micro R-1 (Tief, Khaki)</German>
+            <Italian>Aimpoint Micro R-1 (Basso, Cachi)</Italian>
         </Key>
         <Key ID="STR_ACE_Compat_WS_RealisticNames_r1_low_sand_Name">
             <English>Aimpoint Micro R-1 (Low, Sand)</English>
+            <Japanese>Aimpoint マイクロ R-1 (ローマウント、サンド)</Japanese>
+            <Korean>에임포인트 마이크로 R-1 (낮음, 모래)</Korean>
+            <German>Aimpoint Micro R-1 (Tief, Sand)</German>
+            <Italian>Aimpoint Micro R-1 (Basso, Sabbia)</Italian>
         </Key>
         <Key ID="STR_ACE_Compat_WS_RealisticNames_r1_low_snake_Name">
             <English>Aimpoint Micro R-1 (Low, Snake)</English>
+            <Japanese>Aimpoint マイクロ R-1 (ローマウント、ヘビ柄迷彩)</Japanese>
+            <Korean>에임포인트 마이크로 R-1 (낮음, 뱀 위장)</Korean>
+            <German>Aimpoint Micro R-1 (Tief, Schlange)</German>
+            <Italian>Aimpoint Micro R-1 (Basso, Serpe)</Italian>
         </Key>
         <Key ID="STR_ACE_Compat_WS_RealisticNames_r1_low_arid_Name">
             <English>Aimpoint Micro R-1 (Low, Arid)</English>
+            <Japanese>Aimpoint マイクロ R-1 (ローマウント、乾燥地帯迷彩)</Japanese>
+            <Korean>에임포인트 마이크로 R-1 (낮음, 건조)</Korean>
+            <German>Aimpoint Micro R-1 (Tief, Trocken)</German>
+            <Italian>Aimpoint Micro R-1 (Basso, Arido)</Italian>
         </Key>
         <Key ID="STR_ACE_Compat_WS_RealisticNames_r1_low_lush_Name">
             <English>Aimpoint Micro R-1 (Low, Lush)</English>
+            <Japanese>Aimpoint マイクロ R-1 (ローマウント、緑地迷彩)</Japanese>
+            <Korean>에임포인트 마이크로 R-1 (낮음, 초목)</Korean>
+            <German>Aimpoint Micro R-1 (Tief, Grün)</German>
+            <Italian>Aimpoint Micro R-1 (Basso, Verdeggiante)</Italian>
         </Key>
         <Key ID="STR_ACE_Compat_WS_RealisticNames_dms_snake_Name">
             <English>Burris XTR II (Snake)</English>
+            <Japanese>Burris XTR II (ヘビ柄迷彩)</Japanese>
+            <Korean>버리스 XTR II (뱀 위장)</Korean>
+            <German>Burris XTR II (Schlange)</German>
+            <Italian>Burris XTR II (Serpe)</Italian>
         </Key>
         <Key ID="STR_ACE_Compat_WS_RealisticNames_apc_wheeled_01_atgm_Name">
             <English>Badger IFV (ATGM)</English>
+            <Japanese>バジャー IFV (ATGM)</Japanese>
+            <Korean>뱃져 보병전투차 (대전차미사일)</Korean>
+            <German>Badger IFV (PzAbw)</German>
+            <Italian>Badger IFV (ATGM)</Italian>
         </Key>
         <Key ID="STR_ACE_Compat_WS_RealisticNames_apc_wheeled_01_command_Name">
             <English>Badger IFV (Command)</English>
+            <Japanese>バジャー IFV (指揮)</Japanese>
+            <Korean>뱃져 보병전투차 (지휘)</Korean>
+            <German>Badger IFV (Kommando)</German>
+            <Italian>Badger IFV (Comando)</Italian>
         </Key>
         <Key ID="STR_ACE_Compat_WS_RealisticNames_apc_wheeled_01_mortar_Name">
             <English>Badger IFV (Mortar)</English>
+            <Japanese>バジャー IFV (迫撃砲)</Japanese>
+            <Korean>뱃져 보병전투차 (자주박격포)</Korean>
+            <German>Badger IFV (Mörser)</German>
+            <Italian>Badger IFV (Mortaio)</Italian>
         </Key>
         <Key ID="STR_ACE_Compat_WS_RealisticNames_truck_02_aa_Name">
             <English>KamAZ (Zu-23-2)</English>
+            <Japanese>KamAZ (Zu-23-2)</Japanese>
+            <Korean>카마즈 (ZU-23-2)</Korean>
+            <German>KamAZ (Zu-23-2)</German>
+            <Italian>KamAZ (Zu-23-2)</Italian>
         </Key>
         <Key ID="STR_ACE_Compat_WS_RealisticNames_truck_02_cargo_Name">
             <English>KamAZ Cargo</English>
+            <Japanese>KamAZ 貨物</Japanese>
+            <Korean>카마즈 화물</Korean>
+            <German>KamAZ Fracht</German>
+            <Italian>KamAZ Carico</Italian>
         </Key>
         <Key ID="STR_ACE_Compat_WS_RealisticNames_truck_02_repair_Name">
             <English>KamAZ Repair</English>
+            <Japanese>KamAZ 修理</Japanese>
+            <Korean>카마즈 정비</Korean>
+            <German>KamAZ Instandsetzung</German>
+            <Italian>KamAZ Riparazione</Italian>
         </Key>
         <Key ID="STR_ACE_Compat_WS_RealisticNames_truck_02_racing_Name">
             <English>KamAZ Racing</English>
+            <Japanese>KamAZ レース仕様</Japanese>
+            <Korean>카마즈 경주용</Korean>
+            <German>KamAZ Rennlaster</German>
+            <Italian>KamAZ da corsa</Italian>
         </Key>
         <Key ID="STR_ACE_Compat_WS_RealisticNames_truck_02_ammo_Name">
             <English>KamAZ Ammo</English>
+            <Japanese>KamAZ 弾薬</Japanese>
+            <Korean>카마즈 탄약</Korean>
+            <German>KamAZ Munition</German>
+            <Italian>KamAZ Munizioni</Italian>
         </Key>
         <Key ID="STR_ACE_Compat_WS_RealisticNames_truck_02_flatbed_Name">
             <English>KamAZ Flatbed</English>
+            <Japanese>KamAZ フラットベッド</Japanese>
+            <Korean>카마즈 플랫베드</Korean>
+            <German>KamAZ Flachbett</German>
+            <Italian>KamAZ Pianale</Italian>
         </Key>
         <Key ID="STR_ACE_Compat_WS_RealisticNames_heli_transport_02_Name">
             <English>AW101 Merlin</English>
+            <Japanese>AW101 マーリン</Japanese>
+            <Korean>AW101 멀린</Korean>
+            <German>AW101 Merlin</German>
+            <Italian>AW101 Merlin</Italian>
         </Key>
         <Key ID="STR_ACE_Compat_WS_RealisticNames_apc_tracked_02_Name">
             <English>BM-2T Stalker (Bumerang-BM)</English>
+            <Japanese>BM-2T ストーカー (ブーメランク-BM)</Japanese>
+            <Korean>BM-2T 스토커 (부메랑-BM)</Korean>
+            <German>BM-2T Stalker (Bumerang-BM)</German>
+            <Italian>BM-2T Stalker (Bumerang-BM)</Italian>
         </Key>
         <Key ID="STR_ACE_Compat_WS_RealisticNames_apc_wheeled_02_hmg_Name">
             <English>Otokar ARMA (HMG)</English>
+            <Japanese>オトカ アルマ (HMG)</Japanese>
+            <Korean>오토카르 아르마 APC (중기관총)</Korean>
+            <German>Otokar ARMA (HMG)</German>
+            <Italian>Otokar ARMA (HMG)</Italian>
         </Key>
         <Key ID="STR_ACE_Compat_WS_RealisticNames_apc_wheeled_02_unarmed_Name">
             <English>Otokar ARMA (Unarmed)</English>
+            <Japanese>オトカ アルマ (非武装)</Japanese>
+            <Korean>오토카르 아르마 APC (비무장)</Korean>
+            <German>Otokar ARMA (Unbewaffnet)</German>
+            <Italian>Otokar ARMA (Disarmato)</Italian>
         </Key>
         <Key ID="STR_ACE_Compat_WS_RealisticNames_heli_light_02_armed_Name">
             <English>Ka-60 Kasatka (UP)</English>
+            <Japanese>Ka-60 カサートカ (UP)</Japanese>
+            <Korean>Ka-60 카사트카 (UP)</Korean>
+            <German>Ka-60 Kasatka (UP)</German>
+            <Italian>Ka-60 Kasatka (UP)</Italian>
         </Key>
         <Key ID="STR_ACE_Compat_WS_RealisticNames_heli_light_02_unarmed_Name">
             <English>Ka-60 Kasatka (UP, Unarmed)</English>
+            <Japanese>Ka-60 カサートカ (UP、非武装)</Japanese>
+            <Korean>Ka-60 카사트카 (UP, 비무장))</Korean>
+            <German>Ka-60 Kasatka (UP, Unbewaffnet)</German>
+            <Italian>Ka-60 Kasatka (UP, Disarmato)</Italian>
         </Key>
     </Package>
 </Project>
diff --git a/addons/concertina_wire/functions/fnc_handleDamage.sqf b/addons/concertina_wire/functions/fnc_handleDamage.sqf
index 02092044ef..f5f1177df5 100644
--- a/addons/concertina_wire/functions/fnc_handleDamage.sqf
+++ b/addons/concertina_wire/functions/fnc_handleDamage.sqf
@@ -22,7 +22,7 @@
 params ["_wire", "", "_damage", "_source", ""];
 if (_damage < 0.5) exitWith { 0 };
 
-if (!(isNull _source)) then {
+if (!isNull _source) then {
     _wire setVariable [QGVAR(lastDamager), _source];
 };
 
diff --git a/addons/concertina_wire/stringtable.xml b/addons/concertina_wire/stringtable.xml
index 0ea44fc063..603cc5a7a8 100644
--- a/addons/concertina_wire/stringtable.xml
+++ b/addons/concertina_wire/stringtable.xml
@@ -30,7 +30,7 @@
             <Hungarian>Concertina wire coil</Hungarian>
             <Portuguese>Bobina de arame farpado</Portuguese>
             <Japanese>鉄条網コイル</Japanese>
-            <Korean>코일형 철조망</Korean>
+            <Korean>윤형철조망</Korean>
             <Chinese>鐵絲網捲</Chinese>
             <Chinesesimp>铁丝网卷</Chinesesimp>
             <Turkish>Bıçaklı Tel Rulo</Turkish>
diff --git a/addons/cookoff/CfgSounds.hpp b/addons/cookoff/CfgSounds.hpp
index 742fb589d9..70d752d613 100644
--- a/addons/cookoff/CfgSounds.hpp
+++ b/addons/cookoff/CfgSounds.hpp
@@ -45,7 +45,7 @@ class CfgSounds {
     class GVAR(shotsubmunitions_close_3): GVAR(shotbullet_close_3) {
         sound[] = {QPATHTOF(sounds\shotbullet\close_3.wss), VOLUME, PITCH, 1600};
     };
-    class GVAR(shotsubmunitions_mid_1): GVAR(shotbullet_far_1) {
+    class GVAR(shotsubmunitions_mid_1): GVAR(shotbullet_mid_1) {
         sound[] = {QPATHTOF(sounds\shotbullet\mid_1.wss), VOLUME, PITCH, 1600};
     };
     class GVAR(shotsubmunitions_mid_2): GVAR(shotbullet_mid_2) {
diff --git a/addons/cookoff/XEH_postInit.sqf b/addons/cookoff/XEH_postInit.sqf
index b99212c5b7..63e1486c82 100644
--- a/addons/cookoff/XEH_postInit.sqf
+++ b/addons/cookoff/XEH_postInit.sqf
@@ -9,7 +9,7 @@ if (isServer) then {
     [QGVAR(cookOffBoxServer), LINKFUNC(cookOffBoxServer)] call CBA_fnc_addEventHandler;
     [QGVAR(cookOffServer), LINKFUNC(cookOffServer)] call CBA_fnc_addEventHandler;
     [QGVAR(detonateAmmunitionServer), LINKFUNC(detonateAmmunitionServer)] call CBA_fnc_addEventHandler;
-    [QGVAR(engineFireServer), LINKFUNC(engineFire)] call CBA_fnc_addEventHandler;
+    [QGVAR(engineFireServer), LINKFUNC(engineFireServer)] call CBA_fnc_addEventHandler;
 };
 
 // Handle cleaning up effects when objects are deleted mid cook-off
diff --git a/addons/cookoff/stringtable.xml b/addons/cookoff/stringtable.xml
index c068edb811..15d2d2adec 100644
--- a/addons/cookoff/stringtable.xml
+++ b/addons/cookoff/stringtable.xml
@@ -4,11 +4,11 @@
         <Key ID="STR_ACE_CookOff_category_displayName">
             <English>ACE Cook-off</English>
             <Spanish>ACE Detonación inducida por calor</Spanish>
-            <Italian>ACE Detonazione Munizioni</Italian>
+            <Italian>ACE Esplosioni di Munizioni</Italian>
             <Chinese>ACE 殉爆效果</Chinese>
             <Chinesesimp>ACE 殉爆效果</Chinesesimp>
             <Japanese>ACE 誘爆</Japanese>
-            <Korean>ACE 쿡오프</Korean>
+            <Korean>ACE 유폭</Korean>
             <German>ACE Durchzündung</German>
             <French>ACE Auto-inflammation</French>
             <Polish>ACE Samozapłon</Polish>
@@ -18,25 +18,55 @@
         </Key>
         <Key ID="STR_ACE_CookOff_enableFire_name">
             <English>Enable vehicle cook-off fire</English>
+            <Japanese>車両の誘爆火災を有効化</Japanese>
+            <Russian>Вкл. возгорание техники</Russian>
+            <Korean>차량 유폭 화재를 활성화합니다</Korean>
+            <Italian>Abilita incendio dei veicoli</Italian>
+            <German>Aktiviert Fahrzeug Munitionsbrand</German>
         </Key>
         <Key ID="STR_ACE_CookOff_enableFire_tooltip">
             <English>Enables vehicle cook-off fire effects.\nThis doesn't include ammunition detonations.</English>
+            <Japanese>車両の誘爆火災エフェクトを有効化します。\nこれには弾薬の爆発は含まれません。</Japanese>
+            <Russian>Вкл. эффект горения техники. \nНе включает детонацию боекомплекта</Russian>
+            <Korean>차량 유폭 효과를 활성화합니다.\n여기엔 탄약 유폭이 포함되지 않습니다.</Korean>
+            <Italian>Abilita effetti di incendio del veicolo dovuto all'esplosione delle munizioni.\nQuesto non include gli effetti di esplosione.</Italian>
+            <German>Aktiviert Fahrzeug Brandeffekte durch Durchzündung.\nExplosionseffekte sind nicht mit einbegriffen.</German>
         </Key>
         <Key ID="STR_ACE_CookOff_cookoffDuration_name">
             <English>Vehicle cook-off fire duration multiplier</English>
+            <Japanese>車両の誘爆火災の持続時間倍率</Japanese>
+            <Russian>Увел. продолжительности горения техники</Russian>
+            <Korean>차량 유폭 화재 지속 시간 계수</Korean>
+            <Italian>Coefficiente di durata incendio dei veicoli</Italian>
+            <German>Fahrzeugbrand Dauer-Multiplikator</German>
         </Key>
         <Key ID="STR_ACE_CookOff_cookoffDuration_tooltip">
             <English>Multiplier for how long vehicle cook-off fire lasts.\nSetting to 0 will disable vehicle cook-off fire.</English>
+            <Japanese>車両の誘爆火災の持続時間をどのくらいの長さにするかの倍率。\n0に設定すると車両の誘爆火災が無効化されます。</Japanese>
+            <Russian>Увел. продолжительности горения техники. \nУстановка значения на 0 выключает возгорание техники.</Russian>
+            <Korean>차량 유폭 화재가 지속되는 시간에 대한 계수입니다.\n0으로 설정하면 차량 쿸오프 화재가 비활성화됩니다.</Korean>
+            <Italian>Coefficiente di durata degli incendi dei veicoli.\nImpostarlo su 0 disabilita incendi dei veicoli.</Italian>
+            <German>Multiplikator der Fahrzeugbrand Dauer.\nIhn auf 0 zu setzen wird Munitionsbrände deaktivieren.</German>
         </Key>
         <Key ID="STR_ACE_CookOff_probabilityCoef_name">
             <English>Vehicle cook-off fire probability multiplier</English>
+            <Japanese>車両の誘爆火災の可能性倍率</Japanese>
+            <Russian>Возможность усиления пожара при детонации техники</Russian>
+            <Korean>차량 유폭 화재 확률 계수</Korean>
+            <Italian>Probabilità di incendio dei veicoli</Italian>
+            <German>Fahrzeug Munitionsbrand Wahrscheinlichkeit-Multiplikator</German>
         </Key>
         <Key ID="STR_ACE_CookOff_probabilityCoef_tooltip">
             <English>Multiplier for vehicle cook-off fire probability. Higher value results in higher cook-off probability.\nSetting to 0 will disable vehicle cook-off fire.</English>
+            <Japanese>車両の誘爆火災がどのくらいの可能性で発生するかの倍率。高い数値は高い誘爆の可能性につながります。\n0に設定すると車両の誘爆火災が無効化されます。</Japanese>
+            <Russian>Увел. вероятности возникновения возгорания техники. Большое значение указывает на высокую вероятность детонации. \nУстановка значения 0 предотвращает возгорание техники.</Russian>
+            <Korean>차량 유폭 화재 확률에 대한 계수입니다. 값이 높을 수록 유폭 확률이 높아집니다.\n0으로 설정하면 차량 유폭 화재가 비활성화됩니다.</Korean>
+            <Italian>Coefficiente di probabilità degli incendi dei veicoli.\nValori maggiori aumentano la probabilità di incendi.\nImpostarlo su 0 disabilita incendi dei veicoli.</Italian>
+            <German>Multiplikator der Fahrzeugbrand Wahrscheinlichkeit.\nHöhere Werte erhöhen die Wahrscheinlichkeit.\nEin Null-Wert wird Munitionsbrände deaktivieren.</German>
         </Key>
         <Key ID="STR_ACE_CookOff_destroyVehicleAfterCookoff_name">
             <English>Destroy vehicles after cook-off</English>
-            <Korean>쿡오프 후 차량 파괴</Korean>
+            <Korean>유폭 후 차량 파괴</Korean>
             <Chinesesimp>殉爆发生后摧毁载具</Chinesesimp>
             <Russian>Уничтожать технику после детонации</Russian>
             <Spanish>Destruir vehículos tras la detonación inducida por calor</Spanish>
@@ -49,11 +79,11 @@
         </Key>
         <Key ID="STR_ACE_CookOff_destroyVehicleAfterCookoff_tooltip">
             <English>Controls whether vehicles will always be destroyed after cooking off.</English>
-            <Japanese>誘爆後に車両を破壊するかどうかを設定する。</Japanese>
+            <Japanese>誘爆の終了後に車両を必ず完全破壊するかどうかを設定します。</Japanese>
             <Polish>Kontroluje, czy pojazdy będą zawsze niszczone po samozapłonie.</Polish>
             <German>Steuert, ob Fahrzeuge nach dem Durchzünden immer zerstört werden.</German>
             <Italian>Determina se veicoli saranno sempre distrutti dall'esplosione delle munizioni.</Italian>
-            <Korean>쿡오프 후 차량이 항상 파괴되는지 여부를 조정합니다.</Korean>
+            <Korean>유폭 후 차량이 항상 파괴되는지 여부를 조정합니다.</Korean>
             <French>Contrôle si les véhicules seront toujours détruits après l'auto-inflammation.</French>
             <Portuguese>Define se os veículos serão sempre destruídos após cozinhamento.</Portuguese>
             <Russian>Определяет, всегда ли транспортные средства будут уничтожаться после детонации.</Russian>
@@ -61,16 +91,26 @@
         </Key>
         <Key ID="STR_ACE_CookOff_enableAmmoCookoff_name">
             <English>Enable vehicle ammo cook-off</English>
+            <Japanese>車両弾薬の誘爆を有効化</Japanese>
+            <Russian>Вкл. детонацию боеприпасов в технике.</Russian>
+            <Korean>차량 내 탄약 유폭 활성화</Korean>
+            <Italian>Abilita esplosioni delle munizioni dei veicoli</Italian>
+            <German>Aktiviert Fahrzeug Munitionsdurchzündung</German>
         </Key>
         <Key ID="STR_ACE_CookOff_enableAmmoCookoff_tooltip">
             <English>Enables cooking off of vehicle ammunition. Fires ammunition projectiles while vehicle has ammunition remaining.\nThis doesn't include fire effects.</English>
+            <Japanese>車両弾薬の誘爆を有効化します。車両に積載されたままの弾薬と弾頭が発射されます。\nこれには火災エフェクトは含まれません。</Japanese>
+            <Russian>Вкл. детонацию боеприпасов на технике. Боеприпасы и боеголовки, которые остаются заряженными на транспортном средстве, будут приведены в действие. \nЭто не включает эффекты пожара.</Russian>
+            <Korean>차량 내 탄약 유폭을 활성화합니다. 차량에 탄약이 남아 있는 동안 탄약 발사체를 발사합니다.\n여기엔 화재 효과가 포함되지 않습니다.</Korean>
+            <Italian>Abilita l'esplosione delle munizioni dei veicoli. Spara via pezzi di munizioni se il veicolo ha ancora munizioni rimanenti.\nNon include gli effetti di fuoco.</Italian>
+            <German>Aktiviert Durchzündung von Fahrzeugmunition. Schleudert Munitionsfragmente umher wenn das Fahrzeug noch Munition an Bord hat.\nBrandeffekte sind nicht mit einbegriffen.</German>
         </Key>
         <Key ID="STR_ACE_CookOff_enableBoxCookoff_name">
             <English>Enable ammo box cook-off</English>
             <Spanish>Habilitar detonación inducida por calor en las cajas de munición</Spanish>
             <Japanese>弾薬箱の誘爆を有効化</Japanese>
             <German>Durchzündung für Munitionskisten ermöglichen</German>
-            <Korean>탄약 상자 쿡오프 현상 활성화</Korean>
+            <Korean>탄약 상자 유폭 현상 활성화</Korean>
             <Polish>Aktywuj samozapłon skrzyń z amunicją</Polish>
             <French>Auto-inflammation des caisses de munitions</French>
             <Italian>Abilita esplosione casse munizioni</Italian>
@@ -82,29 +122,48 @@
         </Key>
         <Key ID="STR_ACE_CookOff_enableBoxCookoff_tooltip">
             <English>Enables cooking off of ammo boxes.\nThis doesn't include fire effects.</English>
+            <Japanese>弾薬箱の誘爆を有効化します。\nこれには火災エフェクトは含まれません。</Japanese>
+            <Russian>Вкл. детонацию ящика с боеприпасами. \nЭто не включает эффекты огня.</Russian>
+            <Korean>탄약 상자 유폭을 활성화합니다.\n여기엔 화재 효과가 포함되지 않습니다.</Korean>
+            <Italian>Abilita esplosioni delle casse di munizioni.\nNon include effetti di fuoco.</Italian>
+            <German>Aktiviert Munitionskisten Durchzündung.\nBrandeffekte sind nicht mit einbegriffen.</German>
         </Key>
         <Key ID="STR_ACE_CookOff_ammoCookoffDuration_name">
             <English>Ammo cook-off duration multiplier</English>
+            <Japanese>弾薬の誘爆の持続時間倍率</Japanese>
+            <Russian>Увеличение продолжительности детонации боеприпасов.</Russian>
+            <Korean>탄약 유폭 시간 계수</Korean>
+            <Italian>Coefficiente di durata esplisioni di munizioni</Italian>
+            <German>Fahrzeug Munitionsdurchzündung Dauer-Multiplikator</German>
         </Key>
         <Key ID="STR_ACE_CookOff_ammoCookoffDuration_tooltip">
             <English>Multiplier for how long ammunition cook-off lasts, for both vehicles and ammo boxes.\nSetting to 0 will disable ammo cook-off for both vehicles and ammo boxes.</English>
+            <Japanese>弾薬の誘爆の持続時間をどのくらいの長さにするかの倍率。車両弾薬と弾薬箱どちらにも影響します。\n0に設定すると弾薬の誘爆が無効化されます。</Japanese>
+            <Russian>Увеличение продолжительности детонации боеприпасов. Это влияет как на боеприпасы в технике, так и на ящики с боеприпасами. \nУстановка значения 0 отключает детонацию боеприпасов.</Russian>
+            <Korean>차량과 탄약 상자 모두에 대해 탄약 유폭이 지속되는 시간에 대한 계수입니다.\n0으로 설정하면 차량과 탄약 상자 모두에 대해 탄약 유폭이 비활성화됩니다.</Korean>
+            <Italian>Coefficiente della durata di esplosioni delle munizioni, sia per veicoli che casse.\nImpostarlo su 0 disabilita esplosioni di veicoli e casse.</Italian>
+            <German>Multiplikator der Munitionsdurchzündungs-Dauer, gilt für Fahrzeuge und Munitionskisten.\nIhn auf 0 zu setzen wird Durchzünden deaktivieren.</German>
         </Key>
         <Key ID="STR_ACE_CookOff_removeAmmoDuringCookoff_name">
             <English>Enable ammo removal during cook-off</English>
-            <Japanese>誘爆中の弾薬除去を有効/無効にする</Japanese>
+            <Japanese>誘爆による弾薬の除去を有効化</Japanese>
             <French>Retirer les munitions durant l'auto-inflammation</French>
             <German>Aktiviert/Deaktiviert Entfernung der Munition beim Durchzünden</German>
             <Italian>Abilita rimozione munizioni dopo l'esplosione</Italian>
             <Polish>Włącz/Wyłącz usuwanie amunicji podczas samozapłonu</Polish>
             <Chinesesimp>启用/禁用殉爆过程中的弹药移除功能</Chinesesimp>
-            <Korean>쿡오프시 탄약 제거 활성화/비활성화</Korean>
-            <Russian>Удалять боеприпасы из-за детонации</Russian>
+            <Korean>유폭 시 탄약 제거 활성화/비활성화</Korean>
+            <Russian>Вкл. удаление боеприпасов из-за детонации</Russian>
             <Spanish>Habilita/Deshabilita ka eliminación de munición durante la detonación inducida por calor</Spanish>
         </Key>
         <Key ID="STR_ACE_CookOff_removeAmmoDuringCookoff_tooltip">
             <English>Removes all ammo during cook-off.</English>
             <French>Retire des munitions des véhicules durant une auto-inflammation.</French>
             <German>Entfernt Munition während dem Durchzünden der Munition eines Fahrzeuges.</German>
+            <Japanese>誘爆によって全ての弾薬を除去します。</Japanese>
+            <Russian>Все боеприпасы уничтожаются путем подрыва.</Russian>
+            <Korean>유폭 중 모든 탄약을 제거합니다.</Korean>
+            <Italian>Rimuovi le munizioni dal veicolo durante le esplosioni.</Italian>
         </Key>
     </Package>
 </Project>
diff --git a/addons/csw/CfgMagazines.hpp b/addons/csw/CfgMagazines.hpp
index 86ad73c58f..2466bbe696 100644
--- a/addons/csw/CfgMagazines.hpp
+++ b/addons/csw/CfgMagazines.hpp
@@ -58,6 +58,7 @@ class CfgMagazines {
     class GVAR(20Rnd_20mm_G_belt): 40Rnd_20mm_G_belt {
         author = ECSTRING(common,ACETeam);
         displayName = CSTRING(GMGBelt_displayName);
+        descriptionShort = CSTRING(GMGBelt_descriptionShort);
         model = "\A3\Structures_F_EPB\Items\Military\Ammobox_rounds_F.p3d";
         picture = QPATHTOF(UI\ammoBox_50bmg_ca.paa);
         type = 256;
diff --git a/addons/csw/dev/checkStaticWeapons.sqf b/addons/csw/dev/checkStaticWeapons.sqf
index 7d9917daa7..137dc95334 100644
--- a/addons/csw/dev/checkStaticWeapons.sqf
+++ b/addons/csw/dev/checkStaticWeapons.sqf
@@ -16,7 +16,7 @@ private _inherited = [];
     private _config = _x;
     private _configEnabled = (getNumber (_config >> QUOTE(ADDON) >> "enabled")) == 1;
     if (_configEnabled) then {
-        private _configExplicit = (count configProperties [_config, "configName _x == 'ace_csw'", false]) == 1;
+        private _configExplicit = (count configProperties [_config, toString {configName _x == QUOTE(ADDON)}, false]) == 1;
         if (_configExplicit) then {
             _explicitBases  pushBack (configName _config);
             _inherited pushBack [];
@@ -43,8 +43,8 @@ private _inherited = [];
 
 INFO("------ Logging static magazines with no carry version -------");
 private _hash = createHashMap;
-// private _logAll = true; // logs all possible weapon magazines (even if not used in a static weapon)
-private _logAll = false;
+private _logAll = false; // logs all possible weapon magazines (even if not used in a static weapon) when set to true
+
 {
     private _vehicleType = configName _x;
     private _turretConfig = [_vehicleType, [0]] call CBA_fnc_getTurret;
diff --git a/addons/csw/functions/fnc_aceRearmGetCarryMagazines.sqf b/addons/csw/functions/fnc_aceRearmGetCarryMagazines.sqf
index 5230fccf52..f3a6bbde5f 100644
--- a/addons/csw/functions/fnc_aceRearmGetCarryMagazines.sqf
+++ b/addons/csw/functions/fnc_aceRearmGetCarryMagazines.sqf
@@ -1,11 +1,11 @@
 #include "..\script_component.hpp"
 /*
  * Author: PabstMirror
- * Helper function for ace_rearm; Gets magazines that should be loaded by csw
+ * Helper function for ace_rearm; Gets magazines that should be loaded by csw.
  *
  * Arguments:
- * 0: Vehicle <OBJECT>
- * 1: Specific Turret or pass bool to check all turrets <ARRAY><BOOL>(default: true)
+ * 0: CSW <OBJECT>
+ * 1: Specific Turret or pass bool to check all turrets <ARRAY|BOOL> (default: true)
  *
  * Return Value:
  * [0: compatible veh mags, 1: carry mags] <ARRAY>
diff --git a/addons/csw/functions/fnc_ai_handleFired.sqf b/addons/csw/functions/fnc_ai_handleFired.sqf
index d92e517091..6f7a645257 100644
--- a/addons/csw/functions/fnc_ai_handleFired.sqf
+++ b/addons/csw/functions/fnc_ai_handleFired.sqf
@@ -1,7 +1,7 @@
 #include "..\script_component.hpp"
 /*
  * Author: PabstMirror
- * Handles AI Fired EH
+ * Handles AI Fired EH.
  *
  * Arguments:
  * Fired EH
diff --git a/addons/csw/functions/fnc_ai_handleGetIn.sqf b/addons/csw/functions/fnc_ai_handleGetIn.sqf
index f14a4ccbc7..14b4453f53 100644
--- a/addons/csw/functions/fnc_ai_handleGetIn.sqf
+++ b/addons/csw/functions/fnc_ai_handleGetIn.sqf
@@ -1,7 +1,7 @@
 #include "..\script_component.hpp"
 /*
- * Author: Grim
- * Handles AI GetIn on an empty weapon
+ * Author: LinkIsGrim
+ * Handles AI GetIn on an empty CSW.
  *
  * Arguments:
  * GetIn EH
diff --git a/addons/csw/functions/fnc_ai_reload.sqf b/addons/csw/functions/fnc_ai_reload.sqf
index 4d6234f94a..288d718a2f 100644
--- a/addons/csw/functions/fnc_ai_reload.sqf
+++ b/addons/csw/functions/fnc_ai_reload.sqf
@@ -1,10 +1,10 @@
 #include "..\script_component.hpp"
 /*
- * Author: PabstMirror, modified by Grim
- * Handles AI reloading
+ * Author: PabstMirror, LinkIsGrim
+ * Handles AI reloading.
  *
  * Arguments:
- * 0: Static Weapon <OBJECT>
+ * 0: CSW <OBJECT>
  * 1: Gunner <OBJECT>
  * 2: Weapon <STRING>
  * 3: Magazine <STRING> (default: "")
@@ -15,7 +15,7 @@
  * Public: No
  */
 
-params ["_staticWeapon", "_gunner", "_weapon", ["_magazine", ""]];
+params ["_vehicle", "_gunner", "_weapon", ["_magazine", ""]];
 
 private _turretPath = [_gunner] call EFUNC(common,getTurretIndex);
 private _reloadSource = objNull;
@@ -24,7 +24,7 @@ private _reloadNeededAmmo = -1;
 
 private _cfgMagGroups = configFile >> QGVAR(groups);
 
-private _nearSupplies = [_gunner] + ((_staticWeapon nearSupplies 10) select {
+private _nearSupplies = [_gunner] + ((_vehicle nearSupplies 10) select {
     isNull (group _x) ||
     {!([_x] call EFUNC(common,isPlayer)) && {[side group _gunner, side group _x] call BIS_fnc_sideIsFriendly}}
 });
@@ -49,7 +49,7 @@ private _nearSupplies = [_gunner] + ((_staticWeapon nearSupplies 10) select {
         private _xWeaponMag = _x;
         {
             if ((getNumber (_cfgMagGroups >> _x >> _xWeaponMag)) == 1) then {
-                private _loadInfo = [_staticWeapon, _turretPath, _x, _xSource] call FUNC(reload_canLoadMagazine);
+                private _loadInfo = [_vehicle, _turretPath, _x, _xSource] call FUNC(reload_canLoadMagazine);
                 if (_loadInfo select 0) then {
                     _reloadMag = _x;
                     _reloadSource = _xSource;
@@ -81,16 +81,16 @@ if (_bestAmmoToSend == -1) exitWith {ERROR("No ammo");};
 [_reloadSource, _reloadMag, _bestAmmoToSend] call EFUNC(common,removeSpecificMagazine);
 
 private _timeToLoad = 1;
-if (!isNull(configOf _staticWeapon >> QUOTE(ADDON) >> "ammoLoadTime")) then {
-    _timeToLoad = getNumber(configOf _staticWeapon >> QUOTE(ADDON) >> "ammoLoadTime");
+if (!isNull(configOf _vehicle >> QUOTE(ADDON) >> "ammoLoadTime")) then {
+    _timeToLoad = getNumber(configOf _vehicle >> QUOTE(ADDON) >> "ammoLoadTime");
 };
 
 TRACE_1("Reloading in progress",_timeToLoad);
 [{
-    params ["_staticWeapon", "_turretPath", "_gunner", "_reloadMag", "_bestAmmoToSend"];
-    if ((!alive _staticWeapon) || {!alive _gunner} || {(_staticWeapon distance _gunner) > 10}) exitWith {TRACE_1("invalid state",_this);};
+    params ["_vehicle", "_turretPath", "_gunner", "_reloadMag", "_bestAmmoToSend"];
+    if ((!alive _vehicle) || {!alive _gunner} || {(_vehicle distance _gunner) > 10}) exitWith {TRACE_1("invalid state",_this);};
 
     // Reload the static weapon
-    TRACE_5("calling addTurretMag event",_staticWeapon,_turretPath,_gunner,_reloadMag,_bestAmmoToSend);
+    TRACE_5("calling addTurretMag event",_vehicle,_turretPath,_gunner,_reloadMag,_bestAmmoToSend);
     [QGVAR(addTurretMag), _this] call CBA_fnc_globalEvent;
-}, [_staticWeapon, _turretPath, _gunner, _reloadMag, _bestAmmoToSend], _timeToLoad] call CBA_fnc_waitAndExecute;
+}, [_vehicle, _turretPath, _gunner, _reloadMag, _bestAmmoToSend], _timeToLoad] call CBA_fnc_waitAndExecute;
diff --git a/addons/csw/functions/fnc_assemble_canDeployWeapon.sqf b/addons/csw/functions/fnc_assemble_canDeployWeapon.sqf
index 57f2ce2bc8..6dd58fe4fb 100644
--- a/addons/csw/functions/fnc_assemble_canDeployWeapon.sqf
+++ b/addons/csw/functions/fnc_assemble_canDeployWeapon.sqf
@@ -1,14 +1,14 @@
 #include "..\script_component.hpp"
 /*
  * Author: tcvm
- * Checks if you can deploy a weapon on the tripod
+ * Checks if you can deploy a weapon on the tripod.
  *
  * Arguments:
- * 0: Target Tripod <OBJECT>
- * 0: Player <OBJECT>
+ * 0: Target <OBJECT>
+ * 1: Player <OBJECT>
  *
  * Return Value:
- * Wether or not you can deploy the weapon <BOOL>
+ * Whether or not you can deploy the weapon <BOOL>
  *
  * Example:
  * [cursorObject, player] call ace_csw_fnc_assemble_canDeployWeapon
@@ -16,9 +16,8 @@
  * Public: No
  */
 
-params ["_target", "_player", "", "_carryWeaponClassname"];
-if (isNil "_carryWeaponClassname") then { _carryWeaponClassname = secondaryWeapon _player };
+params ["_target", "_player"];
 
 // If the current launcher has a config-value that defines the tripod, it is a CSW
 (alive _target) &&
-{(getText(configFile >> "CfgWeapons" >> _carryWeaponClassname >> QUOTE(ADDON) >> "assembleTo" >> (typeOf _target))) != ""}
+{(getText (configFile >> "CfgWeapons" >> secondaryWeapon _player >> QUOTE(ADDON) >> "assembleTo" >> typeOf _target)) != ""}
diff --git a/addons/csw/functions/fnc_assemble_canPickupWeapon.sqf b/addons/csw/functions/fnc_assemble_canPickupWeapon.sqf
index 6217d769dd..3228373b40 100644
--- a/addons/csw/functions/fnc_assemble_canPickupWeapon.sqf
+++ b/addons/csw/functions/fnc_assemble_canPickupWeapon.sqf
@@ -1,25 +1,23 @@
 #include "..\script_component.hpp"
 /*
  * Author: tcvm
- * If the CSW is mounted or in use this will not allow you to dismount the weapon
+ * If the CSW is mounted or in use this will not allow you to dismount the weapon.
  *
  * Arguments:
- * 0: Static Weapon <OBJECT>
+ * 0: CSW <OBJECT>
  *
  * Return Value:
- * Can Dismount <BOOL>
+ * Can dismount weapon <BOOL>
  *
  * Example:
- * [cursorObject] call ace_csw_fnc_assemble_canPickupWeapon
+ * cursorObject call ace_csw_fnc_assemble_canPickupWeapon
  *
  * Public: No
  */
 
-params ["_staticWeapon"];
+params ["_vehicle"];
 
 // Assembly mode: [0=disabled, 1=enabled, 2=enabled&unload, 3=default]
-private _assemblyMode = [false, true, true, GVAR(defaultAssemblyMode)] select (_staticWeapon getVariable [QGVAR(assemblyMode), 3]);
-private _notCrewed = (crew _staticWeapon) isEqualTo [];
-private _deadCrew = !(alive (gunner _staticWeapon)); // need to eject body???
+private _assemblyMode = [false, true, true, GVAR(defaultAssemblyMode)] select (_vehicle getVariable [QGVAR(assemblyMode), 3]);
 
-_assemblyMode && {alive _staticWeapon} && {_notCrewed || _deadCrew}
+_assemblyMode && {alive _vehicle} && {((crew _vehicle) findIf {alive _x && {!unitIsUAV _x}}) == -1} // return
diff --git a/addons/csw/functions/fnc_assemble_deployTripod.sqf b/addons/csw/functions/fnc_assemble_deployTripod.sqf
index da2ed56c04..c69d618066 100644
--- a/addons/csw/functions/fnc_assemble_deployTripod.sqf
+++ b/addons/csw/functions/fnc_assemble_deployTripod.sqf
@@ -1,7 +1,7 @@
 #include "..\script_component.hpp"
 /*
  * Author: tcvm
- * Deploys the tripod
+ * Deploys the tripod.
  *
  * Arguments:
  * 0: Unit <OBJECT>
@@ -10,7 +10,7 @@
  * None
  *
  * Example:
- * [player] call ace_csw_fnc_assemble_deployTripod
+ * player call ace_csw_fnc_assemble_deployTripod
  *
  * Public: No
  */
@@ -19,26 +19,45 @@
     params ["_player"];
     TRACE_1("assemble_deployTripod",_player);
 
+    // Save magazines and attachments (handle loaded launchers which can become csw like CUP Metis)
+    private _secondaryWeaponInfo = (getUnitLoadout _player) select 1;
+    private _secondaryWeaponClassname = _secondaryWeaponInfo deleteAt 0;
+
+    // Remove empty entries
+    _secondaryWeaponInfo = _secondaryWeaponInfo select {_x isNotEqualTo "" && {_x isNotEqualTo []}};
+
     // Remove the tripod from the launcher slot
-    private _secondaryWeaponClassname = secondaryWeapon _player;
-    // handle loaded launchers which can become csw like CUP Metis
-    private _secondaryWeaponMagazine = secondaryWeaponMagazine _player param [0, ""];
     _player removeWeaponGlobal _secondaryWeaponClassname;
 
     private _onFinish = {
         params ["_args"];
-        _args params ["_player", "_secondaryWeaponClassname", "_secondaryWeaponMagazine"];
-        TRACE_3("deployTripod finish",_player,_secondaryWeaponClassname,_secondaryWeaponMagazine);
+        _args params ["_player", "_secondaryWeaponClassname", "_secondaryWeaponInfo"];
+        TRACE_3("deployTripod finish",_player,_secondaryWeaponClassname,_secondaryWeaponInfo);
 
-        private _tripodClassname = getText(configFile >> "CfgWeapons" >> _secondaryWeaponClassname >> QUOTE(ADDON) >> "deploy");
+        private _tripodClassname = getText (configFile >> "CfgWeapons" >> _secondaryWeaponClassname >> QUOTE(ADDON) >> "deploy");
 
         // Create a tripod
         private _cswTripod = createVehicle [_tripodClassname, [0, 0, 0], [], 0, "NONE"];
         // Because the tripod can be a "full weapon" we disable any data that will allow it to be loaded
         _cswTripod setVariable [QGVAR(assemblyMode), 2, true]; // Explicitly set enabled&unload assembly mode and broadcast
-        if (_secondaryWeaponMagazine isNotEqualTo "") then {
-            _cswTripod setVariable [QGVAR(secondaryWeaponMagazine), _secondaryWeaponMagazine];
+
+        private _secondaryWeaponMagazines = [];
+
+        {
+            // Magazines
+            if (_x isEqualType []) then {
+                _secondaryWeaponMagazines pushBack _x;
+            } else {
+                // Items
+                [_player, _x, true] call CBA_fnc_addItem;
+            };
+        } forEach _secondaryWeaponInfo;
+
+        // Only add magazines once the weapon is fully ready
+        if (_secondaryWeaponMagazines isNotEqualTo []) then {
+            _cswTripod setVariable [QGVAR(secondaryWeaponMagazines), _secondaryWeaponMagazines, true];
         };
+
         if (!GVAR(defaultAssemblyMode)) then {
             [_cswTripod, "disableWeaponAssembly", QUOTE(ADDON), true] call EFUNC(common,statusEffect_set);
         };
@@ -65,15 +84,18 @@
 
     private _onFailure = {
         params ["_args"];
-        _args params ["_player", "_secondaryWeaponClassname", "_secondaryWeaponMagazine"];
-        TRACE_3("deployTripod failure",_player,_secondaryWeaponClassname,_secondaryWeaponMagazine);
+        _args params ["_player", "_secondaryWeaponClassname", "_secondaryWeaponInfo"];
+        TRACE_3("deployTripod failure",_player,_secondaryWeaponClassname,_secondaryWeaponInfo);
 
-        _player addWeaponGlobal _secondaryWeaponClassname;
-        if (_secondaryWeaponMagazine isNotEqualTo "") then {
-            _player addWeaponItem [_secondaryWeaponClassname, _secondaryWeaponMagazine, true];
-        };
+        // Add tripod back
+        [_player, _secondaryWeaponClassname] call CBA_fnc_addWeaponWithoutItems;
+
+        // Add all attachments back
+        {
+            _player addWeaponItem [_secondaryWeaponClassname, _x, true];
+        } forEach _secondaryWeaponInfo;
     };
 
-    private _deployTime = getNumber(configFile >> "CfgWeapons" >> _secondaryWeaponClassname >> QUOTE(ADDON) >> "deployTime");
-    [TIME_PROGRESSBAR(_deployTime), [_player, _secondaryWeaponClassname, _secondaryWeaponMagazine], _onFinish, _onFailure, LLSTRING(PlaceTripod_progressBar)] call EFUNC(common,progressBar);
+    private _deployTime = getNumber (configFile >> "CfgWeapons" >> _secondaryWeaponClassname >> QUOTE(ADDON) >> "deployTime");
+    [TIME_PROGRESSBAR(_deployTime), [_player, _secondaryWeaponClassname, _secondaryWeaponInfo], _onFinish, _onFailure, LLSTRING(PlaceTripod_progressBar)] call EFUNC(common,progressBar);
 }, _this] call CBA_fnc_execNextFrame;
diff --git a/addons/csw/functions/fnc_assemble_deployWeapon.sqf b/addons/csw/functions/fnc_assemble_deployWeapon.sqf
index b9f8029bc2..a0e0acdd28 100644
--- a/addons/csw/functions/fnc_assemble_deployWeapon.sqf
+++ b/addons/csw/functions/fnc_assemble_deployWeapon.sqf
@@ -1,42 +1,54 @@
 #include "..\script_component.hpp"
 /*
  * Author: tcvm
- * Deploys the current CSW
+ * Deploys the current CSW.
  *
  * Arguments:
- * 0: Unit <OBJECT>
+ * 0: Target <OBJECT>
+ * 1: Player <OBJECT>
+ * 2: Args <ANY>
+ * 3: Action Data <ARRAY>
  *
  * Return Value:
  * None
  *
  * Example:
- * [player] call ace_csw_fnc_assemble_deployWeapon
+ * [cursorObject, player] call ace_csw_fnc_assemble_deployWeapon
  *
  * Public: No
  */
 
 [{
-    params ["_tripod", "_player", "", "_carryWeaponClassname"];
-    if (isNil "_carryWeaponClassname") then { _carryWeaponClassname = secondaryWeapon _player };
+    params ["_tripod", "_player"];
+
+    // Save magazines and attachments (handle loaded launchers which can become csw like CUP Metis)
+    private _carryWeaponInfo = (getUnitLoadout _player) select 1;
+    private _carryWeaponClassname = _carryWeaponInfo deleteAt 0;
+
+    // Remove empty entries
+    _carryWeaponInfo = _carryWeaponInfo select {_x isNotEqualTo "" && {_x isNotEqualTo []}};
+
     TRACE_3("assemble_deployWeapon_carryWeaponClassname",_tripod,_player,_carryWeaponClassname);
 
     private _tripodClassname = typeOf _tripod;
-    _player removeWeaponGlobal _carryWeaponClassname;
-
     private _weaponConfig = configfile >> "CfgWeapons" >> _carryWeaponClassname >> QUOTE(ADDON);
     private _assembledClassname = getText (_weaponConfig >> "assembleTo" >> _tripodClassname);
 
     if (!isClass (configFile >> "CfgVehicles" >> _assembledClassname)) exitWith {ERROR_1("bad static classname [%1]",_assembledClassname);};
 
+    _player removeWeaponGlobal _carryWeaponClassname;
+
     private _deployTime = getNumber (_weaponConfig >> "deployTime");
 
     TRACE_4("",_carryWeaponClassname,_tripodClassname,_assembledClassname,_deployTime);
 
     private _onFinish = {
         params ["_args"];
-        _args params ["_tripod", "_player", "_assembledClassname"];
+        _args params ["_tripod", "_player", "_assembledClassname", "", "_carryWeaponInfo"];
         TRACE_3("deployWeapon finish",_tripod,_player,_assembledClassname);
 
+        private _secondaryWeaponMagazines = _tripod getVariable [QGVAR(secondaryWeaponMagazines), []];
+
         private _tripodPos = getPosATL _tripod;
         private _tripodDir = getDir _tripod;
         deleteVehicle _tripod;
@@ -44,10 +56,26 @@
         _tripodPos set [2, (_tripodPos select 2) + 0.1];
         // Delay a frame so tripod has a chance to be deleted
         [{
-            params ["_assembledClassname", "_tripodDir", "_tripodPos"];
+            params ["_assembledClassname", "_tripodDir", "_tripodPos", "_player", "_carryWeaponInfo", "_secondaryWeaponMagazines"];
             private _csw = createVehicle [_assembledClassname, [0, 0, 0], [], 0, "NONE"];
             // Assembly mode: [0=disabled, 1=enabled, 2=enabled&unload, 3=default]
             _csw setVariable [QGVAR(assemblyMode), 2, true]; // Explicitly set advanced assembly mode + unload, and broadcast
+
+            {
+                // Magazines
+                if (_x isEqualType []) then {
+                    _secondaryWeaponMagazines pushBack _x;
+                } else {
+                    // Items
+                    [_player, _x, true] call CBA_fnc_addItem;
+                };
+            } forEach _carryWeaponInfo;
+
+            // Only add magazines once the weapon is fully ready
+            if (_secondaryWeaponMagazines isNotEqualTo []) then {
+                _csw setVariable [QGVAR(secondaryWeaponMagazines), _secondaryWeaponMagazines, true];
+            };
+
             if (!GVAR(defaultAssemblyMode)) then {
                 [_csw, "disableWeaponAssembly", QUOTE(ADDON), true] call EFUNC(common,statusEffect_set);
             };
@@ -58,23 +86,29 @@
             };
             [QGVAR(deployWeaponSucceeded), [_csw]] call CBA_fnc_localEvent;
             TRACE_2("csw placed",_csw,_assembledClassname);
-        }, [_assembledClassname, _tripodDir, _tripodPos]] call CBA_fnc_execNextFrame;
+        }, [_assembledClassname, _tripodDir, _tripodPos, _player, _carryWeaponInfo, _secondaryWeaponMagazines]] call CBA_fnc_execNextFrame;
     };
 
     private _onFailure = {
         params ["_args"];
-        _args params ["", "_player", "", "_carryWeaponClassname"];
+        _args params ["", "_player", "", "_carryWeaponClassname", "_carryWeaponInfo"];
         TRACE_2("deployWeapon failure",_player,_carryWeaponClassname);
 
-        _player addWeaponGlobal _carryWeaponClassname;
+        // Add weapon back
+        [_player, _carryWeaponClassname] call CBA_fnc_addWeaponWithoutItems;
+
+        // Add all attachments back
+        {
+            _player addWeaponItem [_carryWeaponClassname, _x, true];
+        } forEach _carryWeaponInfo;
     };
 
-    private _codeCheck = {
+    private _condition = {
         params ["_args"];
         _args params ["_tripod"];
 
         alive _tripod
     };
 
-    [TIME_PROGRESSBAR(_deployTime), [_tripod, _player, _assembledClassname, _carryWeaponClassname], _onFinish, _onFailure, LLSTRING(AssembleCSW_progressBar), _codeCheck] call EFUNC(common,progressBar);
+    [TIME_PROGRESSBAR(_deployTime), [_tripod, _player, _assembledClassname, _carryWeaponClassname, _carryWeaponInfo], _onFinish, _onFailure, LLSTRING(AssembleCSW_progressBar), _condition] call EFUNC(common,progressBar);
 }, _this] call CBA_fnc_execNextFrame;
diff --git a/addons/csw/functions/fnc_assemble_deployWeaponModifier.sqf b/addons/csw/functions/fnc_assemble_deployWeaponModifier.sqf
index 85b1346415..f98978195d 100644
--- a/addons/csw/functions/fnc_assemble_deployWeaponModifier.sqf
+++ b/addons/csw/functions/fnc_assemble_deployWeaponModifier.sqf
@@ -1,7 +1,7 @@
 #include "..\script_component.hpp"
 /*
  * Author: PabstMirror
- * Modifies interaction for deploying weapon
+ * Modifies interaction for deploying weapon.
  *
  * Arguments:
  * 0: Target <OBJECT>
@@ -21,7 +21,7 @@
 params ["_target", "_player", "", "_actionData"];
 
 private _carryWeaponClassname = secondaryWeapon _player;
-private _assembleTo = (getText(configFile >> "CfgWeapons" >> _carryWeaponClassname >> QUOTE(ADDON) >> "assembleTo" >> (typeOf _target)));
+private _assembleTo = getText (configFile >> "CfgWeapons" >> _carryWeaponClassname >> QUOTE(ADDON) >> "assembleTo" >> typeOf _target);
 private _icon = getText (configFile >> "CfgVehicles" >> _assembleTo >> "picture");
 TRACE_2("",_assembleTo,_icon);
 
diff --git a/addons/csw/functions/fnc_assemble_pickupTripod.sqf b/addons/csw/functions/fnc_assemble_pickupTripod.sqf
index 176718f015..c09400a87f 100644
--- a/addons/csw/functions/fnc_assemble_pickupTripod.sqf
+++ b/addons/csw/functions/fnc_assemble_pickupTripod.sqf
@@ -1,17 +1,17 @@
 #include "..\script_component.hpp"
 /*
  * Author: tcvm
- * Picks up the tripod and adds it to the player launcher slot
+ * Picks up the tripod and adds it to the player launcher slot.
  *
  * Arguments:
  * 0: Tripod <OBJECT>
- * 1: Unit <OBJECT>
+ * 1: Player <OBJECT>
  *
  * Return Value:
  * None
  *
  * Example:
- * [tripod, player] call ace_csw_fnc_assemble_pickupTripod
+ * [cursorObject, player] call ace_csw_fnc_assemble_pickupTripod
  *
  * Public: No
  */
@@ -28,16 +28,45 @@
         _args params ["_tripod", "_player", "_tripodClassname"];
         TRACE_3("assemble_pickupTripod finish",_tripod,_player,_tripodClassname);
 
+        // Save tripod position before it's deleted
+        private _tripodPos = getPosATL _tripod;
+
+        // Eject dead units (all crew are dead at this point, otherwise condition would have failed), but ignore UAV units
+        {
+            if (unitIsUAV _x) then {
+                _tripod deleteVehicleCrew _x;
+            } else {
+                moveOut _x;
+            };
+        } forEach (crew _tripod);
+
         deleteVehicle _tripod;
-        _player addWeaponGlobal _tripodClassname;
+
         [_player, "PutDown"] call EFUNC(common,doGesture);
+
+        // If the player has space, give it to him
+        if ((alive _player) && {(secondaryWeapon _player) == ""}) exitWith {
+            [_player, _tripodClassname] call CBA_fnc_addWeaponWithoutItems;
+        };
+
+        // Try to find existing weapon holders
+        private _weaponHolder = nearestObject [_tripodPos, "WeaponHolder"];
+
+        // If there are none or too far away, make a new one
+        if (isNull _weaponHolder || {_tripodPos distance _weaponHolder > 2}) then {
+            _weaponHolder = createVehicle ["GroundWeaponHolder", [0, 0, 0], [], 0, "CAN_COLLIDE"];
+            _weaponHolder setDir random [0, 180, 360];
+            _weaponHolder setVehiclePosition [_tripodPos, [], 0, "CAN_COLLIDE"]; // Places object on surface below
+        };
+
+        _weaponHolder addWeaponCargoGlobal [_tripodClassname, 1];
     };
 
     private _condition = {
         params ["_args"];
-        _args params ["_tripod", "_player"];
+        _args params ["_tripod"];
 
-        (alive _tripod) && {secondaryWeapon _player == ""}
+        _tripod call FUNC(canPickupTripod)
     };
 
     TRACE_3("",_pickupTime,typeOf _tripod,_tripodClassname);
diff --git a/addons/csw/functions/fnc_assemble_pickupWeapon.sqf b/addons/csw/functions/fnc_assemble_pickupWeapon.sqf
index 3034e2260c..65dc5fa740 100644
--- a/addons/csw/functions/fnc_assemble_pickupWeapon.sqf
+++ b/addons/csw/functions/fnc_assemble_pickupWeapon.sqf
@@ -1,25 +1,26 @@
 #include "..\script_component.hpp"
 /*
  * Author: tcvm
- * Dismounts the weapon from the tripod and drops its backpack beside
+ * Dismounts the weapon from the tripod and drops its backpack beside.
  *
  * Arguments:
- * 0: Static Weapon <OBJECT>
+ * 0: CSW <OBJECT>
+ * 1: Player <OBJECT>
  *
  * Return Value:
  * None
  *
  * Example:
- * [weapon] call ace_csw_fnc_assemble_pickupWeapon
+ * [cursorObject, player] call ace_csw_fnc_assemble_pickupWeapon
  *
  * Public: No
  */
 
 [{
-    params ["_staticWeapon", "_player"];
-    TRACE_2("assemble_pickupWeapon",_staticWeapon,_player);
+    params ["_vehicle", "_player"];
+    TRACE_2("assemble_pickupWeapon",_vehicle,_player);
 
-    private _weaponConfig = configOf _staticWeapon >> QUOTE(ADDON);
+    private _weaponConfig = configOf _vehicle >> QUOTE(ADDON);
     private _carryWeaponClassname = getText (_weaponConfig >> "disassembleWeapon");
 
     if (!isClass (configFile >> "CfgWeapons" >> _carryWeaponClassname)) exitWith {
@@ -36,18 +37,17 @@
     private _onDisassembleFunc = getText (_weaponConfig >> "disassembleFunc");
 
     private _pickupTime = getNumber (configFile >> "CfgWeapons" >> _carryWeaponClassname >> QUOTE(ADDON) >> "pickupTime");
-    TRACE_4("",typeOf _staticWeapon,_carryWeaponClassname,_turretClassname,_pickupTime);
+    TRACE_4("",typeOf _vehicle,_carryWeaponClassname,_turretClassname,_pickupTime);
 
     private _onFinish = {
         params ["_args"];
-        _args params ["_staticWeapon", "_player", "_carryWeaponClassname", "_turretClassname", "_onDisassembleFunc"];
-        TRACE_4("disassemble finish",_staticWeapon,_player,_carryWeaponClassname,_turretClassname);
+        _args params ["_vehicle", "_player", "_carryWeaponClassname", "_turretClassname", "_onDisassembleFunc"];
+        TRACE_4("disassemble finish",_vehicle,_player,_carryWeaponClassname,_turretClassname);
 
-        private _weaponPos = getPosATL _staticWeapon;
-        _weaponPos set [2, (_weaponPos select 2) + 0.1];
-        private _weaponDir = getDir _staticWeapon;
+        private _weaponPos = (getPosATL _vehicle) vectorAdd [0, 0, 0.1];
+        private _weaponDir = getDir _vehicle;
 
-        private _carryWeaponMag = "";
+        private _carryWeaponMag = [];
         private _carryWeaponMags = compatibleMagazines _carryWeaponClassname;
         LOG("remove ammo");
         {
@@ -55,16 +55,16 @@
             if (_xAmmo == 0) then {continue};
 
             private _carryMag = _xMag call FUNC(getCarryMagazine);
-            if (_carryWeaponMag == "" && {_carryMag in _carryWeaponMags}) then {
+            if (_carryWeaponMag isEqualTo [] && {_carryMag in _carryWeaponMags}) then {
                 TRACE_3("Adding mag to secondary weapon",_xMag,_xAmmo,_carryMag);
-                _carryWeaponMag = _carryMag;
+                _carryWeaponMag = [_carryMag, _xAmmo];
                 DEC(_xAmmo);
             };
             if ((_xAmmo > 0) && {_carryMag != ""}) then {
                 TRACE_2("Removing ammo",_xMag,_carryMag);
                 [_player, _carryMag, _xAmmo] call FUNC(reload_handleReturnAmmo);
             };
-        } forEach (magazinesAllTurrets _staticWeapon);
+        } forEach (magazinesAllTurrets _vehicle);
 
         if (_turretClassname isNotEqualTo "") then {
             private _cswTripod = createVehicle [_turretClassname, [0, 0, 0], [], 0, "NONE"];
@@ -76,39 +76,55 @@
                 _cswTripod setVelocity [0, 0, -0.05];
                 _cswTripod setVectorUp (surfaceNormal _weaponPos);
             }, [_cswTripod, _weaponDir, _weaponPos]] call CBA_fnc_execNextFrame;
-            [_cswTripod, _staticWeapon] call (missionNamespace getVariable _onDisassembleFunc);
+            [_cswTripod, _vehicle] call (missionNamespace getVariable _onDisassembleFunc);
         };
 
         [{
-            params ["_player", "_weaponPos", "_carryWeaponClassname", "_carryWeaponMag"];
+            params ["_player", "_weaponPos", "_carryWeaponClassname", "_carryWeaponMag", "_turretClassname"];
+
+            // Give the weapon to the player if possible
             if ((alive _player) && {(secondaryWeapon _player) == ""}) exitWith {
-                _player addWeapon _carryWeaponClassname;
-                if (_carryWeaponMag isNotEqualTo "") then {
+                [_player, _carryWeaponClassname] call CBA_fnc_addWeaponWithoutItems;
+
+                if (_carryWeaponMag isNotEqualTo []) then {
                     _player addWeaponItem [_carryWeaponClassname, _carryWeaponMag, true];
                 };
             };
-            private _weaponRelPos = _weaponPos getPos RELATIVE_DIRECTION(90);
-            private _weaponHolder = createVehicle ["groundWeaponHolder", [0, 0, 0], [], 0, "NONE"];
-            _weaponHolder setDir random [0, 180, 360];
-            _weaponHolder setPosATL [_weaponRelPos select 0, _weaponRelPos select 1, _weaponPos select 2];
-            if (_carryWeaponMag isEqualTo "") then {
-                _weaponHolder addWeaponCargoGlobal [_carryWeaponClassname, 1];
-            } else {
-                _weaponHolder addWeaponWithAttachmentsCargoGlobal [[_carryWeaponClassname, "", "", "", [_carryWeaponMag, 1], [], ""], 1];
+
+            // If there is no turret, place the ground holder where the turret was
+            if (_turretClassname != "") then {
+                _weaponPos = _weaponPos getPos RELATIVE_DIRECTION(90);
             };
-        }, [_player, _weaponPos, _carryWeaponClassname, _carryWeaponMag]] call CBA_fnc_execNextFrame;
+
+            // Create a new weapon holder (don't try to get an existing one, as no guarantee where it could be)
+            private _weaponHolder = createVehicle ["GroundWeaponHolder", [0, 0, 0], [], 0, "CAN_COLLIDE"];
+            _weaponHolder setDir random [0, 180, 360];
+            _weaponHolder setVehiclePosition [_weaponPos, [], 0, "CAN_COLLIDE"]; // Places object on surface below
+            _weaponHolder addWeaponWithAttachmentsCargoGlobal [[_carryWeaponClassname, "", "", "", _carryWeaponMag, [], ""], 1];
+        }, [_player, _weaponPos, _carryWeaponClassname, _carryWeaponMag, _turretClassname]] call CBA_fnc_execNextFrame;
 
         LOG("delete weapon");
-        deleteVehicle _staticWeapon;
+
+        // Eject dead units (all crew are dead or UAV at this point, otherwise condition would have failed), but ignore UAV units
+        {
+            if (unitIsUAV _x) then {
+                _vehicle deleteVehicleCrew _x;
+            } else {
+                moveOut _x;
+            };
+        } forEach (crew _vehicle);
+
+        deleteVehicle _vehicle;
 
         LOG("end");
     };
 
     private _condition = {
         params ["_args"];
-        _args params ["_staticWeapon"];
-        ((crew _staticWeapon) isEqualTo []) && (alive _staticWeapon)
+        _args params ["_vehicle"];
+
+        _vehicle call FUNC(assemble_canPickupWeapon)
     };
 
-    [TIME_PROGRESSBAR(_pickupTime), [_staticWeapon, _player, _carryWeaponClassname, _turretClassname, _onDisassembleFunc], _onFinish, {}, LLSTRING(DisassembleCSW_progressBar), _condition] call EFUNC(common,progressBar);
+    [TIME_PROGRESSBAR(_pickupTime), [_vehicle, _player, _carryWeaponClassname, _turretClassname, _onDisassembleFunc], _onFinish, {}, LLSTRING(DisassembleCSW_progressBar), _condition] call EFUNC(common,progressBar);
 }, _this] call CBA_fnc_execNextFrame;
diff --git a/addons/csw/functions/fnc_canDeployTripod.sqf b/addons/csw/functions/fnc_canDeployTripod.sqf
index 8969758e4d..9eb7f0a133 100644
--- a/addons/csw/functions/fnc_canDeployTripod.sqf
+++ b/addons/csw/functions/fnc_canDeployTripod.sqf
@@ -1,10 +1,10 @@
 #include "..\script_component.hpp"
 /*
  * Author: tcvm
- * Checks if the unit can deploy a tripod
+ * Checks if the player can deploy the tripod.
  *
  * Arguments:
- * 0: Unit <OBJECT>
+ * 0: Player <OBJECT>
  *
  * Return Value:
  * Can deploy <BOOL>
@@ -15,8 +15,8 @@
  * Public: No
  */
 
-params ["_unit"];
+params ["_player"];
 
-private _secondaryWeapon = secondaryWeapon _unit;
+private _secondaryWeapon = secondaryWeapon _player;
 
 _secondaryWeapon != "" && {getText (configFile >> "CfgWeapons" >> _secondaryWeapon >> QUOTE(ADDON) >> "type") == "mount"} // return
diff --git a/addons/csw/functions/fnc_canGetIn.sqf b/addons/csw/functions/fnc_canGetIn.sqf
index 16446c4fb2..9e017c16ef 100644
--- a/addons/csw/functions/fnc_canGetIn.sqf
+++ b/addons/csw/functions/fnc_canGetIn.sqf
@@ -1,10 +1,10 @@
 #include "..\script_component.hpp"
 /*
  * Author: tcvm
- * Checks if it's possible to get in the CSW
+ * Checks if it's possible to get in the CSW.
  *
  * Arguments:
- * 0: Vehicle <OBJECT>
+ * 0: CSW <OBJECT>
  *
  * Return Value:
  * None
diff --git a/addons/csw/functions/fnc_canPickupTripod.sqf b/addons/csw/functions/fnc_canPickupTripod.sqf
index 0a9f0f5f90..bf25b5a9e8 100644
--- a/addons/csw/functions/fnc_canPickupTripod.sqf
+++ b/addons/csw/functions/fnc_canPickupTripod.sqf
@@ -1,21 +1,20 @@
 #include "..\script_component.hpp"
 /*
  * Author: tcvm
- * Checks if the unit can pickup the tripod
+ * Checks if the player can pickup the tripod.
  *
  * Arguments:
  * 0: Tripod <OBJECT>
- * 1: Unit <OBJECT>
  *
  * Return Value:
  * Can pickup <BOOL>
  *
  * Example:
- * [cursorObject, player] call ace_csw_fnc_canPickupTripod
+ * cursorObject call ace_csw_fnc_canPickupTripod
  *
  * Public: No
  */
 
-params ["_tripod", "_unit"];
+params ["_tripod"];
 
-((secondaryWeapon _unit) == "") && {alive _tripod} // return
+alive _tripod && {((crew _tripod) findIf {alive _x && {!unitIsUAV _x}}) == -1} // return
diff --git a/addons/csw/functions/fnc_getCarryMagazine.sqf b/addons/csw/functions/fnc_getCarryMagazine.sqf
index 81e07c6f10..3d94ca2fe1 100644
--- a/addons/csw/functions/fnc_getCarryMagazine.sqf
+++ b/addons/csw/functions/fnc_getCarryMagazine.sqf
@@ -1,7 +1,7 @@
 #include "..\script_component.hpp"
 /*
  * Author: PabstMirror, Dystopian
- * Gets magazine that the player can carry, suitable to vehicle magazine
+ * Gets magazine that the player can carry, suitable to vehicle magazine.
  *
  * Arguments:
  * 0: Vehicle Magazine <STRING>
diff --git a/addons/csw/functions/fnc_getLoadActions.sqf b/addons/csw/functions/fnc_getLoadActions.sqf
index e505c7f50f..2b28d2dbd6 100644
--- a/addons/csw/functions/fnc_getLoadActions.sqf
+++ b/addons/csw/functions/fnc_getLoadActions.sqf
@@ -1,10 +1,10 @@
 #include "..\script_component.hpp"
 /*
  * Author: PabstMirror
- * Gets sub actions for what the unit can load into the CSW
+ * Gets sub actions for what the player can load into the CSW.
  *
  * Arguments:
- * 0: Vehicle <OBJECT>
+ * 0: CSW <OBJECT>
  * 1: Unit <OBJECT>
  *
  * Return Value:
@@ -35,7 +35,7 @@ private _condition = {
     ([_target, _turretPath, _carryMag, _magSource] call FUNC(reload_canLoadMagazine)) select 0
 };
 
-private _cfgMagazines = configFile >> "CfgMagazines"; // micro-optimization
+private _cfgMagazines = configFile >> "CfgMagazines"; // Micro-optimization
 private _actions = [];
 {
     _x params ["_carryMag", "", "_loadInfo"];
diff --git a/addons/csw/functions/fnc_initVehicle.sqf b/addons/csw/functions/fnc_initVehicle.sqf
index 2d7241029f..80ff071f10 100644
--- a/addons/csw/functions/fnc_initVehicle.sqf
+++ b/addons/csw/functions/fnc_initVehicle.sqf
@@ -1,7 +1,7 @@
 #include "..\script_component.hpp"
 /*
  * Author: tcvm
- * Initializes CSW systems on vehicle
+ * Initializes CSW systems on vehicle.
  *
  * Arguments:
  * 0: Vehicle <OBJECT>
@@ -78,7 +78,7 @@ if (hasInterface && {!(_typeOf in GVAR(initializedStaticTypes))}) then {
         if ((GVAR(ammoHandling) == 0) && {!([false, true, true, GVAR(defaultAssemblyMode)] select (_target getVariable [QGVAR(assemblyMode), 3]))}) exitWith { false };
         [_player, _target, ["isNotSwimming", "isNotSitting"]] call EFUNC(common,canInteractWith)
     };
-    private _childenCode = {
+    private _childrenCode = {
         BEGIN_COUNTER(getActions); // can remove for final release
         private _ret = (call FUNC(getLoadActions)) + (call FUNC(getUnloadActions));
         END_COUNTER(getActions);
@@ -86,10 +86,10 @@ if (hasInterface && {!(_typeOf in GVAR(initializedStaticTypes))}) then {
     };
     if (_configEnabled && {_magazineLocation != ""}) then {
         private _positionCode = compile _magazineLocation;
-        private _ammoAction = [QGVAR(magazine), LLSTRING(AmmoHandling_displayName), "", {}, _condition, _childenCode, [], _positionCode, 4] call EFUNC(interact_menu,createAction);
+        private _ammoAction = [QGVAR(magazine), LLSTRING(AmmoHandling_displayName), "", {}, _condition, _childrenCode, [], _positionCode, 4] call EFUNC(interact_menu,createAction);
         _ammoActionPath = [_typeOf, 0, [], _ammoAction] call EFUNC(interact_menu,addActionToClass);
     } else {
-        private _ammoAction = [QGVAR(magazine), LLSTRING(AmmoHandling_displayName), "", {}, _condition, _childenCode] call EFUNC(interact_menu,createAction);
+        private _ammoAction = [QGVAR(magazine), LLSTRING(AmmoHandling_displayName), "", {}, _condition, _childrenCode] call EFUNC(interact_menu,createAction);
         _ammoActionPath = [_typeOf, 0, ["ACE_MainActions"], _ammoAction] call EFUNC(interact_menu,addActionToClass);
     };
 
diff --git a/addons/csw/functions/fnc_proxyWeapon.sqf b/addons/csw/functions/fnc_proxyWeapon.sqf
index fedd1d412b..42773dc7ec 100644
--- a/addons/csw/functions/fnc_proxyWeapon.sqf
+++ b/addons/csw/functions/fnc_proxyWeapon.sqf
@@ -1,10 +1,10 @@
 #include "..\script_component.hpp"
 /*
  * Author: tcvm, PabstMirror
- * Handles the use of proxy weapons to bypass engine reload times
+ * Handles the use of proxy weapons to fix engine-reload times.
  *
  * Arguments:
- * 0: Vehicle <OBJECT>
+ * 0: CSW <OBJECT>
  * 1: Turret <ARRAY>
  * 2: Proxy weapon needed <BOOL>
  * 2: Weapon should be emptied <BOOL>
diff --git a/addons/csw/functions/fnc_reload_canLoadMagazine.sqf b/addons/csw/functions/fnc_reload_canLoadMagazine.sqf
index 70c673299a..d4049706bd 100644
--- a/addons/csw/functions/fnc_reload_canLoadMagazine.sqf
+++ b/addons/csw/functions/fnc_reload_canLoadMagazine.sqf
@@ -1,16 +1,16 @@
 #include "..\script_component.hpp"
 /*
- * Author: PabstMirror &tcvm
- * Tests if unit can load a magazine into a static weapon.
+ * Author: PabstMirror, tcvm
+ * Tests if unit can load a magazine into a CSW.
  *
  * Arguments:
- * 0: Static Weapon <OBJECT>
+ * 0: CSW <OBJECT>
  * 1: Turret Path <ARRAY>
  * 2: Carryable Magazine <STRING>
- * 3: Supplier <OBJECT>
+ * 3: Supplier <OBJECT> (default: objNull)
  *
  * Return Value:
- * [CanLoad<BOOL>, LoadedMag<STRING>, AmmoNeeded<NUMBER>, IsBeltLinking<BOOL>]<ARRAY>
+ * [Can Load <BOOL>, Loaded Mag <STRING>, Ammo Needed <NUMBER>, Is Belt Linking <BOOL>] <ARRAY>
  *
  * Example:
  * [cursorObject, [0], "ACE_csw_100Rnd_127x99_mag_red", player] call ace_csw_fnc_reload_canLoadMagazine
@@ -28,7 +28,7 @@ if (!alive _vehicle) exitWith { _return };
 // Verify holder has carry magazine
 if (
     (!isNull _magSource) &&
-    {!((_magSource isKindOf "Bag_Base") || {_magSource isKindOf "ContainerSupply"})} && // hacky workaround for magazines within dropped backpacks
+    {!((_magSource isKindOf "Bag_Base") || {_magSource isKindOf "ContainerSupply"})} && // Hacky workaround for magazines within dropped backpacks
     {
         ((_vehicle distance _magSource) > 10) ||
         {((magazineCargo _magSource) findIf {_x == _carryMag}) == -1}
@@ -42,7 +42,7 @@ private _cfgGroupsCarryMag = configFile >> QGVAR(groups) >> _carryMag;
 
 private _desiredAmmo = getNumber (configOf _vehicle >> QUOTE(ADDON) >> "desiredAmmo");
 if (_desiredAmmo == 0) then { _desiredAmmo = 100; };
-private _ammoNeeded = _desiredAmmo min getNumber (_cfgMagazinesCarryMag >> "count"); // assume it needs full carry mag
+private _ammoNeeded = _desiredAmmo min getNumber (_cfgMagazinesCarryMag >> "count"); // Assume it needs full carry mag
 private _loadedMag = "";
 private _isBeltLinking = false;
 
@@ -62,7 +62,7 @@ scopeName "main";
             };
             private _maxMagazineAmmo = _desiredAmmo min getNumber (_cfgMagazines >> _xMag >> "count");
             if (_xAmmo >= _maxMagazineAmmo) exitWith {
-                [false, _loadedMag, -6, false] breakOut "main"; // Already at capicity
+                [false, _loadedMag, -6, false] breakOut "main"; // Already at capacity
             };
             _ammoNeeded = _maxMagazineAmmo - _xAmmo;
             _isBeltLinking = true;
diff --git a/addons/csw/functions/fnc_reload_canUnloadMagazine.sqf b/addons/csw/functions/fnc_reload_canUnloadMagazine.sqf
index 4e03625a29..d7899e655a 100644
--- a/addons/csw/functions/fnc_reload_canUnloadMagazine.sqf
+++ b/addons/csw/functions/fnc_reload_canUnloadMagazine.sqf
@@ -1,10 +1,10 @@
 #include "..\script_component.hpp"
 /*
  * Author: PabstMirror
- * Tests if unit can unload a magazine from a static weapon.
+ * Tests if unit can unload a magazine from a CSW.
  *
  * Arguments:
- * 0: Static Weapon <OBJECT>
+ * 0: CSW <OBJECT>
  * 1: Turret Path <ARRAY>
  * 2: Player <OBJECT>
  * 3: Carryable Magazine <STRING>
diff --git a/addons/csw/functions/fnc_reload_getLoadableMagazines.sqf b/addons/csw/functions/fnc_reload_getLoadableMagazines.sqf
index 724ee4d09c..861f70350d 100644
--- a/addons/csw/functions/fnc_reload_getLoadableMagazines.sqf
+++ b/addons/csw/functions/fnc_reload_getLoadableMagazines.sqf
@@ -1,15 +1,15 @@
 #include "..\script_component.hpp"
 /*
  * Author: PabstMirror
- * Gets magazines that the player is carrying that can be loaded into the static weapon
+ * Gets nearby magazines that can be loaded into the CSW.
  *
  * Arguments:
- * 0: Vehicle <OBJECT>
- * 1: Player <OBJECT>
+ * 0: CSW <OBJECT>
+ * 1: Unit <OBJECT>
  *
  * Return Value:
  * Mags <ARRAY>
- * [Carry Magazine <STRING>, Turret Path <ARRAY>, Load Info <NUMBER>, Magazine Source <OBJECT>]
+ *   [Carry Magazine <STRING>, Turret Path <ARRAY>, Load Info <ARRAY>, Magazine Source <OBJECT>]
  *
  * Example:
  * [cursorObject, player] call ace_csw_fnc_reload_getLoadableMagazines
diff --git a/addons/csw/functions/fnc_reload_getVehicleMagazine.sqf b/addons/csw/functions/fnc_reload_getVehicleMagazine.sqf
index 6b5b77efee..3682651aac 100644
--- a/addons/csw/functions/fnc_reload_getVehicleMagazine.sqf
+++ b/addons/csw/functions/fnc_reload_getVehicleMagazine.sqf
@@ -4,7 +4,7 @@
  * Finds the best vehicle magazines to create from a carryable magazine for a given weapon.
  *
  * Arguments:
- * 0: Vehicle <OBJECT>
+ * 0: CSW <OBJECT>
  * 1: Turret <ARRAY>
  * 2: Magazine that is carryable <STRING>
  *
diff --git a/addons/csw/functions/fnc_reload_handleAddTurretMag.sqf b/addons/csw/functions/fnc_reload_handleAddTurretMag.sqf
index e5aa51d342..389ae699a4 100644
--- a/addons/csw/functions/fnc_reload_handleAddTurretMag.sqf
+++ b/addons/csw/functions/fnc_reload_handleAddTurretMag.sqf
@@ -1,16 +1,16 @@
 #include "..\script_component.hpp"
 /*
  * Author: tcvm, PabstMirror
- * Handles adding ammo to a turret
- * Called from a global event but only runs where turret is local
+ * Handles adding ammo to a turret.
+ * Called from a global event but only runs where turret is local.
  *
  * Arguments:
- * 0: Static Weapon <OBJECT>
+ * 0: CSW <OBJECT>
  * 1: Turret Path <ARRAY>
  * 2: Source of magazine <OBJECT>
  * 3: Vehicle Magazine <STRING>
  * 4: Ammo in magazine <NUMBER>
- * 5: Unit or object to return ammo to <OBJECT>
+ * 5: Unit or object to return ammo to <OBJECT> (default: Source of magazine)
  *
  * Return Value:
  * None
@@ -21,11 +21,12 @@
  * Public: No
  */
 
-params ["_vehicle", "_turret", "_magSource", "_carryMag", "_ammoReceived", ["_returnTo", _magSource]];
+params ["_vehicle", "_turret", "_magSource", "_carryMag", "_ammoReceived"];
+private _returnTo = param [5, _magSource];
 TRACE_6("reload_handleAddTurretMag",_vehicle,_turret,_magSource,_carryMag,_ammoReceived,_returnTo);
 
 TRACE_2("",local _vehicle,_vehicle turretLocal _turret);
-if (!(_vehicle turretLocal _turret)) exitWith {};
+if !(_vehicle turretLocal _turret) exitWith {};
 
 ([_vehicle, _turret, _carryMag] call FUNC(reload_canLoadMagazine)) params ["_canAdd", "_loadedMag", "_neededAmmo", "_isBeltLinking"];
 TRACE_4("canLoad",_canAdd,_loadedMag,_neededAmmo,_isBeltLinking);
diff --git a/addons/csw/functions/fnc_reload_handleRemoveTurretMag.sqf b/addons/csw/functions/fnc_reload_handleRemoveTurretMag.sqf
index 59d948ba27..dccc9b16d4 100644
--- a/addons/csw/functions/fnc_reload_handleRemoveTurretMag.sqf
+++ b/addons/csw/functions/fnc_reload_handleRemoveTurretMag.sqf
@@ -1,13 +1,13 @@
 #include "..\script_component.hpp"
 /*
  * Author: tcvm
- * Handles removing ammo from a turret
- * Called from a global event but only runs where turret is local
+ * Handles removing ammo from a turret.
+ * Called from a global event but only runs where turret is local.
  *
  * Arguments:
- * 0: Static Weapon <OBJECT>
+ * 0: CSW <OBJECT>
  * 1: Turret Path <ARRAY>
- * 2: Magainze Unit Can Carry <STRING>
+ * 2: Magazine Unit Can Carry <STRING>
  * 3: Magazine To Remove From Static <STRING>
  * 4: Unit or container to unload to <OBJECT>
  *
@@ -24,7 +24,7 @@ params ["_vehicle", "_turretPath", "_carryMag", "_vehMag", "_unloadTo"];
 TRACE_5("removeTurretMag EH",_vehicle,_turretPath,_carryMag,_vehMag,_unloadTo);
 
 TRACE_3("",local _vehicle,_vehicle turretLocal _turretPath,local _unloadTo);
-if (!(_vehicle turretLocal _turretPath)) exitWith {};
+if !(_vehicle turretLocal _turretPath) exitWith {};
 
 private _magsInWeapon = [];  // Check how much ammo it has now:
 {
diff --git a/addons/csw/functions/fnc_reload_handleReturnAmmo.sqf b/addons/csw/functions/fnc_reload_handleReturnAmmo.sqf
index ca445400b0..009a39c0d1 100644
--- a/addons/csw/functions/fnc_reload_handleReturnAmmo.sqf
+++ b/addons/csw/functions/fnc_reload_handleReturnAmmo.sqf
@@ -1,7 +1,7 @@
 #include "..\script_component.hpp"
 /*
- * Author: tcvm and PabstMirror
- * Handles returned ammo (either from unloading or leftovers from linking)
+ * Author: tcvm, PabstMirror
+ * Handles returned ammo (either from unloading or leftovers from linking).
  *
  * Arguments:
  * 0: Man or Vehicle <OBJECT>
@@ -18,13 +18,15 @@
  */
 
 params ["_unloadTo", "_carryMag", "_ammo"];
-TRACE_3("reload_handleReturnAmmo",_unloadTo,_carryMag,_ammo);
+TRACE_4("reload_handleReturnAmmo",_unloadTo,typeOf _unloadTo,_carryMag,_ammo);
 
 private _carryMaxAmmo = getNumber (configFile >> "CfgMagazines" >> _carryMag >> "count");
 private _fullMagazines = floor (_ammo / _carryMaxAmmo);
 private _bulletsRemaining = _ammo % _carryMaxAmmo;
 
-if (_unloadTo isKindOf "CaManBase") then {
+private _unloadToUnit = _unloadTo isKindOf "CAManBase";
+
+if (_unloadToUnit) then {
     while {(_fullMagazines > 0) && {[_unloadTo, _carryMag] call CBA_fnc_canAddItem}} do {
         _unloadTo addMagazine [_carryMag, _carryMaxAmmo];
         _fullMagazines = _fullMagazines - 1;
@@ -37,19 +39,21 @@ if (_unloadTo isKindOf "CaManBase") then {
 
 if ((_fullMagazines == 0) && {_bulletsRemaining == 0}) exitWith {};
 
-// Try to use existing container
-private _container = _unloadTo getVariable [QGVAR(container), objNull];
-if ((_container distance _unloadTo) > 10) then { _container = objNull; };
-if (isNull _container) then {
-    _container = (nearestObjects [_unloadTo, [["GroundWeaponHolder"], [QGVAR(ammo_holder)]] select GVAR(handleExtraMagazinesType), 10]) param [0, objNull];
+// Try to use object inventory or existing container
+private _container = [_unloadTo, objNull] select _unloadToUnit;
+if ((maxLoad _container) isEqualTo 0) then {
+    _container = _unloadTo getVariable [QGVAR(container), objNull];
+    if ((_container distance _unloadTo) > 10) then { _container = objNull; };
+    if (isNull _container) then {
+        _container = (nearestObjects [_unloadTo, [["GroundWeaponHolder"], [QGVAR(ammo_holder)]] select GVAR(handleExtraMagazinesType), 10]) param [0, objNull];
+    };
 };
 
-
 if (isNull _container) then {
     // Create ammo storage container
     private _weaponRelPos = _unloadTo getRelPos RELATIVE_DIRECTION(270);
     _weaponRelPos set [2, ((getPosATL _unloadTo) select 2) + 0.05];
-    _container = createVehicle [["GroundWeaponHolder", QGVAR(ammo_holder)] select GVAR(handleExtraMagazinesType), [0, 0, 0], [], 0, "NONE"];
+    _container = createVehicle [["GroundWeaponHolder", QGVAR(ammo_holder)] select GVAR(handleExtraMagazinesType), [0, 0, 0], [], 0, "CAN_COLLIDE"];
     _unloadTo setVariable [QGVAR(container), _container, true];
     _container setDir random [0, 180, 360];
     _container setPosATL _weaponRelPos;
@@ -59,7 +63,7 @@ if (isNull _container) then {
     TRACE_2("Creating NEW Container",_container,_weaponRelPos);
 };
 
-TRACE_3("adding to container",_container,_fullMagazines,_bulletsRemaining);
+TRACE_4("adding to container",_container,typeOf _container,_fullMagazines,_bulletsRemaining);
 
 if (_fullMagazines > 0) then {
     _container addMagazineAmmoCargo [_carryMag, _fullMagazines, _carryMaxAmmo];
diff --git a/addons/csw/functions/fnc_reload_loadMagazine.sqf b/addons/csw/functions/fnc_reload_loadMagazine.sqf
index 50081a87a5..ac6e992fb8 100644
--- a/addons/csw/functions/fnc_reload_loadMagazine.sqf
+++ b/addons/csw/functions/fnc_reload_loadMagazine.sqf
@@ -1,10 +1,10 @@
 #include "..\script_component.hpp"
 /*
  * Author: PabstMirror
- * Loads a magazine into a static weapon from a magazine carried by or next to the player.
+ * Loads a magazine into a CSW from a magazine carried by or next to the player.
  *
  * Arguments:
- * 0: Vehicle <OBJECT>
+ * 0: CSW <OBJECT>
  * 1: Turret <ARRAY>
  * 2: Unit Carried Magazine <STRING>
  * 3: Magazine source <OBJECT>
@@ -52,8 +52,19 @@ private _onFinish = {
     [_magSource, _carryMag, _bestAmmoToSend] call EFUNC(common,removeSpecificMagazine);
     if (_bestAmmoToSend == 0) exitWith {};
 
-    TRACE_6("calling addTurretMag event",_vehicle,_turret,_magSource,_carryMag,_bestAmmoToSend,_unit);
-    [QGVAR(addTurretMag), [_vehicle, _turret, _magSource, _carryMag, _bestAmmoToSend, _unit]] call CBA_fnc_globalEvent;
+    // Workaround for removeSpecificMagazine and WeaponHolders being deleted when empty, give back to the unit if the weapon holder was deleted
+    // TODO: Pass type and position of deleted object to create a new one
+    // TODO: Use '_magSource getEntityInfo 14' in 2.18 and the isSetForDeletion flag to execute in same frame
+    [{
+        params ["_magSource", "_unit", "_args"];
+
+        if (isNull _magSource) then {
+            _args pushBack _unit;
+        };        
+
+        TRACE_1("calling addTurretMag event",_args);
+        [QGVAR(addTurretMag), _args] call CBA_fnc_globalEvent;
+    }, [_magSource, _unit, [_vehicle, _turret, _magSource, _carryMag, _bestAmmoToSend]]] call CBA_fnc_execNextFrame;
 };
 
 
diff --git a/addons/csw/functions/fnc_staticWeaponInit_unloadExtraMags.sqf b/addons/csw/functions/fnc_staticWeaponInit_unloadExtraMags.sqf
index 23155ead0b..1c27a494d5 100644
--- a/addons/csw/functions/fnc_staticWeaponInit_unloadExtraMags.sqf
+++ b/addons/csw/functions/fnc_staticWeaponInit_unloadExtraMags.sqf
@@ -1,11 +1,12 @@
 #include "..\script_component.hpp"
 /*
  * Author: tcvm, PabstMirror
- * Dumps ammo to container
+ * Dumps ammo to container.
  *
  * Arguments:
- * 0: Weapon <OBJECT>
+ * 0: CSW <OBJECT>
  * 1: Using advanced assembly <BOOL>
+ * 2: Empty weapon <BOOL>
  *
  * Return Value:
  * None
@@ -16,11 +17,11 @@
  * Public: No
  */
 
-params ["_staticWeapon", "_assemblyMode", "_emptyWeapon"];
-TRACE_3("staticWeaponInit_unloadExtraMags",_staticWeapon,_assemblyMode,_emptyWeapon);
+params ["_vehicle", "_assemblyMode", "_emptyWeapon"];
+TRACE_3("staticWeaponInit_unloadExtraMags",_vehicle,_assemblyMode,_emptyWeapon);
 if (!_assemblyMode) exitWith {};
 
-private _desiredAmmo = getNumber (configOf _staticWeapon >> QUOTE(ADDON) >> "desiredAmmo");
+private _desiredAmmo = getNumber (configOf _vehicle >> QUOTE(ADDON) >> "desiredAmmo");
 private _storeExtraMagazines = GVAR(handleExtraMagazines);
 if (_emptyWeapon) then {
     _desiredAmmo = 0;
@@ -56,31 +57,55 @@ private _containerMagazineCount = [];
     } else {
         if ((_xMag select [0,4]) != "fake") then { WARNING_1("Unable to unload [%1] - No matching carry mag",_xMag); };
     };
-} forEach (magazinesAllTurrets _staticWeapon);
+} forEach (magazinesAllTurrets _vehicle);
 
 
 TRACE_1("Remove all loaded magazines",_magsToRemove);
 {
-    _staticWeapon removeMagazinesTurret _x;
+    _vehicle removeMagazinesTurret _x;
     if ((_loadedMagazineInfo select [0,2]) isEqualTo _x) then {
         TRACE_1("Re-add the starting mag",_loadedMagazineInfo);
-        _staticWeapon addMagazineTurret _loadedMagazineInfo;
+        _vehicle addMagazineTurret _loadedMagazineInfo;
     };
 } forEach _magsToRemove;
 
-if (_staticWeapon getVariable [QGVAR(secondaryWeaponMagazine), ""] isNotEqualTo "") then {
-    private _secondaryWeaponMagazine = _staticWeapon getVariable QGVAR(secondaryWeaponMagazine);
-    private _turret = allTurrets _staticWeapon param [0, []];
-    private _vehicleMag = [_staticWeapon, _turret, _secondaryWeaponMagazine] call FUNC(reload_getVehicleMagazine);
-    TRACE_3("Re-add previous mag",_secondaryWeaponMagazine,_turret,_vehicleMag);
-    if (!isClass (configFile >> "CfgMagazines" >> _vehicleMag)) exitWith {};
-    _staticWeapon addMagazineTurret [_vehicleMag, _turret, 1];
-    _staticWeapon setVariable [QGVAR(secondaryWeaponMagazine), nil];
+private _secondaryWeaponMagazines = _vehicle getVariable [QGVAR(secondaryWeaponMagazines), []];
+
+if (_secondaryWeaponMagazines isNotEqualTo []) then {
+    // Check if the static weapon can take magazines
+    private _turret = (allTurrets _vehicle) param [0, []];
+    private _compatibleMagazinesTurret = flatten ((_vehicle weaponsTurret _turret) apply {compatibleMagazines _x});
+    private _container = objNull;
+
+    {
+        private _vehicleMag = [_vehicle, _turret, _x select 0] call FUNC(reload_getVehicleMagazine);
+        TRACE_3("Re-add previous mag",_x select 0,_turret,_vehicleMag);
+
+        // If the magazine can be added to the static weapon, do it now
+        if (_vehicleMag in _compatibleMagazinesTurret) then {
+            _vehicle addMagazineTurret [_vehicleMag, _turret, _x select 1];
+        } else {
+            // Find a suitable container to place items in if necessary
+            if (isNull _container) then {
+                _container = (nearestObjects [_vehicle, ["GroundWeaponHolder"], 10]) param [0, objNull];
+
+                // Create ammo storage container
+                if (isNull _container) then {
+                    _container = createVehicle ["GroundWeaponHolder", getPosATL _vehicle, [], 0, "NONE"];
+                };
+            };
+
+            // If the mag can't be added to the static weapon, add it to the ground holder
+            _container addMagazineAmmoCargo [_x select 0, 1, _x select 1];
+        };
+    } forEach _secondaryWeaponMagazines;
+
+    _vehicle setVariable [QGVAR(secondaryWeaponMagazines), nil, true];
 };
 
 if (_storeExtraMagazines) then {
     TRACE_1("saving extra mags to container",_containerMagazineCount);
     {
-        [_staticWeapon, _x, _containerMagazineCount select _forEachIndex] call FUNC(reload_handleReturnAmmo);
+        [_vehicle, _x, _containerMagazineCount select _forEachIndex] call FUNC(reload_handleReturnAmmo);
     } forEach _containerMagazineClassnames;
 };
diff --git a/addons/csw/stringtable.xml b/addons/csw/stringtable.xml
index 7c241a8a51..5d11773490 100644
--- a/addons/csw/stringtable.xml
+++ b/addons/csw/stringtable.xml
@@ -263,7 +263,7 @@
             <Japanese>インタラクションの所要時間係数</Japanese>
             <Chinese>互動時間係數</Chinese>
             <Chinesesimp>交互时间系数</Chinesesimp>
-            <Italian>Coefficente per il tempo di interazione</Italian>
+            <Italian>Coefficiente per il tempo di interazione</Italian>
             <Czech>Koeficient času interakce</Czech>
             <Polish>Współczynnik czasu interakcji</Polish>
             <Spanish>Coeficiente de tiempo de interacción</Spanish>
@@ -672,6 +672,22 @@
             <Russian>[CSW] Лента 20-мм гранат для ст. гранатомёта</Russian>
             <Korean>[CSW] 20mm 고속유탄발사기 탄띠</Korean>
         </Key>
+        <Key ID="STR_ACE_CSW_GMGBelt_descriptionShort">
+            <English>Caliber: 20 mm&lt;br/&gt;Rounds: 20&lt;br /&gt;Used in: Grenade Launcher</English>
+            <Chinese>口徑：20 mm&lt;br/&gt;個數：20&lt;br /&gt;用於：榴彈發射器</Chinese>
+            <French>Calibre : 20 mm&lt;br/&gt;Munitions : 20&lt;br /&gt;Application : lance-grenades</French>
+            <Spanish>Calibre: 20 mm&lt;br/&gt;Cargas: 20&lt;br /&gt;Se usa en: lanzagranadas</Spanish>
+            <Italian>Calibro: 20 mm&lt;br/&gt;Munizioni: 20&lt;br /&gt;Si usa in: lanciagranate</Italian>
+            <Polish>Kaliber: 20 mm&lt;br/&gt;Naboje: 20&lt;br /&gt;Używane w: granatniku</Polish>
+            <Russian>Калибр: 20 мм&lt;br/&gt;Кол-во: 20&lt;br /&gt;Применение: гранатомет</Russian>
+            <German>Kaliber: 20 mm&lt;br/&gt;Patronen: 20&lt;br /&gt;Eingesetzt von: Granatenwerfer</German>
+            <Czech>Ráže: 20 mm&lt;br/&gt;Munice: 20&lt;br /&gt;Použití: Granátomet</Czech>
+            <Portuguese>Calibre: 20 mm&lt;br/&gt;Balas: 20&lt;br /&gt;Uso em: Lança-granadas</Portuguese>
+            <Korean>구경: 20mm&lt;br /&gt;탄 수: 20&lt;br /&gt;사용 가능: 유탄발사기</Korean>
+            <Chinesesimp>口径：20 毫米&lt;br/&gt;容弹量：20&lt;br /&gt;用于：枪榴弹发射器</Chinesesimp>
+            <Japanese>口径：20 mm &lt;br/&gt;弾薬：20&lt;br /&gt;使用：グレネードランチャー</Japanese>
+            <Turkish>Kalibre: 20 mm&lt;br/&gt;Mermi: 20&lt;br /&gt;Kullanıldığı Yer: Bombaatar</Turkish>
+        </Key>
         <Key ID="STR_ACE_CSW_m3Tripod_displayName">
             <English>M3 Tripod</English>
             <Spanish>Trípode M3</Spanish>
diff --git a/addons/dagr/XEH_postInit.sqf b/addons/dagr/XEH_postInit.sqf
index 6996ced7f2..34dc981843 100644
--- a/addons/dagr/XEH_postInit.sqf
+++ b/addons/dagr/XEH_postInit.sqf
@@ -30,4 +30,4 @@ GVAR(vectorConnected) = false;
 GVAR(noVectorData) = true;
 GVAR(vectorGrid) = "00000000";
 
-[QEGVAR(vector,rangefinderData), FUNC(handleRangeFinderData)] call CBA_fnc_addEventHandler;
+[QEGVAR(vector,rangefinderData), LINKFUNC(handleRangeFinderData)] call CBA_fnc_addEventHandler;
diff --git a/addons/disarming/functions/fnc_disarmDropItems.sqf b/addons/disarming/functions/fnc_disarmDropItems.sqf
index e1a4c379b4..6e842e739a 100644
--- a/addons/disarming/functions/fnc_disarmDropItems.sqf
+++ b/addons/disarming/functions/fnc_disarmDropItems.sqf
@@ -30,7 +30,7 @@ private _fncSumArray = {
 };
 
 //Sanity Checks
-if (!([_target] call FUNC(canBeDisarmed))) exitWith {
+if !([_target] call FUNC(canBeDisarmed)) exitWith {
     [_caller, _target, "Debug: Cannot disarm target"] call FUNC(eventTargetFinish);
 };
 if (_doNotDropAmmo && {({_x in _listOfItemsToRemove} count (magazines _target)) > 0}) exitWith {
@@ -74,7 +74,6 @@ if (_holder getVariable [QGVAR(holderInUse), false]) exitWith {
 };
 _holder setVariable [QGVAR(holderInUse), true];
 
-
 //Remove Magazines
 private _targetMagazinesStart = magazinesAmmo _target;
 private _holderMagazinesStart = magazinesAmmoCargo _holder;
@@ -96,7 +95,7 @@ if (({((_x select 0) in _listOfItemsToRemove) && {(getNumber (configFile >> "Cfg
     [_caller, _target, "Debug: Didn't Remove Magazines"] call FUNC(eventTargetFinish);
 };
 //Verify holder has mags unit had
-if (!([_targetMagazinesStart, _targetMagazinesEnd, _holderMagazinesStart, _holderMagazinesEnd] call FUNC(verifyMagazinesMoved))) then {
+if !([_targetMagazinesStart, _targetMagazinesEnd, _holderMagazinesStart, _holderMagazinesEnd] call FUNC(verifyMagazinesMoved)) then {
     _holder setVariable [QGVAR(holderInUse), false];
     [_caller, _target, "Debug: Crate Magazines not in holder"] call FUNC(eventTargetFinish);
 };
@@ -238,7 +237,7 @@ if (_holderIsEmpty) then {
             [_caller, _target, "Debug: Drop Actions Timeout"] call FUNC(eventTargetFinish);
         };
         //If target lost disarm status:
-        if (!([_target] call FUNC(canBeDisarmed))) exitWith {
+        if !([_target] call FUNC(canBeDisarmed)) exitWith {
             _holder setVariable [QGVAR(holderInUse), false];
             [_caller, _target, "Debug: Target cannot be disarmed"] call FUNC(eventTargetFinish);
         };
diff --git a/addons/disarming/functions/fnc_eventTargetStart.sqf b/addons/disarming/functions/fnc_eventTargetStart.sqf
index 7173f66a76..a7154ce2e4 100644
--- a/addons/disarming/functions/fnc_eventTargetStart.sqf
+++ b/addons/disarming/functions/fnc_eventTargetStart.sqf
@@ -32,7 +32,7 @@ private _itemsToAdd = [];
 } forEach _listOfObjectsToRemove;
 
 {
-    if (!(_x in _listOfObjectsToRemove)) then {
+    if !(_x in _listOfObjectsToRemove) then {
         _listOfObjectsToRemove pushBack _x;
     };
 } forEach _itemsToAdd;
diff --git a/addons/disarming/functions/fnc_openDisarmDialog.sqf b/addons/disarming/functions/fnc_openDisarmDialog.sqf
index da9a860678..6cf15f4cad 100644
--- a/addons/disarming/functions/fnc_openDisarmDialog.sqf
+++ b/addons/disarming/functions/fnc_openDisarmDialog.sqf
@@ -16,11 +16,14 @@
  *
  * Public: No
  */
+
 params ["_caller", "_target"];
-#define DEFUALTPATH "\A3\Ui_f\data\GUI\Cfg\Ranks\%1_gs.paa"
+
+#define DEFAULTPATH "\A3\Ui_f\data\GUI\Cfg\Ranks\%1_gs.paa"
+
 //Sanity Checks
 if (_caller != ACE_player) exitWith {ERROR("Player isn't caller?");};
-if (!([_player, _target] call FUNC(canPlayerDisarmUnit))) exitWith {ERROR("Can't Disarm Unit");};
+if !([_player, _target] call FUNC(canPlayerDisarmUnit)) exitWith {ERROR("Can't Disarm Unit");};
 if (dialog) then {ERROR("Dialog open when trying to open disarm dialog"); closeDialog 0;};
 
 disableSerialization;
@@ -74,8 +77,8 @@ GVAR(disarmTarget) = _target;
         private _rankPicture = _display displayCtrl 1203;
 
         //Show rank and name (just like BIS's inventory)
-        private _icon = format [DEFUALTPATH, toLowerANSI (rank _target)];
-        if (_icon isEqualTo DEFUALTPATH) then {_icon = ""};
+        private _icon = format [DEFAULTPATH, toLowerANSI (rank _target)];
+        if (_icon isEqualTo DEFAULTPATH) then {_icon = ""};
         _rankPicture ctrlSetText _icon;
         _playerName ctrlSetText ([GVAR(disarmTarget), false, true] call EFUNC(common,getName));
 
diff --git a/addons/dogtags/CfgEventHandlers.hpp b/addons/dogtags/CfgEventHandlers.hpp
index 2a3f71f852..f6503c2479 100644
--- a/addons/dogtags/CfgEventHandlers.hpp
+++ b/addons/dogtags/CfgEventHandlers.hpp
@@ -3,11 +3,13 @@ class Extended_PreStart_EventHandlers {
         init = QUOTE(call COMPILE_SCRIPT(XEH_preStart));
     };
 };
+
 class Extended_PreInit_EventHandlers {
     class ADDON {
         init = QUOTE(call COMPILE_SCRIPT(XEH_preInit));
     };
 };
+
 class Extended_PostInit_EventHandlers {
     class ADDON {
         init = QUOTE(call COMPILE_SCRIPT(XEH_postInit));
diff --git a/addons/dogtags/CfgVehicles.hpp b/addons/dogtags/CfgVehicles.hpp
index cc56410699..56be52b53e 100644
--- a/addons/dogtags/CfgVehicles.hpp
+++ b/addons/dogtags/CfgVehicles.hpp
@@ -4,7 +4,7 @@ class CfgVehicles {
         class ACE_Actions {
             class ACE_Dogtag {
                 displayName = CSTRING(itemName);
-                condition = QUOTE([ARR_2(_player,_target)] call FUNC(canTakeDogtag));
+                condition = QUOTE([ARR_2(_player,_target)] call FUNC(canCheckDogtag));
                 statement = "";
                 exceptions[] = {"isNotSwimming", "isNotInside"};
                 showDisabled = 0;
diff --git a/addons/dogtags/CfgWeapons.hpp b/addons/dogtags/CfgWeapons.hpp
index 0f795d8d08..ac73ee68f7 100644
--- a/addons/dogtags/CfgWeapons.hpp
+++ b/addons/dogtags/CfgWeapons.hpp
@@ -16,8 +16,8 @@ class CfgWeapons {
         author = ECSTRING(common,ACETeam);
         scope = 0;
         displayName = CSTRING(itemName);
-        model = QUOTE(PATHTOF(data\ace_dogtag.p3d));
-        picture = QUOTE(PATHTOF(data\dogtagSingle.paa));
+        model = QPATHTOF(data\ace_dogtag.p3d);
+        picture = QPATHTOF(data\dogtagSingle.paa);
         class ItemInfo: CBA_MiscItem_ItemInfo {
             mass = 0; //too small to for 1 ?
         };
diff --git a/addons/dogtags/XEH_PREP.hpp b/addons/dogtags/XEH_PREP.hpp
index 5917600139..9ff33a26a2 100644
--- a/addons/dogtags/XEH_PREP.hpp
+++ b/addons/dogtags/XEH_PREP.hpp
@@ -1,15 +1,11 @@
-
 PREP(addDogtagActions);
-PREP(addDogtagItem);
 PREP(bloodType);
 PREP(canCheckDogtag);
 PREP(canTakeDogtag);
 PREP(checkDogtag);
-PREP(checkDogtagItem);
+PREP(disableFactionDogtags);
 PREP(getDogtagData);
 PREP(getDogtagItem);
-PREP(sendDogtagData);
 PREP(showDogtag);
 PREP(ssn);
 PREP(takeDogtag);
-PREP(disableFactionDogtags);
diff --git a/addons/dogtags/XEH_postInit.sqf b/addons/dogtags/XEH_postInit.sqf
index d9c35dc172..c072090a60 100644
--- a/addons/dogtags/XEH_postInit.sqf
+++ b/addons/dogtags/XEH_postInit.sqf
@@ -1,19 +1,99 @@
 #include "script_component.hpp"
 
-[QGVAR(showDogtag), LINKFUNC(showDogtag)] call CBA_fnc_addEventHandler;
-[QGVAR(sendDogtagData), LINKFUNC(sendDogtagData)] call CBA_fnc_addEventHandler;
-[QGVAR(getDogtagItem), LINKFUNC(getDogtagItem)] call CBA_fnc_addEventHandler;
-[QGVAR(addDogtagItem), LINKFUNC(addDogtagItem)] call CBA_fnc_addEventHandler;
+if (hasInterface || isServer) then {
+    [QGVAR(broadcastDogtagInfo), {
+        GVAR(dogtagsData) set _this;
+        
+        if (isNil "CBA_fnc_renameInventoryItem") exitWith {}; // requires https://github.com/CBATeam/CBA_A3/pull/1329
+        params ["_item", "_dogTagData"];
+        private _name = _dogtagData param [0, ""];
 
-// Add actions and event handlers only if ace_medical is loaded
+        // If data doesn't exist or body has no name, set name as "unknown"
+        if (_name == "") then {
+            _name = LELSTRING(common,unknown);
+        };
+        
+        _name = [LLSTRING(itemName), ": ", _name] joinString "";
+        [_item, _name] call CBA_fnc_renameInventoryItem;
+    }] call CBA_fnc_addEventHandler;
+
+    if (isServer) then {
+        // Sync dogtag data from server to client
+        [QGVAR(requestSyncDogtagDataJIP), {
+            params ["_clientOwner"];
+
+            {
+                [QGVAR(broadcastDogtagInfo), [_x, _y], _clientOwner] call CBA_fnc_ownerEvent;
+            } forEach GVAR(dogtagsData);
+        }] call CBA_fnc_addEventHandler;
+
+        [QGVAR(getDogtagItem), LINKFUNC(getDogtagItem)] call CBA_fnc_addEventHandler;
+    } else {
+        // To be here, hasInterface must be true
+        [QGVAR(requestSyncDogtagDataJIP), clientOwner] call CBA_fnc_serverEvent;
+    };
+};
+
+if (hasInterface) then {
+    // If the arsenal is loaded, show the custom names for dog tags when in the arsenal
+    if (["ace_arsenal"] call EFUNC(common,isModLoaded)) then {
+        [QEGVAR(arsenal,rightPanelFilled), {
+            params ["_display", "_leftPanelIDC", "_rightPanelIDC"];
+
+            if !(_leftPanelIDC in [2010, 2012, 2014] && {_rightPanelIDC == 38}) exitWith {};
+
+            private _rightPanel = _display displayCtrl 15;
+            private _cfgWeapons = configFile >> "CfgWeapons";
+
+            TRACE_1("passed",_rightPanel);
+
+            for "_i" from 0 to (lnbSize _rightPanel select 0) - 1 do {
+                private _item = _rightPanel lnbData [_i, 0];
+
+                if (_item isKindOf ["ACE_dogtag", _cfgWeapons]) then {
+                    private _name = (GVAR(dogtagsData) getOrDefault [_item, []]) param [0, ""];
+
+                    // If data doesn't exist or body has no name, set name as "unknown"
+                    if (_name == "") then {
+                        _name = LELSTRING(common,unknown);
+                    };
+
+                    _rightPanel lnbSetText [[_i, 1], [LLSTRING(itemName), ": ", _name] joinString ""];
+                };
+            };
+        }] call CBA_fnc_addEventHandler;
+    };
+
+    // Add context menu option
+    [
+        "ACE_dogtag",
+        ["GROUND", "CARGO", "CONTAINER"],
+        LLSTRING(checkItem),
+        nil,
+        QPATHTOF(data\dogtag_icon_ca.paa),
+        [
+            {true},
+            {true}
+        ],
+        {
+            [GVAR(dogtagsData) getOrDefault [_this select 2, []]] call FUNC(showDogtag);
+
+            false
+        }
+    ] call CBA_fnc_addItemContextMenuOption;
+};
+
+// Add actions and event handlers only if ace_medical is enabled
 // - Adding actions via config would create a dependency
-if (["ace_medical"] call EFUNC(common,isModLoaded)) then {
+["CBA_settingsInitialized", {
+    if !(GETEGVAR(medical,enabled,false)) exitWith {};
+
     if (hasInterface) then {
         private _checkTagAction = [
             "ACE_CheckDogtag",
-            format ["%1: %2", localize LSTRING(itemName), localize LSTRING(checkDogtag)],
+            format ["%1: %2", LLSTRING(itemName), LLSTRING(checkDogtag)],
             QPATHTOF(data\dogtag_icon_ca.paa),
-            {[_player,_target] call FUNC(checkDogtag)},
+            {[_player, _target] call FUNC(checkDogtag)},
             {!isNil {_target getVariable QGVAR(dogtagData)}}
         ] call EFUNC(interact_menu,createAction);
 
@@ -21,9 +101,9 @@ if (["ace_medical"] call EFUNC(common,isModLoaded)) then {
 
         private _takeTagAction = [
             "ACE_TakeDogtag",
-            format ["%1: %2", localize LSTRING(itemName), localize LSTRING(takeDogtag)],
+            format ["%1: %2", LLSTRING(itemName), LLSTRING(takeDogtag)],
             QPATHTOF(data\dogtag_icon_ca.paa),
-            {[_player,_target] call FUNC(takeDogtag)},
+            {[_player, _target] call FUNC(takeDogtag)},
             {(!isNil {_target getVariable QGVAR(dogtagData)}) && {((_target getVariable [QGVAR(dogtagTaken), objNull]) != _target)}}
         ] call EFUNC(interact_menu,createAction);
 
@@ -33,46 +113,19 @@ if (["ace_medical"] call EFUNC(common,isModLoaded)) then {
     if (isServer) then {
         ["ace_placedInBodyBag", {
             params ["_target", "_bodyBag", "_isGrave"];
+
             if (_isGrave) exitWith {};
             TRACE_2("ace_placedInBodyBag eh",_target,_bodyBag);
 
-            private _dogTagData = [_target] call FUNC(getDogtagData);
-            _bodyBag setVariable [QGVAR(dogtagData), _dogTagData, true];
+            private _dogtagData = _target call FUNC(getDogtagData);
+            _bodyBag setVariable [QGVAR(dogtagData), _dogtagData, true];
 
             if ((_target getVariable [QGVAR(dogtagTaken), objNull]) == _target) then {
                 _bodyBag setVariable [QGVAR(dogtagTaken), _bodyBag, true];
             };
         }] call CBA_fnc_addEventHandler;
     };
-};
+}] call CBA_fnc_addEventHandler;
 
-// If the arsenal is loaded, show the custom names for dog tags when in the arsenal
-if (["ace_arsenal"] call EFUNC(common,isModLoaded)) then {
-    [QEGVAR(arsenal,rightPanelFilled), {
-        params ["_display", "_leftPanelIDC", "_rightPanelIDC"];
-
-        if (_leftPanelIDC in [2010, 2012, 2014] && {_rightPanelIDC == 38}) then {
-            LOG("passed");
-            private _rightPanel = _display displayCtrl 15;
-            private _allDogtags = missionNamespace getVariable [QGVAR(allDogtags), []];
-            private _allDogtagsData = missionNamespace getVariable [QGVAR(allDogtagDatas), []];
-            private _cfgWeapons = configFile >> "CfgWeapons";
-            private _item = "";
-            private _dogtagData = [];
-
-            for "_i" from 0 to (lnbSize _rightPanel select 0) - 1 do {
-                _item = _rightPanel lnbData [_i, 0];
-
-                if (_item isKindOf ["ACE_dogtag", _cfgWeapons]) then {
-                    _dogtagData = _allDogtagsData param [_allDogtags find _item, []];
-
-                    // If data doesn't exist, put name as "unknown"
-                    _rightPanel lnbSetText [[_i, 1], [LLSTRING(itemName), ": ", _dogtagData param [0, LELSTRING(common,unknown)]] joinString ""];
-                };
-            };
-        };
-    }] call CBA_fnc_addEventHandler;
-};
-
-// Disable dogtags for civilians
+// Disable dog tags for civilians
 "CIV_F" call FUNC(disableFactionDogtags);
diff --git a/addons/dogtags/XEH_preInit.sqf b/addons/dogtags/XEH_preInit.sqf
index 5ad43b0229..482551de0a 100644
--- a/addons/dogtags/XEH_preInit.sqf
+++ b/addons/dogtags/XEH_preInit.sqf
@@ -6,6 +6,14 @@ PREP_RECOMPILE_START;
 #include "XEH_PREP.hpp"
 PREP_RECOMPILE_END;
 
-GVAR(disabledFactions) = [] call CBA_fnc_createNamespace;
+GVAR(disabledFactions) = createHashMap;
+
+if (hasInterface || isServer) then {
+    GVAR(dogtagsData) = createHashMap;
+
+    if (!isServer) exitWith {};
+
+    GVAR(idCounter) = 0;
+};
 
 ADDON = true;
diff --git a/addons/dogtags/functions/fnc_addDogtagActions.sqf b/addons/dogtags/functions/fnc_addDogtagActions.sqf
index 7c7a2e5e8f..9b2f3147b5 100644
--- a/addons/dogtags/functions/fnc_addDogtagActions.sqf
+++ b/addons/dogtags/functions/fnc_addDogtagActions.sqf
@@ -1,7 +1,7 @@
 #include "..\script_component.hpp"
 /*
  * Author: SzwedzikPL, mharis001
- * Returns children actions for checking dogtags in player's inventory.
+ * Returns children actions for checking dog tags in the player's inventory.
  *
  * Arguments:
  * 0: Player <OBJECT>
@@ -10,7 +10,7 @@
  * Actions <ARRAY>
  *
  * Example:
- * [_player] call ace_dogtags_fnc_addDogtagActions
+ * player call ace_dogtags_fnc_addDogtagActions
  *
  * Public: No
  */
@@ -23,12 +23,21 @@ private _fnc_getActions = {
 
     {
         private _config = _cfgWeapons >> _x;
-        if (getNumber (_config >> QGVAR(tagID)) > 0) then {
-            private _displayName = getText (_config >> "displayName");
-            private _picture = getText (_config >> "picture");
 
-            private _action = [_x, _displayName, _picture, FUNC(checkDogtagItem), {true}, {}, _x] call EFUNC(interact_menu,createAction);
-            _actions pushBack [_action, [], _player];
+        if (getNumber (_config >> QGVAR(tagID)) > 0) then {
+            _actions pushBack [
+                [
+                    _x,
+                    getText (_config >> "displayName"),
+                    getText (_config >> "picture"),
+                    {[GVAR(dogtagsData) getOrDefault [_this select 2, []]] call FUNC(showDogtag)},
+                    {true},
+                    {},
+                    _x
+                ] call EFUNC(interact_menu,createAction),
+                [],
+                _player
+            ];
         };
     } forEach (_player call EFUNC(common,uniqueItems));
 
diff --git a/addons/dogtags/functions/fnc_addDogtagItem.sqf b/addons/dogtags/functions/fnc_addDogtagItem.sqf
deleted file mode 100644
index 970bb1926e..0000000000
--- a/addons/dogtags/functions/fnc_addDogtagItem.sqf
+++ /dev/null
@@ -1,31 +0,0 @@
-#include "..\script_component.hpp"
-/*
- * Author: SzwedzikPL
- * Adds dogtag item to unit (triggered by server).
- *
- * Arguments:
- * 0: Item class <STRING>
- * 1: Dogtag data <ARRAY>
- *
- * Return Value:
- * None
- *
- * Example:
- * ["itemClass", ["name", "610-27-5955", "A POS"]] call ace_dogtags_fnc_addDogtagItem
- *
- * Public: No
- */
-
-params ["_item", "_dogtagData"];
-
-if (_item == "") exitWith {};
-
-[ace_player, _item] call CBA_fnc_addItem;
-
-_dogtagData params ["_nickName"];
-private _displayText = format [localize LSTRING(takeDogtagSuccess), _nickName];
-
-// display message
-[{
-    [_this, 2.5] call EFUNC(common,displayTextStructured);
-}, _displayText, DOGTAG_SHOW_DELAY] call CBA_fnc_waitAndExecute;
diff --git a/addons/dogtags/functions/fnc_bloodType.sqf b/addons/dogtags/functions/fnc_bloodType.sqf
index 5e03c586fa..53b6007370 100644
--- a/addons/dogtags/functions/fnc_bloodType.sqf
+++ b/addons/dogtags/functions/fnc_bloodType.sqf
@@ -1,16 +1,16 @@
 #include "..\script_component.hpp"
 /*
  * Author: commy2
- * Reports a blood type depending on the units name.
+ * Reports a blood type depending on the unit's name.
  *
  * Arguments:
- * 0: Name of a unit <STRING>
+ * 0: Unit name <STRING>
  *
  * Return Value:
  * A random blood type <STRING>
  *
  * Example:
- * _bloodType = ["name"] call ace_dogtags_fnc_bloodType
+ * "name" call ace_dogtags_fnc_bloodType
  *
  * Public: No
  */
diff --git a/addons/dogtags/functions/fnc_canCheckDogtag.sqf b/addons/dogtags/functions/fnc_canCheckDogtag.sqf
index 399ad5db25..a5ed987fc0 100644
--- a/addons/dogtags/functions/fnc_canCheckDogtag.sqf
+++ b/addons/dogtags/functions/fnc_canCheckDogtag.sqf
@@ -1,26 +1,26 @@
 #include "..\script_component.hpp"
 /*
  * Author: SzwedzikPL
- * Checks if dogtag can be checked.
+ * Checks if the target's dog tag can be checked by the unit.
  *
  * Arguments:
- * 0: Player <OBJECT>
+ * 0: Player (not used) <OBJECT>
  * 1: Target <OBJECT>
  *
  * Return Value:
- * True if dogtag can be checked <BOOL>
+ * If dog tag can be checked <BOOL>
  *
  * Example:
- * _canCheck = [player, unit] call ace_dogtags_fnc_canCheckDogtag
+ * [player, cursorObject] call ace_dogtags_fnc_canCheckDogtag
  *
  * Public: No
  */
 
-params ["_player", "_target"];
+params ["", "_target"];
 
 if (isNull _target) exitWith {false};
 
-// check if disabled for faction
-if ([GVAR(disabledFactions) getVariable faction _target] param [0, false]) exitWith {false};
+// Check if disabled for faction
+if ((faction _target) in GVAR(disabledFactions)) exitWith {false};
 
-(!alive _target) || {_target getVariable ["ACE_isUnconscious", false]}
+!(_target call EFUNC(common,isAwake))
diff --git a/addons/dogtags/functions/fnc_canTakeDogtag.sqf b/addons/dogtags/functions/fnc_canTakeDogtag.sqf
index 7ae38f7c41..c56db0b893 100644
--- a/addons/dogtags/functions/fnc_canTakeDogtag.sqf
+++ b/addons/dogtags/functions/fnc_canTakeDogtag.sqf
@@ -1,17 +1,17 @@
 #include "..\script_component.hpp"
 /*
  * Author: SzwedzikPL
- * Checks if dogtag can be taken.
+ * Checks if the target's dog tag can be taken by the unit.
  *
  * Arguments:
  * 0: Player <OBJECT>
  * 1: Target <OBJECT>
  *
  * Return Value:
- * True if dogtag can be taken <BOOL>
+ * If dog tag can be taken <BOOL>
  *
  * Example:
- * _canTake = [player, unit] call ace_dogtags_fnc_canTakeDogtag
+ * [player, cursorObject] call ace_dogtags_fnc_canTakeDogtag
  *
  * Public: No
  */
@@ -20,7 +20,10 @@ params ["_player", "_target"];
 
 if (isNull _target) exitWith {false};
 
-// check if disabled for faction
-if ([GVAR(disabledFactions) getVariable faction _target] param [0, false]) exitWith {false};
+// Check if disabled for faction
+if ((faction _target) in GVAR(disabledFactions)) exitWith {false};
 
-(!alive _target) || {_target getVariable ["ACE_isUnconscious", false]}
+// CBA_fnc_canAddItem doesn't account for mass 0 items and unit not having any containers
+!(_target call EFUNC(common,isAwake)) && {(uniform _player + vest _player + backpack _player) != ""} && {[_player, "ACE_dogtag_1"] call CBA_fnc_canAddItem}
+// Todo: Use code below in 2.18
+// _player canAdd ["ACE_dogtag_1", 1, true]
diff --git a/addons/dogtags/functions/fnc_checkDogtag.sqf b/addons/dogtags/functions/fnc_checkDogtag.sqf
index dcceb8c2c0..4b2f2d533f 100644
--- a/addons/dogtags/functions/fnc_checkDogtag.sqf
+++ b/addons/dogtags/functions/fnc_checkDogtag.sqf
@@ -1,7 +1,7 @@
 #include "..\script_component.hpp"
 /*
  * Author: SzwedzikPL
- * Checks unit dogtag.
+ * Checks the unit's dog tag.
  *
  * Arguments:
  * 0: Player <OBJECT>
@@ -11,17 +11,17 @@
  * None
  *
  * Example:
- * [player, unit] call ace_dogtags_fnc_checkDogtag
+ * [player, cursorObject] call ace_dogtags_fnc_checkDogtag
  *
  * Public: No
  */
 
 params ["_player", "_target"];
 
-// animation
+// Animation
 _player call EFUNC(common,goKneeling);
 
-// sound
+// Sound
 private _position = _target modelToWorldWorld (_target selectionPosition "neck");
 
 playSound3D [
@@ -34,10 +34,8 @@ playSound3D [
     50
 ];
 
-// display dogtag
+// Display dog tag
 private _doubleTags = (_target getVariable [QGVAR(dogtagTaken), objNull]) != _target;
-private _dogTagData = [_target] call FUNC(getDogTagData);
+private _dogtagData = _target call FUNC(getDogtagData);
 
-[{
-    [QGVAR(showDogtag), _this] call CBA_fnc_localEvent;
-}, [_dogTagData, _doubleTags], DOGTAG_SHOW_DELAY] call CBA_fnc_waitAndExecute;
+[LINKFUNC(showDogtag), [_dogtagData, _doubleTags], DOGTAG_SHOW_DELAY] call CBA_fnc_waitAndExecute;
diff --git a/addons/dogtags/functions/fnc_checkDogtagItem.sqf b/addons/dogtags/functions/fnc_checkDogtagItem.sqf
deleted file mode 100644
index 09526d83ed..0000000000
--- a/addons/dogtags/functions/fnc_checkDogtagItem.sqf
+++ /dev/null
@@ -1,22 +0,0 @@
-#include "..\script_component.hpp"
-/*
- * Author: SzwedzikPL
- * Check dogtag self menu action.
- *
- * Arguments:
- * 0: Player <OBJECT>
- * 1: Target <OBJECT>
- * 2: Item class <STRING>
- *
- * Return Value:
- * None
- *
- * Example:
- * [player, unit, "itemClass"] call ace_dogtags_fnc_checkDogtagItem
- *
- * Public: No
- */
-
-params ["_player", "_target", "_item"];
-
-[QGVAR(sendDogtagData), [_player, _item]] call CBA_fnc_serverEvent;
diff --git a/addons/dogtags/functions/fnc_disableFactionDogtags.sqf b/addons/dogtags/functions/fnc_disableFactionDogtags.sqf
index f1ea5f5c06..b1ac145d9a 100644
--- a/addons/dogtags/functions/fnc_disableFactionDogtags.sqf
+++ b/addons/dogtags/functions/fnc_disableFactionDogtags.sqf
@@ -1,7 +1,7 @@
 #include "..\script_component.hpp"
 /*
  * Author: commy2
- * Disable this faction from using dogtags.
+ * Disables this faction from using dog tags.
  *
  * Arguments:
  * 0: Faction <STRING>
@@ -17,4 +17,9 @@
 
 params [["_faction", "", [""]]];
 
-GVAR(disabledFactions) setVariable [_faction, true];
+_faction = configName (configFile >> "CfgFactionClasses" >> _faction);
+
+// Faction doesn't exist
+if (_faction == "") exitWith {};
+
+GVAR(disabledFactions) set [_faction, true];
diff --git a/addons/dogtags/functions/fnc_getDogtagData.sqf b/addons/dogtags/functions/fnc_getDogtagData.sqf
index 6a850543fc..4aaf930fa2 100644
--- a/addons/dogtags/functions/fnc_getDogtagData.sqf
+++ b/addons/dogtags/functions/fnc_getDogtagData.sqf
@@ -1,19 +1,19 @@
 #include "..\script_component.hpp"
 /*
  * Author: esteldunedain
- * Get unit dogtag data.
+ * Gets unit's dog tag data.
  *
  * Arguments:
  * 0: Target <OBJECT>
  *
  * Return Value:
- * Dogtag Data <ARRAY>
+ * Dog tag Data <ARRAY>
  * 0: Name <STRING>
  * 1: SSN <STRING>
  * 2: Blood Type <STRING>
  *
  * Example:
- * _dogtagData = [unit, player] call ace_dogtags_fnc_getDogtagData
+ * player call ace_dogtags_fnc_getDogtagData
  *
  * Public: No
  */
@@ -21,17 +21,20 @@
 params ["_target"];
 
 // Check if the data was already created
-private _dogTagData = _target getVariable QGVAR(dogtagData);
-if (!isNil "_dogTagData") exitWith {_dogTagData};
+private _dogtagData = _target getVariable QGVAR(dogtagData);
+
+if (!isNil "_dogtagData") exitWith {_dogtagData};
 
 // Create dog tag data once for the unit: nickname, code (eg. 135-13-900) and blood type
 private _targetName = [_target, false, true] call EFUNC(common,getName);
 
-private _dogTagData = [
+private _dogtagData = [
     _targetName,
     _targetName call FUNC(ssn),
     _targetName call FUNC(bloodType)
 ];
+
 // Store it
-_target setVariable [QGVAR(dogtagData), _dogTagData, true];
-_dogTagData
+_target setVariable [QGVAR(dogtagData), _dogtagData, true];
+
+_dogtagData
diff --git a/addons/dogtags/functions/fnc_getDogtagItem.sqf b/addons/dogtags/functions/fnc_getDogtagItem.sqf
index 04112bcc94..4f8cc94cc7 100644
--- a/addons/dogtags/functions/fnc_getDogtagItem.sqf
+++ b/addons/dogtags/functions/fnc_getDogtagItem.sqf
@@ -1,7 +1,8 @@
 #include "..\script_component.hpp"
 /*
  * Author: SzwedzikPL
- * Server: creates new dogtag item and send it to client.
+ * Server: Creates a new dog tag item and sends it to client.
+ * It broacasts the dog tag info to all machines with interfaces.
  *
  * Arguments:
  * 0: Player <OBJECT>
@@ -11,29 +12,37 @@
  * None
  *
  * Example:
- * [player, unit] call ace_dogtags_fnc_getDogtagItem
+ * [player, cursorObject] call ace_dogtags_fnc_getDogtagItem
  *
  * Public: No
  */
 
-if(!isServer) exitWith {};
+if (!isServer) exitWith {};
 
 params ["_player", "_target"];
 TRACE_2("getDogtagItem",_player,_target);
 
-private _allDogtags = missionNamespace getVariable [QGVAR(allDogtags), []];
-private _allDogtagDatas = missionNamespace getVariable [QGVAR(allDogtagDatas), []];
+GVAR(idCounter) = GVAR(idCounter) + 1;
 
-private _nextID = count _allDogtags + 1;
-
-if (_nextID > 999) exitWith {ERROR("Ran out of IDs");};
+if (GVAR(idCounter) > 999) exitWith {ERROR("Ran out of IDs");};
 
 private _dogTagData = [_target] call FUNC(getDogTagData);
-private _item = format ["ACE_dogtag_%1", _nextID];
-_allDogtags pushBack _item;
-_allDogtagDatas pushBack _dogTagData;
+private _item = format ["ACE_dogtag_%1", GVAR(idCounter)];
 
-missionNamespace setVariable [QGVAR(allDogtags), _allDogtags];
-missionNamespace setVariable [QGVAR(allDogtagDatas), _allDogtagDatas];
+// Broadcast data globally, so that clients can use it where needed
+[QGVAR(broadcastDogtagInfo), [_item, _dogTagData]] call CBA_fnc_globalEvent;
 
-[QGVAR(addDogtagItem), [_item, _dogTagData], [_player]] call CBA_fnc_targetEvent;
+// Dog tags have no mass, so no need to check if it can fit in container, but check if unit has an inventory at all
+[_player, _item, true] call CBA_fnc_addItem;
+
+private _name = _dogtagData param [0, ""];
+
+// If data doesn't exist or body has no name, set name as "unknown"
+if (_name == "") then {
+    _name = LELSTRING(common,unknown);
+};
+
+// Display message
+[{
+    [QEGVAR(common,displayTextStructured), [_this select 0, 2.5], _this select 1] call CBA_fnc_targetEvent;
+}, [format [LLSTRING(takeDogtagSuccess), _name], _player], DOGTAG_SHOW_DELAY] call CBA_fnc_waitAndExecute;
diff --git a/addons/dogtags/functions/fnc_sendDogtagData.sqf b/addons/dogtags/functions/fnc_sendDogtagData.sqf
deleted file mode 100644
index 2351e61166..0000000000
--- a/addons/dogtags/functions/fnc_sendDogtagData.sqf
+++ /dev/null
@@ -1,33 +0,0 @@
-#include "..\script_component.hpp"
-/*
- * Author: SzwedzikPL
- * Server: returns to client data on given dogtag.
- *
- * Arguments:
- * 0: Player <OBJECT>
- * 1: Target <OBJECT>
- *
- * Return Value:
- * None
- *
- * Example:
- * [player, unit] call ace_dogtags_fnc_sendDogtagData
- *
- * Public: No
- */
-
-if (!isServer) exitWith {};
-
-params ["_target", "_item"];
-TRACE_2("sendDogtagData",_target,_item);
-
-private _allDogtags = missionNameSpace getVariable [QGVAR(allDogtags), []];
-private _allDogtagDatas = missionNameSpace getVariable [QGVAR(allDogtagDatas), []];
-
-private _dogtagData = [];
-private _index = _allDogtags find _item;
-if (_index >= 0) then {
-    _dogtagData = _allDogtagDatas select _index;
-};
-
-[QGVAR(showDogtag), [_dogtagData], [_target]] call CBA_fnc_targetEvent;
diff --git a/addons/dogtags/functions/fnc_showDogtag.sqf b/addons/dogtags/functions/fnc_showDogtag.sqf
index 4865ff7de2..5de9a9fc62 100644
--- a/addons/dogtags/functions/fnc_showDogtag.sqf
+++ b/addons/dogtags/functions/fnc_showDogtag.sqf
@@ -1,10 +1,10 @@
 #include "..\script_component.hpp"
 /*
  * Author: SzwedzikPL
- * Shows dogtag.
+ * Shows dog tag.
  *
  * Arguments:
- * 0: Dogtag data <ARRAY>
+ * 0: Dog tag data <ARRAY>
  * 1: Display as double tag <BOOLEAN>
  *
  * Return Value:
@@ -27,9 +27,17 @@ if (_doubleTags) then {
 } else {
     (QGVAR(tag) call BIS_fnc_rscLayer) cutRsc [QGVAR(singleTag), "PLAIN", 1, true];
 };
-private _display = uiNamespace getvariable [QGVAR(tag), displayNull];
-if(isNull _display) exitWith {};
+
+private _display = uiNamespace getVariable [QGVAR(tag), displayNull];
+
+if (isNull _display) exitWith {};
 
 private _control = _display displayCtrl 1001;
-_dogtagData params ["_nickName", "_code", "_bloodType"];
-_control ctrlSetStructuredText parseText format ["%1<br/>%2<br/>%3", toUpper _nickName, _code, _bloodType];
+_dogtagData params ["_name", "_code", "_bloodType"];
+
+// If data doesn't exist or body has no name, set name as "unknown"
+if (_name == "") then {
+    _name = LELSTRING(common,unknown);
+};
+
+_control ctrlSetStructuredText parseText format ["%1<br/>%2<br/>%3", toUpper _name, _code, _bloodType];
diff --git a/addons/dogtags/functions/fnc_ssn.sqf b/addons/dogtags/functions/fnc_ssn.sqf
index 0ba3499c0b..794422ddd1 100644
--- a/addons/dogtags/functions/fnc_ssn.sqf
+++ b/addons/dogtags/functions/fnc_ssn.sqf
@@ -1,16 +1,16 @@
 #include "..\script_component.hpp"
 /*
  * Author: kymckay
- * Reports a social security number generated from the units name.
+ * Reports a social security number generated from the unit's name.
  *
  * Arguments:
- * 0: Name of a unit <STRING>
+ * 0: Unit name <STRING>
  *
  * Return Value:
  * A random three/two/four format social security number <STRING>
  *
  * Example:
- * _ssn = ["AAA"] call ace_dogtags_fnc_ssn
+ * "name" call ace_dogtags_fnc_ssn
  *
  * Public: No
  */
@@ -18,19 +18,20 @@
 params ["_name"];
 
 private _chars = toArray _name;
-private _length = count _chars;
+
 // Warning, for strings containing non-latin characters, `_count _name` != `_count _chars`
+private _length = count _chars;
 
 _chars pushBack _length;
 _length = _length + 1;
 
 private _remainder = 0;
-private _nums = [0,0,0,0,0,0,0,0,0];
+private _nums = [0, 0, 0, 0, 0, 0, 0, 0, 0];
 
 for "_index" from 0 to (8 max _length) do {
     private _inputChar = _chars select (_index % _length);
-    _nums set [(_index % 9), ((_nums select (_index % 9)) + _inputChar + _remainder) % 10];
+    _nums set [_index % 9, ((_nums select (_index % 9)) + _inputChar + _remainder) % 10];
     _remainder = (_inputChar + _remainder) % 256;
 };
 
-([_nums select [0,3],_nums select [3,2], _nums select [5,4]] apply { _x joinString "" }) joinString "-"
+([_nums select [0, 3], _nums select [3, 2], _nums select [5, 4]] apply { _x joinString "" }) joinString "-"
diff --git a/addons/dogtags/functions/fnc_takeDogtag.sqf b/addons/dogtags/functions/fnc_takeDogtag.sqf
index 1972c91ee0..b374c27121 100644
--- a/addons/dogtags/functions/fnc_takeDogtag.sqf
+++ b/addons/dogtags/functions/fnc_takeDogtag.sqf
@@ -1,8 +1,8 @@
 #include "..\script_component.hpp"
 /*
  * Author: SzwedzikPL
- * If dogtag is not already taken triggers event on server.
- * If dogtag already taken displays info about it.
+ * If the dog tag hasn't already been taken, it triggers an event on the server.
+ * If the dog tag has already been taken, it displays info about it.
  *
  * Arguments:
  * 0: Player <OBJECT>
@@ -12,17 +12,17 @@
  * None
  *
  * Example:
- * [player, unit] call ace_dogtags_fnc_takeDogtag
+ * [player, cursorObject] call ace_dogtags_fnc_takeDogtag
  *
  * Public: No
  */
 
 params ["_player", "_target"];
 
-// animation
+// Animation
 _player call EFUNC(common,goKneeling);
 
-// sound
+// Sound
 private _position = _target modelToWorldWorld (_target selectionPosition "neck");
 
 playSound3D [
@@ -35,12 +35,11 @@ playSound3D [
     50
 ];
 
-// display message
+// Display message
 if ((_target getVariable [QGVAR(dogtagTaken), objNull]) == _target) then {
-    [{
-        [_this, 2.5] call EFUNC(common,displayTextStructured);
-    }, localize LSTRING(dogtagAlreadyTaken), DOGTAG_SHOW_DELAY] call CBA_fnc_waitAndExecute;
+    [EFUNC(common,displayTextStructured), [LLSTRING(dogtagAlreadyTaken), 2.5], DOGTAG_SHOW_DELAY] call CBA_fnc_waitAndExecute;
 } else {
     _target setVariable [QGVAR(dogtagTaken), _target, true];
+
     [QGVAR(getDogtagItem), [_player, _target]] call CBA_fnc_serverEvent;
 };
diff --git a/addons/dogtags/stringtable.xml b/addons/dogtags/stringtable.xml
index d19c61f505..73d2d07e56 100644
--- a/addons/dogtags/stringtable.xml
+++ b/addons/dogtags/stringtable.xml
@@ -66,7 +66,7 @@
             <Turkish>Al</Turkish>
         </Key>
         <Key ID="STR_ACE_Dogtags_takeDogtagSuccess">
-            <English>Dogtag taken from %1...</English>
+            <English>Dog Tag taken from %1...</English>
             <Polish>Zabrałeś nieśmiertelnik %1...</Polish>
             <Russian>Жетон снят с %1...</Russian>
             <Czech>Sebral jsem známku od %1...</Czech>
@@ -82,7 +82,7 @@
             <Turkish>Künye %1 kişisinden alındı</Turkish>
         </Key>
         <Key ID="STR_ACE_Dogtags_dogtagAlreadyTaken">
-            <English>Somebody else has already taken the dogtag...</English>
+            <English>Somebody else has already taken the Dog Tag...</English>
             <Polish>Ktoś już zabrał ten nieśmiertelnik...</Polish>
             <Russian>Кто-то уже забрал жетон...</Russian>
             <Czech>Někdo jiný už vzal identifikační známku...</Czech>
@@ -98,7 +98,7 @@
             <Turkish>Başka biri zaten künyeyi almış</Turkish>
         </Key>
         <Key ID="STR_ACE_Dogtags_IGUI_Description">
-            <English>Onscreen display for checking dogtags</English>
+            <English>Onscreen display for checking Dog Tags</English>
             <German>Anzeige um Erkennungsmarke zu überprüfen</German>
             <Chinese>在畫面中顯示檢查兵籍牌</Chinese>
             <Chinesesimp>在画面中显示检查兵籍牌</Chinesesimp>
diff --git a/addons/dragging/functions/fnc_carryObject.sqf b/addons/dragging/functions/fnc_carryObject.sqf
index 4d5ac8b61b..579e6a0ac3 100644
--- a/addons/dragging/functions/fnc_carryObject.sqf
+++ b/addons/dragging/functions/fnc_carryObject.sqf
@@ -19,6 +19,12 @@
 params ["_unit", "_target"];
 TRACE_2("params",_unit,_target);
 
+// If in ViV cargo, unload it first
+// Warn user if it failed to unload (shouldn't happen)
+if (!isNull isVehicleCargo _target && {!(objNull setVehicleCargo _target)}) then {
+    WARNING_1("ViV Unload Failed %1",_target);
+};
+
 // Get attachTo offset and direction
 private _position = _target getVariable [QGVAR(carryPosition), [0, 0, 0]];
 private _direction = _target getVariable [QGVAR(carryDirection), 0];
@@ -60,10 +66,10 @@ private _UAVCrew = _target call EFUNC(common,getVehicleUAVCrew);
 
 if (_UAVCrew isNotEqualTo []) then {
     {
-        _target deleteVehicleCrew _x;
+        [_x, true] call EFUNC(common,disableAiUAV);
     } forEach _UAVCrew;
 
-    _target setVariable [QGVAR(isUAV), true, true];
+    _target setVariable [QGVAR(isUAV), _UAVCrew, true];
 };
 
 // Check everything
diff --git a/addons/dragging/functions/fnc_carryObjectPFH.sqf b/addons/dragging/functions/fnc_carryObjectPFH.sqf
index fcd0f05376..e0a58a26eb 100644
--- a/addons/dragging/functions/fnc_carryObjectPFH.sqf
+++ b/addons/dragging/functions/fnc_carryObjectPFH.sqf
@@ -73,8 +73,8 @@ if (_unit getHitPointDamage "HitLegs" >= 0.5) exitWith {
     _idPFH call CBA_fnc_removePerFrameHandler;
 };
 
-// Drop static if crew is in it (UAV crew deletion may take a few frames)
-if (_target isKindOf "StaticWeapon" && {!(_target getVariable [QGVAR(isUAV), false])} && {(crew _target) isNotEqualTo []}) exitWith {
+// Drop static if either non-UAV crew or new UAV crew is in it (ignore saved UAV crew)
+if (_target isKindOf "StaticWeapon" && {((crew _target) - (_target getVariable [QGVAR(isUAV), []])) isNotEqualTo []}) exitWith {
     TRACE_2("static weapon crewed",_unit,_target);
 
     [_unit, _target] call FUNC(dropObject_carry);
diff --git a/addons/dragging/functions/fnc_dragObject.sqf b/addons/dragging/functions/fnc_dragObject.sqf
index 5116f440b3..87272491da 100644
--- a/addons/dragging/functions/fnc_dragObject.sqf
+++ b/addons/dragging/functions/fnc_dragObject.sqf
@@ -19,6 +19,12 @@
 params ["_unit", "_target"];
 TRACE_2("params",_unit,_target);
 
+// If in ViV cargo, unload it first
+// Warn user if it failed to unload (shouldn't happen)
+if (!isNull isVehicleCargo _target && {!(objNull setVehicleCargo _target)}) then {
+    WARNING_1("ViV Unload Failed %1",_target);
+};
+
 // Get attachTo offset and direction.
 private _position = _target getVariable [QGVAR(dragPosition), [0, 0, 0]];
 private _direction = _target getVariable [QGVAR(dragDirection), 0];
@@ -73,10 +79,10 @@ private _UAVCrew = _target call EFUNC(common,getVehicleUAVCrew);
 
 if (_UAVCrew isNotEqualTo []) then {
     {
-        _target deleteVehicleCrew _x;
+        [_x, true] call EFUNC(common,disableAiUAV);
     } forEach _UAVCrew;
 
-    _target setVariable [QGVAR(isUAV), true, true];
+    _target setVariable [QGVAR(isUAV), _UAVCrew, true];
 };
 
 // Check everything
diff --git a/addons/dragging/functions/fnc_dragObjectPFH.sqf b/addons/dragging/functions/fnc_dragObjectPFH.sqf
index 7c3a6be307..249f3866bb 100644
--- a/addons/dragging/functions/fnc_dragObjectPFH.sqf
+++ b/addons/dragging/functions/fnc_dragObjectPFH.sqf
@@ -51,8 +51,8 @@ if (_unit distance _target > 10 && {(CBA_missionTime - _startTime) >= 1}) exitWi
     _idPFH call CBA_fnc_removePerFrameHandler;
 };
 
-// Drop static if crew is in it (UAV crew deletion may take a few frames)
-if (_target isKindOf "StaticWeapon" && {!(_target getVariable [QGVAR(isUAV), false])} && {(crew _target) isNotEqualTo []}) exitWith {
+// Drop static if either non-UAV crew or new UAV crew is in it (ignore saved UAV crew)
+if (_target isKindOf "StaticWeapon" && {((crew _target) - (_target getVariable [QGVAR(isUAV), []])) isNotEqualTo []}) exitWith {
     TRACE_2("static weapon crewed",_unit,_target);
 
     [_unit, _target] call FUNC(dropObject);
diff --git a/addons/dragging/functions/fnc_dropObject.sqf b/addons/dragging/functions/fnc_dropObject.sqf
index 10cfda1703..119eaf415a 100644
--- a/addons/dragging/functions/fnc_dropObject.sqf
+++ b/addons/dragging/functions/fnc_dropObject.sqf
@@ -33,7 +33,7 @@ if (!GVAR(dragAndFire)) then {
 private _inBuilding = _unit call FUNC(isObjectOnObject);
 
 // Play release animation
-if !(_unit getVariable ["ACE_isUnconscious", false]) then {
+if (_unit call EFUNC(common,isAwake)) then {
     [_unit, "released"] call EFUNC(common,doGesture);
 };
 
@@ -80,16 +80,16 @@ if (_unit getVariable ["ACE_isUnconscious", false]) then {
     [_unit, "unconscious", 2] call EFUNC(common,doAnimation);
 };
 
-// Recreate UAV crew (add a frame delay or this may cause the vehicle to be moved to [0,0,0])
-if (_target getVariable [QGVAR(isUAV), false]) then {
-    _target setVariable [QGVAR(isUAV), nil, true];
+// Reenable UAV crew
+private _UAVCrew = _target getVariable [QGVAR(isUAV), []];
 
-    [{
-        params ["_target"];
-        if (!alive _target) exitWith {};
-        TRACE_2("restoring uav crew",_target,getPosASL _target);
-        createVehicleCrew _target;
-    }, [_target]] call CBA_fnc_execNextFrame;
+if (_UAVCrew isNotEqualTo []) then {
+    // Reenable AI
+    {
+        [_x, false] call EFUNC(common,disableAiUAV);
+    } forEach _UAVCrew;
+
+    _target setVariable [QGVAR(isUAV), nil, true];
 };
 
 // Fixes not being able to move when in combat pace
diff --git a/addons/dragging/functions/fnc_dropObject_carry.sqf b/addons/dragging/functions/fnc_dropObject_carry.sqf
index 184b1755c0..d244d93a2e 100644
--- a/addons/dragging/functions/fnc_dropObject_carry.sqf
+++ b/addons/dragging/functions/fnc_dropObject_carry.sqf
@@ -44,7 +44,7 @@ if (_tryLoad && {!(_target isKindOf "CAManBase")} && {["ace_cargo"] call EFUNC(c
 
 // Fix anim when aborting carrying persons
 if (_target isKindOf "CAManBase" || {animationState _unit in CARRY_ANIMATIONS}) then {
-    if (isNull objectParent _unit && {!(_unit getVariable ["ACE_isUnconscious", false])}) then {
+    if (isNull objectParent _unit && {_unit call EFUNC(common,isAwake)}) then {
         [_unit, "", 2] call EFUNC(common,doAnimation);
     };
 
@@ -59,11 +59,12 @@ if (_target isKindOf "CAManBase" || {animationState _unit in CARRY_ANIMATIONS})
 _unit removeWeapon "ACE_FakePrimaryWeapon";
 
 // Reselect weapon and re-enable sprint
-private _previousWeaponIndex = _unit getVariable [QGVAR(previousWeapon), -1];
-_unit setVariable [QGVAR(previousWeapon), nil, true];
+private _previousWeaponState = _unit getVariable QGVAR(previousWeapon);
 
-if (_previousWeaponIndex != -1) then {
-    _unit action ["SwitchWeapon", _unit, _unit, _previousWeaponIndex];
+if (!isNil "_previousWeaponState") then {
+    _unit selectWeapon _previousWeaponState;
+
+    _unit setVariable [QGVAR(previousWeapon), nil, true];
 };
 
 [_unit, "forceWalk", QUOTE(ADDON), false] call EFUNC(common,statusEffect_set);
@@ -86,16 +87,16 @@ if !(_target isKindOf "CAManBase") then {
     [QEGVAR(common,fixFloating), _target, _target] call CBA_fnc_targetEvent;
 };
 
-// Recreate UAV crew (add a frame delay or this may cause the vehicle to be moved to [0,0,0])
-if (_target getVariable [QGVAR(isUAV), false]) then {
-    _target setVariable [QGVAR(isUAV), nil, true];
+// Reenable UAV crew
+private _UAVCrew = _target getVariable [QGVAR(isUAV), []];
 
-    [{
-        params ["_target"];
-        if (!alive _target) exitWith {};
-        TRACE_2("restoring uav crew",_target,getPosASL _target);
-        createVehicleCrew _target;
-    }, [_target]] call CBA_fnc_execNextFrame;
+if (_UAVCrew isNotEqualTo []) then {
+    // Reenable AI
+    {
+        [_x, false] call EFUNC(common,disableAiUAV);
+    } forEach _UAVCrew;
+
+    _target setVariable [QGVAR(isUAV), nil, true];
 };
 
 // Reset mass
@@ -116,7 +117,7 @@ if (_loadCargo) then {
         private _vehicles = [_cursorObject, 0, true] call EFUNC(common,nearestVehiclesFreeSeat);
 
         if ([_cursorObject] isEqualTo _vehicles) then {
-            if (["ace_medical"] call EFUNC(common,isModLoaded)) then {
+            if (GETEGVAR(medical,enabled,false)) then {
                 [_unit, _target, _cursorObject] call EFUNC(medical_treatment,loadUnit);
             } else {
                 [_unit, _target, _cursorObject] call EFUNC(common,loadPerson);
diff --git a/addons/dragging/functions/fnc_getWeight.sqf b/addons/dragging/functions/fnc_getWeight.sqf
index f6b93feca0..f6cb466165 100644
--- a/addons/dragging/functions/fnc_getWeight.sqf
+++ b/addons/dragging/functions/fnc_getWeight.sqf
@@ -11,7 +11,7 @@
  * Weight <NUMBER>
  *
  * Example:
- * [cursorTarget] call ace_dragging_fnc_getWeight
+ * cursorTarget call ace_dragging_fnc_getWeight
  *
  * Public: No
  */
@@ -23,19 +23,20 @@ if (GVAR(weightCoefficient) == 0) exitWith {0};
 
 private _weight = loadAbs _object;
 
-if !(GVAR(skipContainerWeight)) then {
+if (!GVAR(skipContainerWeight)) then {
     // Add the mass of the object itself
     // getMass handles PhysX mass, this should be 0 for SupplyX containers and WeaponHolders
     // Use originalMass in case we're checking weight for a carried object
-    _weight = _weight + ((_object getVariable [QGVAR(originalMass), getMass _object]));
+    _weight = _weight + (_object getVariable [QGVAR(originalMass), getMass _object]);
 };
 
-// Contents of backpacks get counted twice (https://github.com/acemod/ACE3/pull/8457#issuecomment-1062522447 and https://feedback.bistudio.com/T167469)
-// This is a workaround until that is fixed on BI's end
-{
-    _x params ["", "_container"];
-    _weight = _weight - (loadAbs _container);
-} forEach (everyContainer _object);
+// Fixed in https://feedback.bistudio.com/T167469 on 2.16 profiling branch and for 2.18 stable
+if ((productVersion select 3) < 152017) then {
+    {
+        _x params ["", "_container"];
+        _weight = _weight - (loadAbs _container);
+    } forEach (everyContainer _object);
+};
 
 // Mass in Arma isn't an exact amount but rather a volume/weight value
 // This attempts to work around that by making it a usable value (sort of)
diff --git a/addons/dragging/functions/fnc_startCarryLocal.sqf b/addons/dragging/functions/fnc_startCarryLocal.sqf
index 6ba2c68934..743a56e1f4 100644
--- a/addons/dragging/functions/fnc_startCarryLocal.sqf
+++ b/addons/dragging/functions/fnc_startCarryLocal.sqf
@@ -50,7 +50,7 @@ if (_target isKindOf "CAManBase") then {
     };
 
     // Select primary, otherwise the carry animation actions don't work
-    _unit selectWeapon _primaryWeapon;
+    _unit selectWeapon _primaryWeapon; // This turns off lasers/lights
 
     // Move a bit closer and adjust direction when trying to pick up a person
     [QEGVAR(common,setDir), [_target, getDir _unit + 180], _target] call CBA_fnc_targetEvent;
@@ -62,10 +62,11 @@ if (_target isKindOf "CAManBase") then {
     _timer = CBA_missionTime + 10;
 } else {
     // Select no weapon and stop sprinting
-    private _previousWeaponIndex = [_unit] call EFUNC(common,getFiremodeIndex);
-    _unit setVariable [QGVAR(previousWeapon), _previousWeaponIndex, true];
+    if (currentWeapon _unit != "") then {
+        _unit setVariable [QGVAR(previousWeapon), (weaponState _unit) select [0, 3], true];
 
-    _unit action ["SwitchWeapon", _unit, _unit, 299];
+        _unit action ["SwitchWeapon", _unit, _unit, 299];
+    };
 
     [_unit, "AmovPercMstpSnonWnonDnon", 0] call EFUNC(common,doAnimation);
 
diff --git a/addons/dragging/functions/fnc_startDragLocal.sqf b/addons/dragging/functions/fnc_startDragLocal.sqf
index 22c7cecd24..de41d712a4 100644
--- a/addons/dragging/functions/fnc_startDragLocal.sqf
+++ b/addons/dragging/functions/fnc_startDragLocal.sqf
@@ -46,7 +46,10 @@ if (!GVAR(dragAndFire)) then {
         _primaryWeapon = "ACE_FakePrimaryWeapon";
     };
 
-    _unit selectWeapon _primaryWeapon;
+    // Keep the laser/light on if the weapon is already selected
+    if (currentWeapon _unit != _primaryWeapon) then {
+        _unit selectWeapon _primaryWeapon;
+    };
 } else { // Making sure the unit is holding a primary weapon or handgun
     private _handgunWeapon = handgunWeapon _unit;
 
diff --git a/addons/dragon/XEH_postInit.sqf b/addons/dragon/XEH_postInit.sqf
index 0305fe772a..2360a5bd97 100644
--- a/addons/dragon/XEH_postInit.sqf
+++ b/addons/dragon/XEH_postInit.sqf
@@ -6,7 +6,7 @@
 ["vehicle", {
     params ["","_vehicle"];
     TRACE_2("vehicle change",_vehicle,typeOf _vehicle);
-    if (!(_vehicle isKindOf QGVAR(staticBase))) exitWith {};
+    if !(_vehicle isKindOf QGVAR(staticBase)) exitWith {};
 
     _vehicle animate ["rest_rotate", 0];
 
@@ -14,7 +14,7 @@
     [GVAR(pfID)] call CBA_fnc_removePerFrameHandler;
 
     private _lastView = cameraView;
-    if (!(_lastView in ["INTERNAL", "EXTERNAL"])) then { _lastView == "INTERNAL"; };
+    if !(_lastView in ["INTERNAL", "EXTERNAL"]) then { _lastView == "INTERNAL"; };
 
     GVAR(pfID) = [{
         params ["_args"];
diff --git a/addons/dragon/functions/fnc_sightAttach.sqf b/addons/dragon/functions/fnc_sightAttach.sqf
index 76ad9c3356..de085942b7 100644
--- a/addons/dragon/functions/fnc_sightAttach.sqf
+++ b/addons/dragon/functions/fnc_sightAttach.sqf
@@ -21,7 +21,7 @@ params ["_target", "_unit", ["_event", false]];
 TRACE_3("sightAttach",_target,_unit,_event);
 
 if (_event isEqualTo true) then { // this is actually needed as 3rd arg may not be bool
-    if (!(_target turretLocal [0])) exitWith {};
+    if !(_target turretLocal [0]) exitWith {};
     _target setVariable [QGVAR(sightAttached), true, true];
     _target animate ["optic_hide", 0];
     _target addWeapon QGVAR(superStatic);
diff --git a/addons/dragon/functions/fnc_sightDetach.sqf b/addons/dragon/functions/fnc_sightDetach.sqf
index c9d03e22e6..a5ac159a33 100644
--- a/addons/dragon/functions/fnc_sightDetach.sqf
+++ b/addons/dragon/functions/fnc_sightDetach.sqf
@@ -23,7 +23,7 @@ params ["_target", "_unit", ["_event", false]];
 TRACE_3("sightDetach",_target,_unit,_event);
 
 if (_event isEqualTo true) then { // this is actually needed as 3rd arg may not be bool
-    if (!(_target turretLocal [0])) exitWith {};
+    if !(_target turretLocal [0]) exitWith {};
     _target setVariable [QGVAR(sightAttached), false, true];
     _target animate ["optic_hide", 1];
     _target removeWeapon QGVAR(superStatic);
diff --git a/addons/explosives/CfgMagazines.hpp b/addons/explosives/CfgMagazines.hpp
index 7bb2c6ff02..65f5dd7eb3 100644
--- a/addons/explosives/CfgMagazines.hpp
+++ b/addons/explosives/CfgMagazines.hpp
@@ -4,7 +4,6 @@ class CfgMagazines {
         GVAR(Placeable) = 1;
         useAction = 0;
         GVAR(SetupObject) = "ACE_Explosives_Place_ATMine"; // CfgVehicle class for setup object.
-        GVAR(DelayTime) = 2.5;
         class ACE_Triggers {
             SupportedTriggers[] = {"PressurePlate"};
             class PressurePlate {
@@ -50,7 +49,6 @@ class CfgMagazines {
         GVAR(Placeable) = 1;
         useAction = 0;
         GVAR(SetupObject) = "ACE_Explosives_Place_Claymore";
-        GVAR(DelayTime) = 1.5;
         class ACE_Triggers {
             SupportedTriggers[] = {"Command", "MK16_Transmitter"};
             class Command {
@@ -64,7 +62,6 @@ class CfgMagazines {
         GVAR(Placeable) = 1;
         useAction = 0;
         GVAR(SetupObject) = "ACE_Explosives_Place_SatchelCharge";
-        GVAR(DelayTime) = 1;
         class ACE_Triggers {
             SupportedTriggers[] = {"Timer", "Command", "MK16_Transmitter", "DeadmanSwitch"};
             class Timer {
diff --git a/addons/explosives/functions/fnc_addClacker.sqf b/addons/explosives/functions/fnc_addClacker.sqf
index 2292bfcb79..794aec0a10 100644
--- a/addons/explosives/functions/fnc_addClacker.sqf
+++ b/addons/explosives/functions/fnc_addClacker.sqf
@@ -31,7 +31,7 @@ private _detonators = [_unit] call FUNC(getDetonators);
     if !(_x in _detonators) exitWith{
         _hasRequired = false;
     };
-} count _requiredItems;
+} forEach _requiredItems;
 
 if !(_hasRequired) exitWith {};
 private _config = ConfigFile >> "CfgMagazines" >> _magazineClass >> "ACE_Triggers" >> configName _config;
diff --git a/addons/explosives/functions/fnc_addDetonateActions.sqf b/addons/explosives/functions/fnc_addDetonateActions.sqf
index ea4b87128a..06c4f3c8be 100644
--- a/addons/explosives/functions/fnc_addDetonateActions.sqf
+++ b/addons/explosives/functions/fnc_addDetonateActions.sqf
@@ -53,7 +53,7 @@ private _explosivesList = [];
 // If the detonator is not active, is a clacker and has assigned explosives, generate an interaction to make it the active detonator for use with the "trigger all" keybind
 if (
     _detonator != GVAR(activeTrigger) &&
-    {_detonator != "Cellphone"} && 
+    {_detonator != "Cellphone"} &&
     {
         _explosivesList isNotEqualTo [] ||
         {_detonator == "ACE_DeadManSwitch" && {_unit getVariable [QGVAR(deadmanInvExplosive), ""] != ""}}
@@ -92,19 +92,6 @@ if (_detonator != "ACE_DeadManSwitch") then {
         ];
     };
 } else {
-    //Add action to detonate all explosives (including the inventory explosive):
-    _children pushBack [
-        [
-            "Explosive_All_Deadman",
-            LLSTRING(DetonateAll),
-            getText (configFile >> "CfgWeapons" >> _detonator >> "picture"),
-            {[_player] call FUNC(onIncapacitated)},
-            {true}
-        ] call EFUNC(interact_menu,createAction),
-        [],
-        _unit
-    ];
-
     //Adds actions for the explosives you can connect to the deadman switch.
     private _connectedInventoryExplosive = _unit getVariable [QGVAR(deadmanInvExplosive), ""];
     if ((_connectedInventoryExplosive != "") && {!(_connectedInventoryExplosive in (magazines _unit))}) then {
@@ -113,6 +100,22 @@ if (_detonator != "ACE_DeadManSwitch") then {
     };
 
     _connectedInventoryExplosive = _unit getVariable [QGVAR(deadmanInvExplosive), ""];
+
+    //Add action to detonate all explosives (including the inventory explosive):
+    if (_connectedInventoryExplosive != "" || {count _explosivesList > 1}) then {
+        _children pushBack [
+            [
+                "Explosive_All_Deadman",
+                LLSTRING(DetonateAll),
+                getText (configFile >> "CfgWeapons" >> _detonator >> "picture"),
+                {[_player] call FUNC(onIncapacitated)},
+                {true}
+            ] call EFUNC(interact_menu,createAction),
+            [],
+            _unit
+        ];
+    };
+
     if (_connectedInventoryExplosive != "") then {
         //Add the disconnect action
         private _magConfig = configFile >> "CfgMagazines" >> _connectedInventoryExplosive;
@@ -144,7 +147,7 @@ if (_detonator != "ACE_DeadManSwitch") then {
         private _procressedMags = [];
         {
             private _mag = _x;
-            if (!(_mag in _procressedMags)) then {
+            if !(_mag in _procressedMags) then {
                 _procressedMags pushBack _x;
                 private _magConfig = configFile >> "CfgMagazines" >> _mag;
                 private _supportedTriggers = getArray (_magConfig >> "ACE_Triggers" >> "SupportedTriggers");
diff --git a/addons/explosives/functions/fnc_onIncapacitated.sqf b/addons/explosives/functions/fnc_onIncapacitated.sqf
index 09d1d7b21f..5e7b8797e1 100644
--- a/addons/explosives/functions/fnc_onIncapacitated.sqf
+++ b/addons/explosives/functions/fnc_onIncapacitated.sqf
@@ -37,7 +37,7 @@ TRACE_2("placed",_deadman,_range);
 //Handle deadman connected to explosive in inventory
 private _connectedInventoryExplosive = _unit getVariable [QGVAR(deadmanInvExplosive), ""];
 if (_connectedInventoryExplosive != "") then {
-    if (!(_connectedInventoryExplosive in (magazines _unit))) exitWith {};
+    if !(_connectedInventoryExplosive in (magazines _unit)) exitWith {};
 
     //Remove mag and reset variable
     _unit removeMagazine _connectedInventoryExplosive;
diff --git a/addons/fastroping/XEH_postInit.sqf b/addons/fastroping/XEH_postInit.sqf
index 650b277dbf..0ba9231215 100644
--- a/addons/fastroping/XEH_postInit.sqf
+++ b/addons/fastroping/XEH_postInit.sqf
@@ -9,7 +9,7 @@
 // Keybinds
 ["ACE3 Vehicles", QGVAR(fastRope), localize LSTRING(Interaction_fastRope), {
     if ((vehicle ACE_player) == ACE_player) exitWith {false};
-    if (!([ACE_player, vehicle ACE_player, []] call EFUNC(common,canInteractWith))) exitWith {false};
+    if !([ACE_player, vehicle ACE_player, []] call EFUNC(common,canInteractWith)) exitWith {false};
     if ([ACE_player, vehicle ACE_player] call FUNC(canFastRope)) then {
         [ACE_player, vehicle ACE_player] call FUNC(fastRope);
         true
@@ -20,7 +20,7 @@
 
 ["ACE3 Vehicles", QGVAR(cutRopes), localize LSTRING(Interaction_cutRopes), {
     if ((vehicle ACE_player) == ACE_player) exitWith {false};
-    if (!([ACE_player, vehicle ACE_player, []] call EFUNC(common,canInteractWith))) exitWith {false};
+    if !([ACE_player, vehicle ACE_player, []] call EFUNC(common,canInteractWith)) exitWith {false};
     if ([vehicle ACE_player] call FUNC(canCutRopes)) then {
         [vehicle ACE_player] call FUNC(cutRopes);
         true
@@ -43,7 +43,7 @@ if (isServer) then {
 
 #ifdef DRAW_FASTROPE_INFO
 addMissionEventHandler ["Draw3D", {
-    if (!(cursorObject isKindOf "Helicopter")) exitWith {};
+    if !(cursorObject isKindOf "Helicopter") exitWith {};
     private _config = configOf cursorObject;
     private _enabled = getNumber (_config >> QGVAR(enabled));
     drawIcon3D ["", [.5,.5,1,1], (ASLtoAGL getPosASL cursorObject), 0.5, 0.5, 0, format ["%1 = %2", typeOf cursorObject, _enabled], 0.5, 0.025, "TahomaB"];
diff --git a/addons/fastroping/stringtable.xml b/addons/fastroping/stringtable.xml
index 10ea50a7c5..89418c0f99 100644
--- a/addons/fastroping/stringtable.xml
+++ b/addons/fastroping/stringtable.xml
@@ -134,7 +134,7 @@
             <Spanish>Equipa el helicoptero seleccionado con un Sistema de Inserción/Extracción Rápida por Cuerda</Spanish>
             <Italian>Equipaggia l'elicottero selezionato con il Fast Rope Insertion Extraction System</Italian>
             <Czech>Vybavit vybraný vrtulník systémem Fast Rope Insertion Extraction (FRIES)</Czech>
-            <Portuguese>Equipa um helicóptero selecionado com um sistema de Fast Rope Insertion Extraction System</Portuguese>
+            <Portuguese>Equipa o helicóptero selecionado com um Sistema de Inserção/Extração Rápida por Corda</Portuguese>
             <Russian>Снаряжает выбранный вертолет оборудованием для спуска десанта по канатам</Russian>
             <Japanese>選択されたヘリコプターで Fast Rope Insertion Extraction System を使えるようにします。</Japanese>
             <Korean>선택된 헬리콥터에 패스트로프 투입 및 탈출 시스템을 장착합니다.</Korean>
@@ -298,6 +298,7 @@
             <German>Schnelles-Abseilen</German>
             <Italian>Fast Rope</Italian>
             <Korean>패스트로프</Korean>
+            <Portuguese>Descida rápida pela corda</Portuguese>
         </Key>
         <Key ID="STR_ACE_Fastroping_setting_requireRopeItems_displayName">
             <English>Require rope item to deploy</English>
diff --git a/addons/field_rations/XEH_postInit.sqf b/addons/field_rations/XEH_postInit.sqf
index 9f64379094..9fc8406aba 100644
--- a/addons/field_rations/XEH_postInit.sqf
+++ b/addons/field_rations/XEH_postInit.sqf
@@ -99,7 +99,7 @@ if !(hasInterface) exitWith {};
     ["ace_interactMenuOpened", LINKFUNC(addWaterSourceInteractions)] call CBA_fnc_addEventHandler;
 
     // Add status modifiers
-    if (["ace_medical"] call EFUNC(common,isModLoaded)) then {
+    if (GETEGVAR(medical,enabled,false)) then {
         [0, {
             if (_this getVariable [QEGVAR(medical,isBleeding), false]) exitWith {
                 0.5
diff --git a/addons/field_rations/functions/fnc_handleEffects.sqf b/addons/field_rations/functions/fnc_handleEffects.sqf
index b118f6acce..ad60a743ad 100644
--- a/addons/field_rations/functions/fnc_handleEffects.sqf
+++ b/addons/field_rations/functions/fnc_handleEffects.sqf
@@ -28,13 +28,14 @@ if ((_thirst > 99.9 || {_hunger > 99.9}) && {random 1 < 0.5}) exitWith {
 if !(_player call EFUNC(common,isAwake)) exitWith {};
 
 // Set unit unconscious (chance based on how high thirst/hunger are)
-if ((_thirst > 85 || {_hunger > 85}) && {random 1 < linearConversion [85, 100, _thirst max _hunger, 0.05, 0.1, true]}) exitWith {
-    if (["ace_medical"] call EFUNC(common,isModLoaded)) then {
-        [_player, true, 5, true] call EFUNC(medical,setUnconscious);
-    };
+if (
+    GETEGVAR(medical,enabled,false) && 
+    {(_thirst > 85 || {_hunger > 85}) && {random 1 < linearConversion [85, 100, _thirst max _hunger, 0.05, 0.1, true]}}
+) exitWith {
+    [_player, true, 5, true] call EFUNC(medical,setUnconscious);
 };
 
 // Make unit fall if moving fast
-if ((_thirst > 93 || {_hunger > 93}) && {speed _player > 1} && {vehicle _player == _player}) exitWith {
+if ((_thirst > 93 || {_hunger > 93}) && {speed _player > 1} && {isNull objectParent _player}) exitWith {
     [_player, "down"] call EFUNC(common,doGesture);
 };
diff --git a/addons/field_rations/initSettings.inc.sqf b/addons/field_rations/initSettings.inc.sqf
index 86bf04aed2..16e2d4eb2d 100644
--- a/addons/field_rations/initSettings.inc.sqf
+++ b/addons/field_rations/initSettings.inc.sqf
@@ -4,9 +4,9 @@
     [ELSTRING(common,Enabled), LSTRING(Enabled_Description)],
     LSTRING(DisplayName),
     false,
-    true,
-    {},
-    true // Needs restart
+    1,
+    {[QXGVAR(enabled), _this] call EFUNC(common,cbaSettings_settingChanged)},
+    true // Needs mission restart
 ] call CBA_fnc_addSetting;
 
 [
diff --git a/addons/fieldmanual/stringtable.xml b/addons/fieldmanual/stringtable.xml
index 98756c4910..12e34d0e34 100644
--- a/addons/fieldmanual/stringtable.xml
+++ b/addons/fieldmanual/stringtable.xml
@@ -245,6 +245,7 @@
             <Japanese>傷口が開くのを防ぐ</Japanese>
             <Russian>Предотвратить повторное открытие ран</Russian>
             <French>Empêcher la réouverture des plaies</French>
+            <German>Verhindert, dass sich Wunden wieder öffnen</German>
             <Spanish>Prevenir la reapertura de heridas</Spanish>
         </Key>
         <Key ID="STR_ACE_FieldManual_Medical_Treatment_SurgicalKit_Description">
@@ -254,6 +255,7 @@
             <Portuguese>O %3Kit Cirúrgico%4 é utilizado para prevenir a reabertura de feridas após a aplicação de bandagens. A depender das configurações, ele também pode remover traumas e pode requerir %3Suturas%4 adicionais para fechar feridas. Suturas são consumíveis, tal como as bandagens, e não são substituem o Kit Cirúrgico.&lt;br/&gt;&lt;br/&gt;%3Uso:%4&lt;br/&gt;%2Utilize [%3%13%4] ou [%3%14%4] e selecione %3Tratamento Avançado%4.&lt;br/&gt;%2Selecione %3Usar Kit Cirúrgico%4.</Portuguese>
             <Italian>Un %3Kit Chirurgico%4 è usato per impedire che ferite bendate si riaprano. A seconda delle impostazioni, può anche azzerare danni o potrebbe richiedere %3Suture%4 aggiuntive per chiudere ferite. Suture sono consumabili proprio come bende, non sono un sostituto per un Kit Chirurgico.&lt;br/&gt;&lt;br/&gt;%3Utilizzo:%4&lt;br/&gt;%2Usa [%3%13%4] o [%3%14%4] e seleziona %3Trattamenti Avanzati%4.&lt;br/&gt;%2Seleziona %3Usa Kit Chirurgico%4.</Italian>
             <Japanese>%3手術キット%4は包帯を巻いた傷口が再度開いて出血するのを防ぎます。設定によっては、負傷を取り除いたり、傷口を閉じるのに%3糸付縫合針%4を必要としたりします。糸付縫合針は消耗品で包帯のように使用され、手術キットを代替するものではありません。&lt;br/&gt;&lt;br/&gt;%3使用方法:%4&lt;br/&gt;%2[%3%13%4] または [%3%14%4] を使って%3高度な治療%4を選択する。&lt;br/&gt;%2%3手術キット%4を選択して使用します。</Japanese>
+            <German>Ein %3Chirurgisches Kit%4 wird verwendet, um zu verhindern, dass sich Wunden nach dem Verbinden wieder öffnen. Abhängig von den Einstellungen kann es auch Traumata beseitigen und erfordert möglicherweise zusätzliche %3Nähte%4, um Wunden zu schließen. Nahtmaterial ist, ähnlich wie Bandagen, Verbrauchsmaterial und kein Ersatz für das Chirurgie-Set.&lt;br/&gt;&lt;br/&gt;%3Verwendung:%4&lt;br/&gt;%2Verwenden Sie [%3%13%4] oder [%3% 14%4] und wählen Sie %3Erweiterte Behandlung%4.&lt;br/&gt;%2Wählen Sie %3Chirurgisches Kit verwenden%4.</German>
             <Spanish>El %3Kit Quirúrgico%4 se usa para prevenir la reapertura de heridas despues de ser vendadas. Dependiendo de las opciones, tambien puede curar traumatismos y puede requerir %3Sutura%4 adicional para cerrar las heridas. Las Suturas son consumibles, al igual que las vendas, y no son un reemplazo para el Kit Quirúgico.&lt;br/&gt;&lt;br/&gt;%3Uso:%4&lt;br/&gt;%2Usar [%3%13%4] o [%3%14%4] y seleccionar %3Tratamientos Avanzados%4.&lt;br/&gt;%2Seleccionar %3Usar Kit Quirúgico%4.</Spanish>
         </Key>
         <Key ID="STR_ACE_FieldManual_Medical_Treatment_CAT_ShortName">
@@ -265,6 +267,7 @@
             <Japanese>出血を止める</Japanese>
             <Russian>Остановить кровотечение</Russian>
             <French>Arrêter les saignements</French>
+            <German>Stoppt Blutung</German>
             <Spanish>Parar Sangrado</Spanish>
         </Key>
         <Key ID="STR_ACE_FieldManual_Medical_Treatment_CAT_Description">
@@ -274,6 +277,7 @@
             <Portuguese>O %3Torniquete%4 interrompe o sangramento temporariamente, para que feridas possam ser enfaixadas. Seu uso é restrito aos membros.&lt;br/&gt;&lt;br/&gt;%3Uso:%4&lt;br/&gt;%2Utilize [%3%13%4] ou [%3%14%4] e selecione um membro afetado.&lt;br/&gt;%2Selecione %3Aplicar Torniquete%4.</Portuguese>
             <Italian>Un %3Laccio Emostatico%4 ferma emorragie temporaneamente in modo da poter bendare ferite con calma. Utilizzabile su arti.&lt;br/&gt;&lt;br/&gt;%3Utilizzo:%4&lt;br/&gt;%2Usa [%3%13%4] o [%3%14%4] e seleziona un arto afflitto.&lt;br/&gt;%2Seleziona %3Applica Laccio Emostatico%4.</Italian>
             <Japanese>%3止血帯%4は一時的に出血を止め、その間に傷に包帯を巻くことができます。四肢にのみ使用できます。&lt;br/&gt;&lt;br/&gt;%3使用方法:%4&lt;br/&gt;%2[%3%13%4] または [%3%14%4] を使って使用したい四肢を選択します。&lt;br/&gt;%2%3止血帯を巻く%4を選択して使用します。</Japanese>
+            <German>Ein %3Tourniquet%4 stoppt die Blutung vorübergehend, sodass eine oder mehrere Wunden verbunden werden können. Kann nur an Gliedmaßen verwendet werden.&lt;br/&gt;&lt;br/&gt;%3Verwendung:%4&lt;br/&gt;%2Verwenden Sie [%3%13%4] oder [%3%14%4] und wählen Sie ein betroffenes Glied aus.&lt; br/&gt;%2Wählen Sie %3Tourniquet anwenden%4.</German>
             <Spanish>El %3Torniquete%4 para temporalmente el sangrado hasta que la herida sea vendada. Sólo puede ser usado en extremidades.&lt;br/&gt;&lt;br/&gt;%3Uso:%4&lt;br/&gt;%2Usar [%3%13%4] o [%3%14%4] y seleccionar la extremidad afectada.&lt;br/&gt;%2Seleccionar %3Aplicar Torniquete%4.</Spanish>
         </Key>
         <Key ID="STR_ACE_FieldManual_Medical_Treatment_MedicalMenu_DisplayName">
@@ -308,7 +312,7 @@
             <Korean>%3의료 메뉴%4는 %3의료%4를 용이하게 사용하기 위한 전용 %3인터페이스%4입니다. %3우%4 및 %3좌%4 문자는 치료 중인 환자의 신체 측면을 나타냅니다.&lt;br/&gt;&lt;br/&gt;%3사용 방법:%4&lt;br/&gt;%2환자를 보고 [%3%13%4]를 사용하여 의료 메뉴를 여십시오. 환자 없이 메뉴를 열면 자가 치료가 됩니다.&lt;br/&gt;%2아니면 [%3%12%4] 또는 [%3%13%4]를 사용하고 %3의료 메뉴%4를 선택하십시오.&lt;br/&gt;&lt;br/&gt;%3키 설정%4&lt;br/&gt;%2[%3W, A, S, D, X와 Z%4]를 사용하여 신체 부위를 선택하십시오.&lt;br/&gt;%2%3번호판 키%4를 사용하여 치료 카테고리를 선택하십시오.</Korean>
             <Portuguese>O %3Menu Médico%4 é uma %3interface%4 dedicada a facilitar o %3tratamento médico%4. As letras %3R%4 e %3L%4 indicam o lado do corpo do paciente que está recebendo o tratamento.&lt;br/&gt;&lt;br/&gt;%3Uso:%4&lt;br/&gt;%2Utilize [%3%14%4] enquanto olha o paciente para abrir o Menu Médico. Se não houver paciente, o menu será de auto-tratamento.&lt;br/&gt;%2Alternativamente, utilize [%3%12%4] ou [%3%13%4] e selecione %3Menu Médico%4.&lt;br/&gt;&lt;br/&gt;%3Atalhos de teclado:%4&lt;br/&gt;%2Utilize [%3W, A, S, D, X, e Z%4] para selecionar partes do corpo.&lt;br/&gt;%2Utilize as %3teclas numéricas%4 para selecionar as categorias de tratamento.</Portuguese>
             <Italian>Il %3Menù Medico%4 è un'%3interfaccia%4 dedicata a facilitare %3trattamenti medici%4. Le lettere %3Dx%4 e %3Sx%4 contrassegnano i lati del corpo del paziente che si stanno medicando.&lt;br/&gt;&lt;br/&gt;%3Utilizzo:%4&lt;br/&gt;%2Usa [%3%14%4] guardando il paziente per aprire il Menù Medico. Aprire il menù senza paziente di fronte permette l'automedicazione.&lt;br/&gt;%2In alternativa, usa [%3%12%4] o [%3%13%4] e seleziona %3Menù Medico%4.&lt;br/&gt;&lt;br/&gt;%3Comandi:%4&lt;br/&gt;%2Usa [%3W, A, S, D, X, and Z%4] per selezionare parti del corpo.&lt;br/&gt;%2Usa %3tasti numerici%4 per selezionare categorie di cure.</Italian>
-            <Japanese>%3医療メニュー%4は%3治療%4をしやすくするための専用%3インターフェース%4です。%3右%4と%3左%4の文字は治療を受ける患者の向きを表しています。&lt;br/&gt;&lt;br/&gt;%3使用方法:%4&lt;br/&gt;%2[%3%14%4] を患者に視点を合わせながら押すことで患者の医療メニューを開けます。視点を合わせないで押すと、自分の医療メニューを開くことが出来ます。&lt;br/&gt;%2もしくは [%3%12%4] または [%3%13%4] を使って%3医療メニュー%4を選択します。&lt;br/&gt;&lt;br/&gt;%3キーバインド:%4&lt;br/&gt;%2[%3W, A, S, D, X, と Zキー%4] を使って身体の部位を選択できます。&lt;br/&gt;%2%3数字キー%4を使って治療項目を選択できます。</Japanese>
+            <Japanese>%3医療メニュー%4は%3治療%4をしやすくするための専用%3インタフェース%4です。%3右%4と%3左%4の文字は治療を受ける患者の向きを表しています。&lt;br/&gt;&lt;br/&gt;%3使用方法:%4&lt;br/&gt;%2[%3%14%4] を患者に視点を合わせながら押すことで患者の医療メニューを開けます。視点を合わせないで押すと、自分の医療メニューを開くことが出来ます。&lt;br/&gt;%2もしくは [%3%12%4] または [%3%13%4] を使って%3医療メニュー%4を選択します。&lt;br/&gt;&lt;br/&gt;%3キーバインド:%4&lt;br/&gt;%2[%3W, A, S, D, X, と Zキー%4] を使って身体の部位を選択できます。&lt;br/&gt;%2%3数字キー%4を使って治療項目を選択できます。</Japanese>
             <Spanish>El %3Menú Médico%4 es una %3interfaz%4 dedicada para facilitar el %3tratamiento médico%4. Las letras %3R%4 and %3L%4 indican el lado del paciente siendo tratado.&lt;br/&gt;&lt;br/&gt;%3Uso:%4&lt;br/&gt;%2Usar [%3%14%4] mientras se mira al paciente para abrir el Menú Médico. Abrir el menú sin mirar a un paciente permite el tratamiento a uno mismo. &lt;br/&gt;%2Alternativamente, usar [%3%12%4] o [%3%13%4] y seleccionar %3Menú Médico%4.&lt;br/&gt;&lt;br/&gt;%3Teclas asociadas:%4&lt;br/&gt;%2Usar [%3W, A, S, D, X, and Z%4] para seleccionar las partes del cuerpo.&lt;br/&gt;%2Usar las %3teclas numéricas%4 para seleccionar las categorías de tratamiento.</Spanish>
         </Key>
         <Key ID="STR_ACE_FieldManual_Items_ATragMX_ShortName">
@@ -384,7 +388,7 @@
             <Korean>%3휴대전화%4는 기능적으로는 %3격발기%4입니다. 폭발물 장치를 연결하여 폭발물을 터뜨릴 때 사용합니다. 여러 장치를 휴대전화와 연결하여 전화번호부 내에서 호출할 수 있습니다.&lt;br/&gt;&lt;br/&gt;%3사용 방법:%4&lt;br/&gt;%2폭발물을 놓으십시오.&lt;br/&gt;%2[%3%13%4]를 사용하고, %3폭발물%4을 선택하고, %3휴대전화%4를 선택하십시오.&lt;br/%2[%3%12%4]로 휴대전화 인터페이스를 여십시오.&lt;br/&gt;%2기폭시킬 전화번호를 선택하십시오.</Korean>
             <Portuguese>O %3Celular%4 serve como dispositivo de detonação ao explosivo. Utilize-o para conectar e detonar dispositivos explosivos. Múltiplos dispositivos podem estar conectados ao celular e aparecerão na lista telefônica.&lt;br/&gt;&lt;br/&gt;%3Uso:%4&lt;br/&gt;%2Plante o explosivo.&lt;br/&gt;%2Utilize [%3%13%4], selecione %3Explosivos%4, e selecione %3Celular%4.&lt;br/&gt;%2Abra a interface do celular com [%3%12%4].&lt;br/&gt;%2Navegue pela lista telefônica utilizando as setas e selecione o número desejado.&lt;br/&gt;%2Ligue para o número para detonar.</Portuguese>
             <Italian>Il %3Cellulare%4 è essenzialmente una %3spoletta%4. Usalo per collegare e detonare esplosivi. Molteplici esplosivi possono essere collegati ad un cellulare e detonati chiamando numeri nella rubrica.&lt;br/&gt;&lt;br/&gt;%3Utilizzo:%4&lt;br/&gt;%2Piazza un esplosivo.&lt;br/&gt;%2Usa [%3%13%4], seleziona %3Esplosivi%4, seleziona %3Cellulare%4.&lt;br/&gt;%2Apri l'interfaccia del telefono con [%3%12%4].&lt;br/&gt;%2Naviga la rubrica con le freccette e seleziona il numero da chiamare.&lt;br/&gt;%2Chiama il numero del dispositivo da detonare.</Italian>
-            <Japanese>%3携帯電話%4は%3点火装置%4として機能します。爆破装置を接続して起爆するために使用します。複数のデバイスを携帯電話に繋ぎ、電話帳から呼び出すことができます。&lt;br/&gt;&lt;br/&gt;%3使用方法:%4&lt;br/&gt;%2爆発物を設置。&lt;br/&gt;%2[%3%13%4] を使い、%3爆発物%4を選択して、%3携帯電話%4を選択します。&lt;br/&gt;%2[%3%12%4] を使って携帯電話インターフェースを開きます。&lt;br/&gt;%2矢印ボタンで電話帳に移動し、発信番号を選択します。&lt;br/&gt;%2電話を掛けることで起爆します。</Japanese>
+            <Japanese>%3携帯電話%4は%3点火装置%4として機能します。爆破装置を接続して起爆するために使用します。複数のデバイスを携帯電話に繋ぎ、電話帳から呼び出すことができます。&lt;br/&gt;&lt;br/&gt;%3使用方法:%4&lt;br/&gt;%2爆発物を設置。&lt;br/&gt;%2[%3%13%4] を使い、%3爆発物%4を選択して、%3携帯電話%4を選択します。&lt;br/&gt;%2[%3%12%4] を使って携帯電話インタフェースを開きます。&lt;br/&gt;%2矢印ボタンで電話帳に移動し、発信番号を選択します。&lt;br/&gt;%2電話を掛けることで起爆します。</Japanese>
             <Spanish>El %3Teléfono%4 es funcionalmente un %3Detonador%4. Úsalo para conectarlo y detonar un dispositivo explosivo. Múltiples dispositivos pueden ser conectados al teléfono y llamados desde la agenda de contactos.&lt;br/&gt;&lt;br/&gt;%3Uso:%4&lt;br/&gt;%2Colocar un explosivo.&lt;br/&gt;%2Usar [%3%13%4], seleccionar %3Explosivos%4, y seleccionar %3Teléfono%4.&lt;br/&gt;%2Abrir la interfaz del teléfono con [%3%12%4].&lt;br/&gt;%2Navegar por la agenda de contactos con las flechas y selecciona el número a llamar.&lt;br/&gt;%2Llamar al número para detonarlo.</Spanish>
         </Key>
         <Key ID="STR_ACE_FieldManual_Items_Chemlight_Shield_ShortName">
@@ -421,7 +425,7 @@
             <Polish>Użyj%3Detonatora%4 do podłączenia i wysadzenia ładunku. Do jednego ładunku może być podłączonych wiele ładunków na różnych kanałach.&lt;br/&gt;&lt;br/&gt;%3Użycie:%4&lt;br/&gt;%2Połóż ładunek wybuchowy.&lt;br/&gt;%2Użyj [%3%13%4], wybierz%3Mat. Wybuchowe%4, i wybierz %3Detonator%4, do którego chcesz go podłączyć.&lt;br/&gt;%2Otwórz menu interakcji ACE [%3%12%4].&lt;br/&gt;%2Wybierz %3Mat. Wybuchowe%4 i wybierz %3Detonator%4.&lt;br/&gt;%2Wybierz %3Ładunek%4 który chcesz wysadzić.</Polish>
             <Korean>%3격발기%4를 사용하여 폭발물을 연결하고 폭발시킬 수 있습니다. 여러 폭발물을 다른 채널에 연결하여 폭발시킬 수도 있습니다.&lt;br/&gt;&lt;br/&gt;%3사용 방법:%4&lt;br/&gt;%2폭발물을 설치합니다.&lt;br/&gt;%2[%3%13%4]를 사용하여 %3폭발물%4을 선택하고 연결할 %3격발기%4를 선택하십시오.&lt;br/&gt;%2[%3%12%4] 키로 ACE 인터페이스를 여십시오.&lt;br/&gt;%2%3폭발물%4을 선택하고 %3격발기%4를 선택하십시오.&lt;br/&gt;%2%3폭발물%4을 선택하면 폭발합니다.</Korean>
             <Italian>Usa %3Spolette%4 per collegare e detonare dispositivi esplosivi. Molteplici dispositivi possono essere collagati a una spoletta e detonati individualmente come vari canali.&lt;br/&gt;&lt;br/&gt;%3Utilizzo:%4&lt;br/&gt;%2Piazza esplosivo.&lt;br/&gt;%2Usa [%3%13%4], seleziona %3Esplosivo%4, seleziona la %3Spoletta%4 a cui intendi collegarlo.&lt;br/&gt;%2Apri l'interfaccia ACE con [%3%12%4].&lt;br/&gt;%2Seleziona %3Esplosivi%4 e scegli una %3Spoletta%4.&lt;br/&gt;%2Seleziona un %3Explosivo%4 da detonare.</Italian>
-            <Japanese>%3点火装置%4を爆破装置に接続し使用することで起爆することが出来ます。複数の爆破装置を接続しそれぞれ違うチャンネルから起爆することもできます。&lt;br/&gt;&lt;br/&gt;%3使用方法:%4&lt;br/&gt;%2爆発物を設置。&lt;br/&gt;%2[%3%13%4] を使い、%3爆発物%4を選択して、接続したい%3点火装置%4を選択します。&lt;br/&gt;%2ACEインターフェースを [%3%12%4] で開きます。&lt;br/&gt;%2%3爆発物%4を選択し、%3点火装置%4を選びます。&lt;br/&gt;%2起爆したい%3爆破装置%4を選択します。</Japanese>
+            <Japanese>%3点火装置%4を爆破装置に接続し使用することで起爆することが出来ます。複数の爆破装置を接続しそれぞれ違うチャンネルから起爆することもできます。&lt;br/&gt;&lt;br/&gt;%3使用方法:%4&lt;br/&gt;%2爆発物を設置。&lt;br/&gt;%2[%3%13%4] を使い、%3爆発物%4を選択して、接続したい%3点火装置%4を選択します。&lt;br/&gt;%2ACEインタフェースを [%3%12%4] で開きます。&lt;br/&gt;%2%3爆発物%4を選択し、%3点火装置%4を選びます。&lt;br/&gt;%2起爆したい%3爆破装置%4を選択します。</Japanese>
             <Spanish>Utiliza los %3Detonadores%4 para conectar y detonar un explosivo. Múltiple dispositivos pueden ser conectados a un detonador y detonados en diferentes canales.&lt;br/&gt;&lt;br/&gt;%3Uso:%4&lt;br/&gt;%2 Coloca un explosivo.&lt;br/&gt;%2Usar [%3%13%4], seleccionar %3Explosivos%4, y selecciona el %3Detonador%4 al que quieres conectarlo.&lt;br/&gt;%2Abre la interfaz de ACE con [%3%12%4].&lt;br/&gt;%2Selecciona %3Explosivos%4 y selecciona un %3Detonador%4.&lt;br/&gt;%2Selecciona el %3Explosivo%4 que quieres detonar.</Spanish>
         </Key>
         <Key ID="STR_ACE_FieldManual_Items_DAGR_ShortName">
@@ -856,7 +860,7 @@
             <Polish>%3Narzędzie do fortyfikowania%4 pozwala żołnierzom budować fortyfikacje wybrane przez twórcę misji.&lt;br/&gt;&lt;br/&gt;%3Użycie:%4&lt;br/&gt;%2Podnieś %3Narzędzie do fortyfikowania%4.&lt;br/&gt;%2Użyj [%3%12%4] i wybierz %3Fortyfikuj%4.&lt;br/&gt;%2Wybierz dostępną fortyfikację i postępuj zgodnie ze wskazówkami na ekranie.</Polish>
             <Italian>L'%3Attrezzo di Fortificazione%4 permette ai soldati di costruire fortificazioni permesse dal creatore della missione.&lt;br/&gt;&lt;br/&gt;%3Utilizzo:%4&lt;br/&gt;%2Raccogli un %3Attrezzo di Fortificazione%4.&lt;br/&gt;%2Usa [%3%12%4] e seleziona %3Fortifica%4.&lt;br/&gt;%2Seleziona una fortificazione disponibile e segui le indicazioni di piazzamento sullo schermo.</Italian>
             <Korean>%3요새화 도구%4를 사용하면 병사들이 임무 생성자가 제공한 요새를 구축할 수 있습니다.&lt;br/&gt;&lt;br/&gt;%3사용 방법:%4&lt;br/&gt;%2%3요새화 도구%4를 가지십시오.&lt;br/&gt;%2[%3%12%4]를 사용하고 %3요새화%4를 선택하십시오.&lt;br/&gt;%2사용 가능한 요새를 선택하고 화면의 지시에 따라 배치하십시오.</Korean>
-            <Japanese>%3要塞ツール%4を使用すると、兵士はミッション作成者が提供した要塞を構築できます。&lt;br/&gt;&lt;br/&gt;%3使用方法:%4&lt;br/&gt;%2%3要塞ツール%4を持つ。&lt;br/&gt;%2[%3%12%4] を使って%3要塞%4を選択します。&lt;br/&gt;%2利用可能な構造物を選択し、画面上の指示に従って配置します。</Japanese>
+            <Japanese>%3築城ツール%4を使用すると、兵士はミッション作成者が提供した要塞を構築できます。&lt;br/&gt;&lt;br/&gt;%3使用方法:%4&lt;br/&gt;%2%3築城ツール%4を持つ。&lt;br/&gt;%2[%3%12%4] を使って%3野戦築城%4を選択します。&lt;br/&gt;%2利用可能な構造物を選択し、画面上の指示に従って配置します。</Japanese>
             <Spanish>La %3Herramienta de Fortificación%4 permite a los soldados construir fortificaciones provistas por su creador de mision.&lt;br/&gt;&lt;br/&gt;%3Uso:%4&lt;br/&gt;%2Coge una %3Herramienta de Fortificación%4.&lt;br/&gt;%2Usar [%3%12%4] y seleccionar %3Fortificar%4.&lt;br/&gt;%2Selecciona una fortificación disponible y sigue las instrucciones en pantalla para su colocación.</Spanish>
         </Key>
         <Key ID="STR_ACE_FieldManual_Items_Lockpick_ShortName">
diff --git a/addons/fire/XEH_postInit.sqf b/addons/fire/XEH_postInit.sqf
index 6588620d32..1050d75753 100644
--- a/addons/fire/XEH_postInit.sqf
+++ b/addons/fire/XEH_postInit.sqf
@@ -1,38 +1,22 @@
 #include "script_component.hpp"
 
-[QGVAR(burn), LINKFUNC(burn)] call CBA_fnc_addEventHandler;
-[QGVAR(burnEffects), LINKFUNC(burnEffects)] call CBA_fnc_addEventHandler;
-[QGVAR(burnSimulation), LINKFUNC(burnSimulation)] call CBA_fnc_addEventHandler;
-
-[QGVAR(playScream), {
-    params ["_scream", "_source"];
-
-    // Only play sound if enabled in settings and enabled for the unit
-    if (GVAR(enableScreams) && {_source getVariable [QGVAR(enableScreams), true]}) then {
-        _source say3D _scream;
-    };
-}] call CBA_fnc_addEventHandler;
-
 ["CBA_settingsInitialized", {
-    TRACE_1("settingsInit",GVAR(enabled));
+    TRACE_1("settingsInitialized",GVAR(enabled));
 
     if (!GVAR(enabled)) exitWith {};
 
-    // Make burning wrecks into fire sources
-    ["AllVehicles", "Killed", {
-        params ["_vehicle", "", "", "_useEffects"];
+    [QGVAR(burn), LINKFUNC(burn)] call CBA_fnc_addEventHandler;
+    [QGVAR(burnEffects), LINKFUNC(burnEffects)] call CBA_fnc_addEventHandler;
+    [QGVAR(burnSimulation), LINKFUNC(burnSimulation)] call CBA_fnc_addEventHandler;
 
-        if (_useEffects) then {
-            [QGVAR(addFireSource), [
-                _vehicle,
-                (boundingBoxReal [_vehicle, "FireGeometry"]) select 2,
-                BURN_MAX_INTENSITY,
-                QGVAR(wreck) + hashValue _vehicle,
-                {!isNull _this && {_this getEntityInfo 13}},
-                _vehicle
-            ]] call CBA_fnc_serverEvent;
+    [QGVAR(playScream), {
+        params ["_scream", "_source"];
+
+        // Only play sound if enabled in settings and enabled for the unit
+        if (GVAR(enableScreams) && {_source getVariable [QGVAR(enableScreams), true]}) then {
+            _source say3D _scream;
         };
-    }, true, ["CAManBase", "StaticWeapon"], true] call CBA_fnc_addClassEventHandler;
+    }] call CBA_fnc_addEventHandler;
 
     if (!isServer) exitWith {};
 
@@ -44,7 +28,7 @@
             ["_radius", 0, [0]],
             ["_intensity", 0, [0]],
             ["_key", ""],
-            ["_condition", {true}],
+            ["_condition", {true}, [{}]],
             ["_conditionArgs", []]
         ];
 
diff --git a/addons/fire/addon.toml b/addons/fire/addon.toml
deleted file mode 100644
index bf39213892..0000000000
--- a/addons/fire/addon.toml
+++ /dev/null
@@ -1,3 +0,0 @@
-[tools]
-pboProject_noBinConfig = true
-sqfvm_skipConfigChecks = true
diff --git a/addons/fire/ACE_Medical_Treatment_Actions.hpp b/addons/fire/compat_medical_engine/ACE_Medical_Treatment_Actions.hpp
similarity index 100%
rename from addons/fire/ACE_Medical_Treatment_Actions.hpp
rename to addons/fire/compat_medical_engine/ACE_Medical_Treatment_Actions.hpp
diff --git a/addons/fire/compat_medical_engine/config.cpp b/addons/fire/compat_medical_engine/config.cpp
new file mode 100644
index 0000000000..cc4431b18f
--- /dev/null
+++ b/addons/fire/compat_medical_engine/config.cpp
@@ -0,0 +1,20 @@
+#include "script_component.hpp"
+
+class CfgPatches {
+    class SUBADDON {
+        name = COMPONENT_NAME;
+        units[] = {};
+        weapons[] = {};
+        requiredVersion = REQUIRED_VERSION;
+        requiredAddons[] = {"ace_medical_engine"};
+        skipWhenMissingDependencies = 1;
+        author = ECSTRING(common,ACETeam);
+        authors[] = {};
+        url = ECSTRING(main,URL);
+        VERSION_CONFIG;
+
+        addonRootClass = QUOTE(ADDON);
+    };
+};
+
+#include "ACE_Medical_Treatment_Actions.hpp"
diff --git a/addons/fire/compat_medical_engine/script_component.hpp b/addons/fire/compat_medical_engine/script_component.hpp
new file mode 100644
index 0000000000..b2ce8adc8d
--- /dev/null
+++ b/addons/fire/compat_medical_engine/script_component.hpp
@@ -0,0 +1,3 @@
+#define SUBCOMPONENT medical_engine
+#define SUBCOMPONENT_BEAUTIFIED Medical Engine
+#include "..\script_component.hpp"
diff --git a/addons/fire/config.cpp b/addons/fire/config.cpp
index df2eb5cb79..7a13dd079b 100644
--- a/addons/fire/config.cpp
+++ b/addons/fire/config.cpp
@@ -1,20 +1,12 @@
 #include "script_component.hpp"
 
-#pragma hemtt flag pe23_ignore_has_include
-#if __has_include("\z\ace\addons\nomedical\script_component.hpp")
-#define PATCH_SKIP "No Medical"
-#endif
-
-#ifdef PATCH_SKIP
-ACE_PATCH_NOT_LOADED(ADDON,PATCH_SKIP)
-#else
 class CfgPatches {
     class ADDON {
         name = COMPONENT_NAME;
         units[] = {};
         weapons[] = {};
         requiredVersion = REQUIRED_VERSION;
-        requiredAddons[] = {"ace_common", "ace_medical_engine"};
+        requiredAddons[] = {"ace_common"};
         author = ECSTRING(common,ACETeam);
         authors[] = {"commy2", "tcvm"};
         url = ECSTRING(main,URL);
@@ -25,7 +17,4 @@ class CfgPatches {
 #include "CfgEventHandlers.hpp"
 #include "CfgSounds.hpp"
 #include "CfgVehicles.hpp"
-#include "ACE_Medical_Treatment_Actions.hpp"
 #include "RscTitles.hpp"
-
-#endif
diff --git a/addons/fire/functions/fnc_burnSimulation.sqf b/addons/fire/functions/fnc_burnSimulation.sqf
index 8a1dddfc15..e061d1ce91 100644
--- a/addons/fire/functions/fnc_burnSimulation.sqf
+++ b/addons/fire/functions/fnc_burnSimulation.sqf
@@ -38,7 +38,7 @@ params ["_unit", "_instigator"];
         [QGVAR(burnSimulation), [_unit, _instigator], _unit] call CBA_fnc_targetEvent;
     };
 
-    // If unit is invulnerable or in water or if the fire has died out, stop burning unit
+    // If the unit is invulnerable, in water or if the fire has died out, stop burning the unit
     if (
         !(_unit call FUNC(isBurning)) ||
         {!(isDamageAllowed _unit && {_unit getVariable [QEGVAR(medical,allowDamage), true]})} ||
@@ -69,11 +69,9 @@ params ["_unit", "_instigator"];
     if (_intensity >= BURN_THRESHOLD_INTENSE) then {
         TRACE_2("check for other units",_unit,_intensity);
 
-        private _adjustedIntensity = 0;
-
         {
-            _distancePercent = 1 - ((_unit distance _x) / BURN_PROPAGATE_DISTANCE);
-            _adjustedIntensity = _intensity * _distancePercent;
+            private _distancePercent = 1 - ((_unit distance _x) / BURN_PROPAGATE_DISTANCE);
+            private _adjustedIntensity = _intensity * _distancePercent;
 
             // Don't burn if intensity is too low or already burning with higher intensity
             if (BURN_MIN_INTENSITY > _adjustedIntensity || {(_x getVariable [QGVAR(intensity), 0]) > _adjustedIntensity}) then {
@@ -95,7 +93,12 @@ params ["_unit", "_instigator"];
         _intensity = _intensity - INTENSITY_LOSS - (rain / 10);
 
         if (_unit call EFUNC(common,isAwake)) then {
-            if (!isPlayer _unit) then {
+            if (_unit call EFUNC(common,isPlayer)) then {
+                // Decrease intensity of burn if rolling around
+                if ((animationState _unit) in PRONE_ROLLING_ANIMS) then {
+                    _intensity = _intensity * INTENSITY_DECREASE_MULT_ROLLING;
+                };
+            } else {
                 private _sdr = _unit getVariable [QGVAR(stopDropRoll), false];
 
                 private _vehicle = objectParent _unit;
@@ -139,31 +142,36 @@ params ["_unit", "_instigator"];
                     _unit setSpeedMode "FULL";
                     _unit setSuppression 1;
                 };
-            } else {
-                // Decrease intensity of burn if rolling around
-                if ((animationState _unit) in PRONE_ROLLING_ANIMS) then {
-                    _intensity = _intensity * INTENSITY_DECREASE_MULT_ROLLING;
-                };
             };
 
             // Play screams and throw weapon (if enabled)
             _unit call FUNC(burnReaction);
         };
 
-        if (!isNull _instigator) then {
-            _unit setVariable [QEGVAR(medical,lastDamageSource), _instigator];
-            _unit setVariable [QEGVAR(medical,lastInstigator), _instigator];
+        // Keep pain around unconsciousness limit to allow for more fun interactions
+        private _painPercieved = (0 max ((_unit getVariable [QEGVAR(medical,pain), 0]) - (_unit getVariable [QEGVAR(medical,painSuppress), 0])) min 1);
+        private _painUnconscious = missionNamespace getVariable [QEGVAR(medical,painUnconsciousThreshold), 0];
+        private _damageToAdd = [0.15, _intensity / BURN_MAX_INTENSITY] select (!alive _unit || {_painPercieved < _painUnconscious + random 0.2});
+
+        if (GETEGVAR(medical,enabled,false)) then {
+            if (!isNull _instigator) then {
+                _unit setVariable [QEGVAR(medical,lastDamageSource), _instigator];
+                _unit setVariable [QEGVAR(medical,lastInstigator), _instigator];
+            };
+
+            // Common burn areas are the hands and face https://www.ncbi.nlm.nih.gov/pubmed/16899341/
+            private _bodyPart = ["Head", "Body", "LeftArm", "RightArm", "LeftLeg", "RightLeg"] selectRandomWeighted [0.77, 0.5, 0.8, 0.8, 0.3, 0.3];
+
+            // Use event directly, as ace_medical_fnc_addDamageToUnit requires unit to be alive
+            [QEGVAR(medical,woundReceived), [_unit, [[_damageToAdd, _bodyPart, _damageToAdd]], _instigator, "burn"]] call CBA_fnc_localEvent;
+        } else {
+            private _bodyParts = [["HitFace", "HitNeck", "HitHead"], ["HitPelvis", "HitAbdomen", "HitDiaphragm", "HitChest", "HitBody"], ["HitArms", "HitHands"], ["HitLegs"]] selectRandomWeighted [0.77, 0.5, 0.8, 0.3];
+
+            {
+                _unit setHitPointDamage [_x, (_unit getHitPointDamage _x) + _damageToAdd, true, _instigator, _instigator];
+            } forEach _bodyParts;
         };
 
-        // Common burn areas are the hands and face https://www.ncbi.nlm.nih.gov/pubmed/16899341/
-        private _bodyPart = ["Head", "Body", "LeftArm", "RightArm", "LeftLeg", "RightLeg"] selectRandomWeighted [0.77, 0.5, 0.8, 0.8, 0.3, 0.3];
-
-        // Keep pain around unconciousness limit to allow for more fun interactions
-        private _damageToAdd = [0.15, _intensity / BURN_MAX_INTENSITY] select (!alive _unit || {GET_PAIN_PERCEIVED(_unit) < (PAIN_UNCONSCIOUS + random 0.2)});
-
-        // Use event directly, as ace_medical_fnc_addDamageToUnit requires unit to be alive
-        [QEGVAR(medical,woundReceived), [_unit, [[_damageToAdd, _bodyPart, _damageToAdd]], _instigator, "burn"]] call CBA_fnc_localEvent;
-
         _unit setVariable [QGVAR(intensity), _intensity, true]; // Globally sync intensity across all clients to make sure simulation is deterministic
     };
 }, BURN_PROPAGATE_UPDATE, [_unit, _instigator]] call CBA_fnc_addPerFrameHandler;
diff --git a/addons/fire/functions/fnc_fireManagerPFH.sqf b/addons/fire/functions/fnc_fireManagerPFH.sqf
index 4cdc61a7ac..924279e3c8 100644
--- a/addons/fire/functions/fnc_fireManagerPFH.sqf
+++ b/addons/fire/functions/fnc_fireManagerPFH.sqf
@@ -15,9 +15,6 @@
  * Public: No
  */
 
-private _distancePercent = 0;
-private _adjustedIntensity = 0;
-
 {
     _y params ["_fireLogic", "_radius", "_intensity", "_condition", "_conditionArgs"];
     TRACE_2("fireManagerPFH loop",_x,_y);
@@ -36,8 +33,8 @@ private _adjustedIntensity = 0;
 
     // Burn units (alive or dead) close to the fire
     {
-        _distancePercent = 1 - ((_fireLogic distance _x) / _radius);
-        _adjustedIntensity = _intensity * _distancePercent;
+        private _distancePercent = 1 - ((_fireLogic distance _x) / _radius);
+        private _adjustedIntensity = _intensity * _distancePercent;
 
         // Don't burn if intensity is too low or already burning with higher intensity
         if (BURN_MIN_INTENSITY > _adjustedIntensity || {(_x getVariable [QGVAR(intensity), 0]) > _adjustedIntensity}) then {
diff --git a/addons/fire/initSettings.inc.sqf b/addons/fire/initSettings.inc.sqf
index edcd51a8a7..d9649c2ad9 100644
--- a/addons/fire/initSettings.inc.sqf
+++ b/addons/fire/initSettings.inc.sqf
@@ -5,7 +5,7 @@
     LSTRING(Category_DisplayName),
     true,
     1,
-    {[QGVAR(fireEnabled), _this] call EFUNC(common,cbaSettings_settingChanged)},
+    {[QGVAR(enabled), _this] call EFUNC(common,cbaSettings_settingChanged)},
     true // Needs mission restart
 ] call CBA_fnc_addSetting;
 
diff --git a/addons/fire/script_component.hpp b/addons/fire/script_component.hpp
index ebb0002ff6..f4b636286b 100644
--- a/addons/fire/script_component.hpp
+++ b/addons/fire/script_component.hpp
@@ -16,7 +16,6 @@
 #endif
 
 #include "\z\ace\addons\main\script_macros.hpp"
-#include "\z\ace\addons\medical_engine\script_macros_medical.hpp"
 
 #define FIRE_MANAGER_PFH_DELAY 0.25
 #define FLARE_SIZE_MODIFIER 5
diff --git a/addons/fortify/functions/fnc_setupModule.sqf b/addons/fortify/functions/fnc_setupModule.sqf
index f032d98ebe..1215393a46 100644
--- a/addons/fortify/functions/fnc_setupModule.sqf
+++ b/addons/fortify/functions/fnc_setupModule.sqf
@@ -48,10 +48,10 @@ if IS_NUMBER(_preset) then { // Legacy support
 };
 
 private _budget = _logic getVariable ["Budget", -1];
-if (!(_budget isEqualType 0)) then {_budget = -1};
+if !(_budget isEqualType 0) then {_budget = -1};
 
 private _addToolItem = _logic getVariable ["AddToolItem", false];
-if (!(_addToolItem isEqualType false)) then {_addToolItem = false};
+if !(_addToolItem isEqualType false) then {_addToolItem = false};
 
 
 private _objects = [_preset] call FUNC(getPlaceableSet);
diff --git a/addons/fortify/stringtable.xml b/addons/fortify/stringtable.xml
index 15150d6685..028cfbd9b2 100644
--- a/addons/fortify/stringtable.xml
+++ b/addons/fortify/stringtable.xml
@@ -4,7 +4,7 @@
         <Key ID="STR_ACE_Fortify_Fortify">
             <English>Fortify</English>
             <German>Verstärken</German>
-            <Japanese>要塞</Japanese>
+            <Japanese>野戦築城</Japanese>
             <Korean>요새화</Korean>
             <Italian>Fortifica</Italian>
             <Chinese>要塞</Chinese>
@@ -20,7 +20,7 @@
             <English>Fortify Tool</English>
             <German>Bauwerkzeug</German>
             <Italian>Attrezzo di Fortificazione</Italian>
-            <Japanese>要塞ツール</Japanese>
+            <Japanese>築城ツール</Japanese>
             <Korean>요새화 도구</Korean>
             <Chinese>要塞工具</Chinese>
             <Chinesesimp>设防工具</Chinesesimp>
@@ -49,7 +49,7 @@
         <Key ID="STR_ACE_Fortify_addToolItem">
             <English>Auto add fortify item</English>
             <German>Füge das Bauwerkzeug automatisch hinzu</German>
-            <Japanese>自動的に要塞ツールを追加</Japanese>
+            <Japanese>自動的に築城ツールを追加</Japanese>
             <Italian>Auto-aggiungi attrezzo di fortificazione</Italian>
             <Korean>요새화 도구 자동으로 추가</Korean>
             <Chinese>自動增加要塞物品</Chinese>
@@ -67,7 +67,7 @@
             <Italian>Inizializza il sistema di fortificazione con alcuni parametri di base.&lt;br/&gt;Preset vengono presi da configFile and missionConfigFile, leggi la wiki per il formato richiesto.</Italian>
             <Russian>Инициализирует систему фортификации с некоторыми базовыми параметрами.&lt;br/&gt;Предустановки взяты из configFile и missionConfigFile, формат смотри на wiki.</Russian>
             <Turkish>Inşa etme sistemini bazı temel parametrelerle başlatır. &lt;br/&gt; Ön ayarlar configFile ve missionConfigFile'dan alınır, format için wiki'ye bakın.</Turkish>
-            <Japanese>要塞システムを初期設定に戻します。&lt;br/&gt;プリセットは configfile と missionConfigFile から参照されます。詳細は wiki を参照してください。</Japanese>
+            <Japanese>野戦築城システムを初期設定に戻します。&lt;br/&gt;プリセットは configfile と missionConfigFile から参照されます。詳細は wiki を参照してください。</Japanese>
             <German>Initialisiert das Verstärken-System, mit grundlegenden Einstellungen &lt;br/&gt;Vorseinstellungen werden aus der configFile und der missionConfigFile gezogen, für mehr Informationen: siehe das ACE Wiki.</German>
             <Chinesesimp>使用一些基本参数初始化设防系统。&lt;br/&gt;预设从 configFile 和 missionConfigFile 中提取，参见 wiki 的格式。</Chinesesimp>
             <Korean>기본 파라미터와 함께 요새화 시스템을 활성화합니다&lt;br/&gt;configFile 과 missionConfigFile에서 프리셋을 뽑아옵니다, 포맷은 위키를 참조하십시오.</Korean>
@@ -103,7 +103,7 @@
             <Italian>Conferma Posizionamento</Italian>
             <Hungarian>Lerak</Hungarian>
             <Portuguese>Confirmar implantação</Portuguese>
-            <Japanese>ここで作る</Japanese>
+            <Japanese>配置を確定</Japanese>
             <Korean>설치 확인</Korean>
             <Chinesesimp>确认部署</Chinesesimp>
             <Chinese>確認佈署</Chinese>
@@ -112,7 +112,7 @@
         <Key ID="STR_ACE_Fortify_buildLocationModule">
             <English>Fortify: Limit Build Area</English>
             <German>Verstärken: Beschränke Baubereich</German>
-            <Japanese>要塞: 構築制限エリア</Japanese>
+            <Japanese>野戦築城: 構築制限エリア</Japanese>
             <Chinese>要塞: 限制建造區</Chinese>
             <Italian>Fortificazione: Limita Area</Italian>
             <Chinesesimp>设防：限制建造区</Chinesesimp>
@@ -130,7 +130,7 @@
             <Italian>ACE Fortificazione</Italian>
             <Chinese>ACE 要塞</Chinese>
             <Chinesesimp>ACE 设防</Chinesesimp>
-            <Japanese>ACE 要塞</Japanese>
+            <Japanese>ACE 野戦築城</Japanese>
             <Polish>ACE Fortyfikowanie</Polish>
             <Russian>ACE Фортификация</Russian>
             <Turkish>ACE Inşa Etme</Turkish>
@@ -190,7 +190,7 @@
             <Italian>Ha l'attrezzo di fortificazione</Italian>
             <Chinese>有要塞工具</Chinese>
             <Chinesesimp>有设防工具</Chinesesimp>
-            <Japanese>要塞ツール所持時</Japanese>
+            <Japanese>築城ツール所持時</Japanese>
             <Polish>Posiada narzędzie do fortyfikowania</Polish>
             <Russian>Если имеется инструмент</Russian>
             <Turkish>Insa Etme Aleti Olanlara Göster</Turkish>
@@ -233,7 +233,7 @@
             <Korean>건축물을 지을 때 걸리는 시간을 계수를 적용하여 계산합니다.</Korean>
             <German>Koeffizient zur Bestimmung der Bauzeit \nA in Ax + b, wobei x die Kosten des Objekts sind.</German>
             <Italian>Il coefficiente 'C' che determina il tempo di costruzione.\nTempo Totale = Costo * C + Tempo Minimo</Italian>
-            <Japanese>建造する時間を定義するために使用される係数。\n計算式はAx + bです。この係数はAであり、xは建造物のコストです。</Japanese>
+            <Japanese>構築する時間を定義するために使用される係数。\n計算式はAx + bです。この係数はAであり、xは構築物のコストです。</Japanese>
             <Polish>Współczynnik używany do określenia czasu budowy konstrukcji.\nA w Ax + b gdzie x jest kosztem obiektu</Polish>
             <Russian>Коэффициент используемый для указания времени необходимого для возведения постройки.\nA в формуле Ax + b, где x - это цена объекта</Russian>
             <Spanish>Coeficiente usado para determinar el tiempo de construcción de una estructura.\nA en Ax + b donde x es el coste del objeto</Spanish>
@@ -246,7 +246,7 @@
             <Korean>최소 건축 시간</Korean>
             <German>Minimale Bauzeit</German>
             <Italian>Tempo di costruzione minimo</Italian>
-            <Japanese>最短建造時間</Japanese>
+            <Japanese>最短構築時間</Japanese>
             <Polish>Minimalny czas budowy</Polish>
             <Russian>Мин. время возведения</Russian>
             <Spanish>Tiempo mínimo de construcción</Spanish>
@@ -259,7 +259,7 @@
             <Korean>건축물을 지을 때 걸리는 최소 시간을 계수를 적용하여 계산합니다.</Korean>
             <German>Mindestzeit für den Bau eines beliebigen Bauwerks.\nb in Ax + b, wobei x die Kosten des Objekts sind.</German>
             <Italian>Tempo minimo necessario per costruire una qualsiasi fortificazione.\nTempo Totale = Costo * CoefT/C + Tempo Minimo</Italian>
-            <Japanese>建造に掛かる最短時間。\n計算式はAx + bです。この時間はbであり、xは建造物のコストです。</Japanese>
+            <Japanese>構築に掛かる最短時間。\n計算式はAx + bです。この時間はbであり、xは構築物のコストです。</Japanese>
             <Polish>Minimalny czas do zbudowania dowolenj konstrukcji.\nb w Ax + b gdzie x jest kosztem obiektu</Polish>
             <Russian>Минимальное время для возведения любой постройки.\nb в формуле Ax + b, где x - это цена объекта</Russian>
             <Spanish>Tiempo mínimo para construir una estructura.\nb en Ax + b donde x es el coste del objeto</Spanish>
@@ -272,7 +272,7 @@
             <Korean>건설 중</Korean>
             <German>Bauwerk</German>
             <Italian>Costruendo</Italian>
-            <Japanese>建造</Japanese>
+            <Japanese>構築中</Japanese>
             <Polish>Budowanie</Polish>
             <Russian>Возведение</Russian>
             <Spanish>Construyendo</Spanish>
@@ -298,7 +298,7 @@
             <Korean>건축물을 건설하고 나서 지도에 마커를 생성합니다</Korean>
             <German>Erstellen von Kartenmarkierungen, die wie Gebäude im Gelände aussehen, wenn statische Befestigungen platziert werden</German>
             <Italian>Crea marker che appaiono come edifici sulla mappa lì dove vengono costruite fortificazioni</Italian>
-            <Japanese>静的な建築物が配置されたときに地形の建物のように見えるマップマーカーを生成します</Japanese>
+            <Japanese>静的な構築物が配置されたときに地形の建物のように見えるマップマーカーを生成します</Japanese>
             <Polish>Utwórz znaczniki mapy, które wyglądają jak obiekty terenu, gdy umieszczane są statyczne fortyfikacje</Polish>
             <Russian>Создавать маркера от статических фортификаций как от зданий на карте</Russian>
             <Spanish>Crear marcadores de mapa que tienen la apariencia de edificios del terreno cuando las fortificaciones estáticas son colocadas</Spanish>
diff --git a/addons/frag/XEH_postInit.sqf b/addons/frag/XEH_postInit.sqf
index 096b4dde97..cc58e1d15b 100644
--- a/addons/frag/XEH_postInit.sqf
+++ b/addons/frag/XEH_postInit.sqf
@@ -18,7 +18,7 @@ if (isServer) then {
 }] call CBA_fnc_addEventHandler;
 
 // Cache for ammo type configs
-GVAR(cacheRoundsTypesToTrack) = [false] call CBA_fnc_createNamespace;
+GVAR(cacheRoundsTypesToTrack) = createHashMap;
 
 
 // Debug stuff:
diff --git a/addons/frag/functions/fnc_doSpall.sqf b/addons/frag/functions/fnc_doSpall.sqf
index 8b5a06d812..b206c701b2 100644
--- a/addons/frag/functions/fnc_doSpall.sqf
+++ b/addons/frag/functions/fnc_doSpall.sqf
@@ -25,7 +25,7 @@ private _hpData = (_hitData select 1) select _hitPartDataIndex;
 private _objectHit = _hpData param [0, objNull];
 TRACE_1("",_objectHit);
 if ((isNil "_objectHit") || {isNull _objectHit}) exitWith {WARNING_1("Problem with hitPart data - bad object [%1]",_objectHit);};
-_objectHit removeEventHandler ["hitPart", _hpId];
+_objectHit removeEventHandler ["HitPart", _hpId];
 
 private _caliber = getNumber (configFile >> "CfgAmmo" >> _roundType >> "caliber");
 private _explosive = getNumber (configFile >> "CfgAmmo" >> _roundType >> "explosive");
diff --git a/addons/frag/functions/fnc_findReflections.sqf b/addons/frag/functions/fnc_findReflections.sqf
index b0ae161597..a753934fe8 100644
--- a/addons/frag/functions/fnc_findReflections.sqf
+++ b/addons/frag/functions/fnc_findReflections.sqf
@@ -65,7 +65,7 @@ if (_zIndex < 5) then {
     while {count _nlos != count _excludes && {_c < (count _nlos)}} do {
         scopeName "mainSearch";
         {
-            if (!(_forEachIndex in _excludes)) then {
+            if !(_forEachIndex in _excludes) then {
                 private _index = _buckets pushBack [_x, [_x]];
                 _excludes pushBack _forEachIndex;
                 _bucketPos = _x;
@@ -74,7 +74,7 @@ if (_zIndex < 5) then {
             };
         } forEach _nlos;
         {
-            if (!(_forEachIndex in _excludes)) then {
+            if !(_forEachIndex in _excludes) then {
                 _testPos = _x;
                 if (_testPos vectorDistanceSqr _bucketPos <= 30) then {
                     _bucketList pushBack _x;
@@ -120,7 +120,7 @@ if (_zIndex < 5) then {
     // _dirvec = _pos vectorFromTo ((player modelToWorldVisualWorld (player selectionPosition "Spine3")));
     // _dirvec = _dirvec vectorMultiply 100;
     // _can setVelocity _dirvec;
-    [DFUNC(doExplosions), 0, [_explosions, 0]] call CBA_fnc_addPerFrameHandler;
+    [LINKFUNC(doExplosions), 0, [_explosions, 0]] call CBA_fnc_addPerFrameHandler;
     [_pfhID] call CBA_fnc_removePerFrameHandler;
 };
 END_COUNTER(fnc_findReflections);
diff --git a/addons/frag/functions/fnc_fired.sqf b/addons/frag/functions/fnc_fired.sqf
index 7ea4212d9a..03d2fab609 100644
--- a/addons/frag/functions/fnc_fired.sqf
+++ b/addons/frag/functions/fnc_fired.sqf
@@ -19,7 +19,7 @@
 //IGNORE_PRIVATE_WARNING ["_unit", "_weapon", "_muzzle", "_mode", "_ammo", "_magazine", "_projectile", "_vehicle", "_gunner", "_turret"];
 TRACE_10("firedEH:",_unit,_weapon,_muzzle,_mode,_ammo,_magazine,_projectile,_vehicle,_gunner,_turret);
 
-private _shouldAdd = GVAR(cacheRoundsTypesToTrack) getVariable _ammo;
+private _shouldAdd = GVAR(cacheRoundsTypesToTrack) get _ammo;
 if (isNil "_shouldAdd") then {
     TRACE_1("no cache for round",_ammo);
 
@@ -40,7 +40,7 @@ if (isNil "_shouldAdd") then {
     };
 
     TRACE_6("Setting Cache",_skip,_explosive,_indirectRange,_force,_fragPower,_shouldAdd);
-    GVAR(cacheRoundsTypesToTrack) setVariable [_ammo, _shouldAdd];
+    GVAR(cacheRoundsTypesToTrack) set [_ammo, _shouldAdd];
 };
 
 if (_shouldAdd) then {
diff --git a/addons/frag/functions/fnc_frago.sqf b/addons/frag/functions/fnc_frago.sqf
index 87fabc4fc5..8fd77dbc73 100644
--- a/addons/frag/functions/fnc_frago.sqf
+++ b/addons/frag/functions/fnc_frago.sqf
@@ -127,7 +127,7 @@ if (_objects isNotEqualTo []) then {
             if (_currentCount < 10) then {
                 private _count = ceil (random (sqrt (_m / 1000)));
                 private _vecVar = FRAG_VEC_VAR;
-                if (!(_target isKindOf "Man")) then {
+                if !(_target isKindOf "Man") then {
                     ADD(_vecVar,(sqrt _cubic) / 2000);
                     if ((crew _target) isEqualTo [] && {_count > 0}) then {
                         _count = 0 max (_count / 2);
diff --git a/addons/frag/functions/fnc_masterPFH.sqf b/addons/frag/functions/fnc_masterPFH.sqf
index ef0fbc3eda..004af9a9ce 100644
--- a/addons/frag/functions/fnc_masterPFH.sqf
+++ b/addons/frag/functions/fnc_masterPFH.sqf
@@ -34,7 +34,7 @@ while {_objectCount > 0 && {_iter < (GVAR(maxTrackPerFrame) min _objectCount)}}
     if (!isNil "_object") then {
         private _args = GVAR(arguments) select GVAR(lastIterationIndex);
 
-        if (!(_args call FUNC(pfhRound))) then {
+        if !(_args call FUNC(pfhRound)) then {
             _gcIndex pushBack GVAR(lastIterationIndex); // Add it to the GC if it returns false
         };
     };
diff --git a/addons/frag/functions/fnc_pfhRound.sqf b/addons/frag/functions/fnc_pfhRound.sqf
index ce734a08e3..0c261dcffb 100644
--- a/addons/frag/functions/fnc_pfhRound.sqf
+++ b/addons/frag/functions/fnc_pfhRound.sqf
@@ -41,7 +41,7 @@ if (!alive _round) exitWith {
         TRACE_1("doSpall",_foundObjectHPIds);
         {
             if (!isNil "_x") then {
-                _x removeEventHandler ["hitPart", _foundObjectHPIds select _forEachIndex];
+                _x removeEventHandler ["HitPart", _foundObjectHPIds select _forEachIndex];
             };
         } forEach _spallTrack;
     };
diff --git a/addons/frag/functions/fnc_spallTrack.sqf b/addons/frag/functions/fnc_spallTrack.sqf
index 43dae8afcb..50ca64b6ec 100644
--- a/addons/frag/functions/fnc_spallTrack.sqf
+++ b/addons/frag/functions/fnc_spallTrack.sqf
@@ -31,7 +31,7 @@ if (_intersectsWith isEqualTo []) exitWith {};
 {
     // diag_log text format ["Adding HP: %1", _x];
     private _index = count GVAR(spallHPData);
-    private _hpId = _x addEventHandler ["hitPart", compile format ["[%1, _this] call " + QFUNC(spallHP), _index]];
+    private _hpId = _x addEventHandler ["HitPart", compile format ["[%1, _this] call " + QFUNC(spallHP), _index]];
     _foundObjects pushBack _x;
     _foundObjectHPIds pushBack _hpId;
     private _data = [_hpId, _x, typeOf _round, _round, _curPos, _velocity, 0, _foundObjects, _foundObjectHPIds];
diff --git a/addons/gestures/stringtable.xml b/addons/gestures/stringtable.xml
index 33b73290c3..0f483e17a2 100644
--- a/addons/gestures/stringtable.xml
+++ b/addons/gestures/stringtable.xml
@@ -12,7 +12,7 @@
             <Portuguese>ACE Gestos</Portuguese>
             <Russian>ACE Жесты</Russian>
             <Spanish>ACE Gestos</Spanish>
-            <Japanese>ACE ジェスチャー</Japanese>
+            <Japanese>ACE ジェスチャ</Japanese>
             <Korean>ACE 수신호</Korean>
             <Chinesesimp>ACE 手势</Chinesesimp>
             <Chinese>ACE 手勢</Chinese>
@@ -29,7 +29,7 @@
             <Portuguese>ACE Gestos</Portuguese>
             <Russian>ACE Жесты</Russian>
             <Spanish>ACE Gestos</Spanish>
-            <Japanese>ACE ジェスチャー</Japanese>
+            <Japanese>ACE ジェスチャ</Japanese>
             <Korean>ACE 수신호</Korean>
             <Chinesesimp>ACE 手势</Chinesesimp>
             <Chinese>ACE 手勢</Chinese>
@@ -46,7 +46,7 @@
             <Hungarian>Kézjelek</Hungarian>
             <Portuguese>Gestos</Portuguese>
             <Italian>Gesti</Italian>
-            <Japanese>ジェスチャー</Japanese>
+            <Japanese>ジェスチャ</Japanese>
             <Korean>수신호</Korean>
             <Chinesesimp>手势</Chinesesimp>
             <Chinese>手勢</Chinese>
@@ -293,7 +293,7 @@
             <French>Afficher les gestes dans le menu d'interaction</French>
             <Portuguese>Mostrar gestos no menu de interação</Portuguese>
             <Russian>Показать жесты в меню взаимодействия</Russian>
-            <Japanese>インタラクションメニュー上でジェスチャー表示</Japanese>
+            <Japanese>ジェスチャのアクションを表示</Japanese>
             <Korean>수신호를 상호작용 메뉴에서 보여줍니다</Korean>
             <Chinesesimp>显示手势互动菜单</Chinesesimp>
             <Chinese>顯示手勢互動選單</Chinese>
@@ -309,7 +309,7 @@
             <French>Afficher les gestes dans le menu d'interaction personnel, ou utiliser uniquement les touches, ou désactiver complètement.</French>
             <Portuguese>Mostra gestos no menu de interação, ou utilize um dos atalhos de teclado ou desative completamente</Portuguese>
             <Russian>Показать жесты в меню взамиодейтсвия с собой или только использовать горячие клавиши, или полностью отключить</Russian>
-            <Japanese>セルフ インタラクションメニューでジェスチャーを表示するか、キーバインドのみを使用するか、完全に無効にします</Japanese>
+            <Japanese>セルフ・インタラクション メニューにジェスチャのアクションを表示するか、キーバインドのみを使用するか、完全に無効にします</Japanese>
             <Korean>수신호를 상호작용 메뉴에서 보여주거나 혹은 단축키를 지정하거나 아니면 아예 사용하지 않습니다.</Korean>
             <Chinesesimp>显示手势选项在自己的互动菜单上，或只利用键盘来使用手势，或完全禁用</Chinesesimp>
             <Chinese>顯示手勢選項在自己的互動選單上，或只利用鍵盤來使用手勢，或完全禁用</Chinese>
@@ -341,7 +341,7 @@
             <French>Touches + menu d'interaction</French>
             <Portuguese>Atalhos + Menu de Interação</Portuguese>
             <Russian>Клавиши + Меню взаимодействия</Russian>
-            <Japanese>キー操作とインタラクションメニュー</Japanese>
+            <Japanese>キー操作とメニュー</Japanese>
             <Korean>단축키 및 상호작용 메뉴</Korean>
             <Chinesesimp>键盘 + 互动菜单</Chinesesimp>
             <Chinese>鍵盤 + 互動選單</Chinese>
diff --git a/addons/gforces/functions/fnc_pfhUpdateGForces.sqf b/addons/gforces/functions/fnc_pfhUpdateGForces.sqf
index 7ff3444b7d..487ba15b2a 100644
--- a/addons/gforces/functions/fnc_pfhUpdateGForces.sqf
+++ b/addons/gforces/functions/fnc_pfhUpdateGForces.sqf
@@ -71,13 +71,13 @@ private _suitCoef = if ((uniform ACE_player) != "") then {
 private _gBlackOut = MAXVIRTUALG / _classCoef + MAXVIRTUALG / _suitCoef - MAXVIRTUALG;
 
 // Unconsciousness
-if ((_average > _gBlackOut) && {["ace_medical"] call EFUNC(common,isModLoaded) && {!(ACE_player getVariable ["ACE_isUnconscious", false])}}) then {
+if (_average > _gBlackOut && {GETEGVAR(medical,enabled,false) && {ACE_player call EFUNC(common,isAwake)}}) then {
     [ACE_player, true, (10 + floor(random 5)), true] call EFUNC(medical,setUnconscious);
 };
 
 GVAR(GForces_CC) ppEffectAdjust [1,1,0,[0,0,0,1],[0,0,0,0],[1,1,1,1],[10,10,0,0,0,0.1,0.5]];
 
-if !(ACE_player getVariable ["ACE_isUnconscious", false]) then {
+if (ACE_player call EFUNC(common,isAwake)) then {
     if (_average > 0.30 * _gBlackOut) then {
         private _strength = ((_average - 0.30 * _gBlackOut) / (0.70 * _gBlackOut)) max 0;
         GVAR(GForces_CC) ppEffectAdjust [1,1,0,[0,0,0,1],[0,0,0,0],[1,1,1,1],[2 * (1 - _strength),2 * (1 - _strength),0,0,0,0.1,0.5]];
diff --git a/addons/goggles/functions/fnc_canWipeGlasses.sqf b/addons/goggles/functions/fnc_canWipeGlasses.sqf
index ef9d961bc1..cb24b4137a 100644
--- a/addons/goggles/functions/fnc_canWipeGlasses.sqf
+++ b/addons/goggles/functions/fnc_canWipeGlasses.sqf
@@ -15,4 +15,4 @@
  * Public: No
  */
 
-GVAR(effects) in [2, 3] && {!GETVAR(ACE_player,ACE_isUnconscious,false)} // return
+GVAR(effects) in [2, 3] && {ACE_player call EFUNC(common,isAwake)} // return
diff --git a/addons/goggles/stringtable.xml b/addons/goggles/stringtable.xml
index f02b95bf5c..233ac3e6ca 100644
--- a/addons/goggles/stringtable.xml
+++ b/addons/goggles/stringtable.xml
@@ -137,7 +137,7 @@
             <Polish>Pokaż interakcję Wyczyść Gogle</Polish>
             <Italian>Mostra interazione automatica per la pulizia degli occhiali</Italian>
             <Czech>Ukaž Vyčistit brýle v menu Interakce (vlastní)</Czech>
-            <Japanese>ゴーグル拭き取りをｾﾙﾌ ｲﾝﾀﾗｸｼｮﾝに表示</Japanese>
+            <Japanese>ゴーグル拭き取りのアクションを表示</Japanese>
             <Chinese>在自我互動中顯示擦拭護目鏡的動作</Chinese>
             <Chinesesimp>在自我互动中显示擦拭护目镜的动作</Chinesesimp>
             <French>Afficher l'interaction "Essuyer les lunettes"</French>
diff --git a/addons/grenades/CfgAmmo.hpp b/addons/grenades/CfgAmmo.hpp
index e911e23747..2b0849d2f7 100644
--- a/addons/grenades/CfgAmmo.hpp
+++ b/addons/grenades/CfgAmmo.hpp
@@ -1,4 +1,3 @@
-
 class CfgAmmo {
     class Default;
     class Grenade: Default {
diff --git a/addons/grenades/CfgEventHandlers.hpp b/addons/grenades/CfgEventHandlers.hpp
index 6c29240403..f6503c2479 100644
--- a/addons/grenades/CfgEventHandlers.hpp
+++ b/addons/grenades/CfgEventHandlers.hpp
@@ -1,4 +1,3 @@
-
 class Extended_PreStart_EventHandlers {
     class ADDON {
         init = QUOTE(call COMPILE_SCRIPT(XEH_preStart));
diff --git a/addons/grenades/CfgMagazines.hpp b/addons/grenades/CfgMagazines.hpp
index ea4641ab7f..2ff86c443d 100644
--- a/addons/grenades/CfgMagazines.hpp
+++ b/addons/grenades/CfgMagazines.hpp
@@ -1,4 +1,3 @@
-
 class CfgMagazines {
     class HandGrenade;
     class ACE_HandFlare_Base: HandGrenade {
diff --git a/addons/grenades/CfgVehicles.hpp b/addons/grenades/CfgVehicles.hpp
index f9ac60d9fe..34cf4196e6 100644
--- a/addons/grenades/CfgVehicles.hpp
+++ b/addons/grenades/CfgVehicles.hpp
@@ -1,4 +1,3 @@
-
 class CfgVehicles {
     class NATO_Box_Base;
     class Box_NATO_Grenades_F: NATO_Box_Base {
diff --git a/addons/grenades/CfgWeapons.hpp b/addons/grenades/CfgWeapons.hpp
index 842862f7f9..683ec7532b 100644
--- a/addons/grenades/CfgWeapons.hpp
+++ b/addons/grenades/CfgWeapons.hpp
@@ -1,4 +1,3 @@
-
 class CfgWeapons {
     class GrenadeLauncher;
     class Throw: GrenadeLauncher {
diff --git a/addons/grenades/Effects.hpp b/addons/grenades/Effects.hpp
index 95c3f12ba8..b4a16c6412 100644
--- a/addons/grenades/Effects.hpp
+++ b/addons/grenades/Effects.hpp
@@ -1,4 +1,3 @@
-
 class ACE_M84FlashbangEffect {
     // empty
 };
diff --git a/addons/grenades/XEH_PREP.hpp b/addons/grenades/XEH_PREP.hpp
index 6b5fb57801..06ceebc6b4 100644
--- a/addons/grenades/XEH_PREP.hpp
+++ b/addons/grenades/XEH_PREP.hpp
@@ -1,8 +1,8 @@
-
+PREP(addChangeFuseItemContextMenuOptions);
+PREP(damageEngineAndWheels);
 PREP(flare);
 PREP(flashbangExplosionEH);
 PREP(flashbangThrownFuze);
 PREP(incendiary);
 PREP(nextMode);
 PREP(throwGrenade);
-PREP(addChangeFuseItemContextMenuOptions);
diff --git a/addons/grenades/XEH_postInit.sqf b/addons/grenades/XEH_postInit.sqf
index 21282ab1ce..c13bc81b43 100644
--- a/addons/grenades/XEH_postInit.sqf
+++ b/addons/grenades/XEH_postInit.sqf
@@ -1,8 +1,10 @@
 // by commy2
 
 #include "script_component.hpp"
+#include "\a3\ui_f\hpp\defineDIKCodes.inc"
 
 ["ace_flashbangExploded", LINKFUNC(flashbangExplosionEH)] call CBA_fnc_addEventHandler;
+[QGVAR(damageEngineAndWheels), LINKFUNC(damageEngineAndWheels)] call CBA_fnc_addEventHandler;
 
 // Register fired event handlers
 ["ace_firedPlayer", LINKFUNC(throwGrenade)] call CBA_fnc_addEventHandler;
@@ -15,21 +17,22 @@ GVAR(flashbangPPEffectCC) = ppEffectCreate ["ColorCorrections", 4265];
 GVAR(flashbangPPEffectCC) ppEffectForceInNVG true;
 
 // Add keybinds
-["ACE3 Weapons", QGVAR(switchGrenadeMode), localize LSTRING(SwitchGrenadeMode), {
+["ACE3 Weapons", QGVAR(switchGrenadeMode), LLSTRING(SwitchGrenadeMode), {
     // Conditions: canInteract
     if !([ACE_player, objNull, ["isNotEscorting", "isNotInside"]] call EFUNC(common,canInteractWith)) exitWith {false};
     // Conditions: specific
-    if (!([ACE_player] call CBA_fnc_canUseWeapon)) exitWith {false};
+    if !(ACE_player call CBA_fnc_canUseWeapon) exitWith {false};
+
     // Don't change mode or show hint if advanced throwing is active
     if (ACE_player getVariable [QEGVAR(advanced_throwing,inHand), false]) exitWith {false};
 
     // Statement
-    [] call FUNC(nextMode);
-}, {false}, [9, [false, false, false]], false] call CBA_fnc_addKeybind; //8 Key
+    call FUNC(nextMode) // return
+}, {}, [DIK_8, [false, false, false]], false] call CBA_fnc_addKeybind; // 8 Key
 
 ["CBA_settingsInitialized", {
     if (GVAR(convertExplosives)) then {
-        [] call FUNC(addChangeFuseItemContextMenuOptions);
+        call FUNC(addChangeFuseItemContextMenuOptions);
     };
 }] call CBA_fnc_addEventHandler;
 
diff --git a/addons/grenades/functions/fnc_addChangeFuseItemContextMenuOptions.sqf b/addons/grenades/functions/fnc_addChangeFuseItemContextMenuOptions.sqf
index d778ca3349..c0b5c9dc80 100644
--- a/addons/grenades/functions/fnc_addChangeFuseItemContextMenuOptions.sqf
+++ b/addons/grenades/functions/fnc_addChangeFuseItemContextMenuOptions.sqf
@@ -1,7 +1,7 @@
 #include "..\script_component.hpp"
 /*
  * Author: Cyruz
- * Allows conversion of explosive charges in to throwable versions
+ * Allows conversion of explosive charges into throwable versions.
  *
  * Arguments:
  * None
@@ -14,7 +14,8 @@
  *
  * Public: No
  */
- TRACE_1("addChangeFuseItemContextMenuOptions",_this);
+
+LOG("addChangeFuseItemContextMenuOptions");
 
 {
     _x params ["_mag", "_throwableMag"];
@@ -29,21 +30,25 @@
             {true},
             {
                 params ["", "", "_item", "", "_magArr"];
-                _item isEqualTo (_magArr select 0);
+
+                _item == (_magArr select 0)
             }
         ],
         {
             params ["_unit", "", "", "_slot", "_magArr"];
-            private _container = "";
-            switch _slot do {
+
+            private _container = switch (_slot) do {
                 case "UNIFORM_CONTAINER": {
-                    _container = "uniform";
+                    "uniform"
                 };
                 case "VEST_CONTAINER": {
-                    _container = "vest";
+                    "vest"
                 };
                 case "BACKPACK_CONTAINER": {
-                    _container = "backpack";
+                    "backpack"
+                };
+                default {
+                    ""
                 };
             };
 
@@ -54,7 +59,7 @@
             false
         },
         true,
-        [_mag,_throwableMag]
+        [_mag, _throwableMag]
     ] call CBA_fnc_addItemContextMenuOption;
 
     [
@@ -67,21 +72,25 @@
             {true},
             {
                 params ["", "", "_item", "", "_magArr"];
-                _item isEqualTo (_magArr select 1);
+
+                _item == (_magArr select 1)
             }
         ],
         {
             params ["_unit", "", "", "_slot", "_magArr"];
-            private _container = "";
-            switch _slot do {
+
+            private _container = switch (_slot) do {
                 case "UNIFORM_CONTAINER": {
-                    _container = "uniform";
+                    "uniform"
                 };
                 case "VEST_CONTAINER": {
-                    _container = "vest";
+                    "vest"
                 };
                 case "BACKPACK_CONTAINER": {
-                    _container = "backpack";
+                    "backpack"
+                };
+                default {
+                    ""
                 };
             };
 
@@ -92,7 +101,7 @@
             false
         },
         true,
-        [_mag,_throwableMag]
+        [_mag, _throwableMag]
     ] call CBA_fnc_addItemContextMenuOption;
 } forEach [
     ["SatchelCharge_Remote_Mag", "ACE_SatchelCharge_Remote_Mag_Throwable"],
diff --git a/addons/grenades/functions/fnc_damageEngineAndWheels.sqf b/addons/grenades/functions/fnc_damageEngineAndWheels.sqf
new file mode 100644
index 0000000000..ab95ecbe6a
--- /dev/null
+++ b/addons/grenades/functions/fnc_damageEngineAndWheels.sqf
@@ -0,0 +1,44 @@
+#include "..\script_component.hpp"
+/*
+ * Author: commy2, johnb43
+ * Damage a vehicle's wheels and engine.
+ *
+ * Arguments:
+ * 0: Vehicle <OBJECT>
+ * 1: Incendiary position AGL <ARRAY>
+ *
+ * Return Value:
+ * None
+ *
+ * Example:
+ * [cursorObject, position cursorObject] call ace_grenades_fnc_damageEngineAndWheels
+ *
+ * Public: No
+ */
+
+params ["_vehicle", "_position"];
+TRACE_2("damageWheelsAndEngine",_vehicle,_position);
+
+// Vehicle needs to be local and vulnerable
+if !(local _vehicle && {isDamageAllowed _vehicle}) exitWith {};
+
+{
+    // If wheel is close enough to incendiary, burn it
+    if (_position distance (_vehicle modelToWorld (_vehicle selectionPosition _x)) < EFFECT_SIZE * 2) then {
+        _vehicle setHit [_x, 1];
+    };
+} forEach ((_vehicle call EFUNC(common,getWheelHitPointsWithSelections)) select 1);
+
+// Burn car engines only
+if (_vehicle isKindOf "Wheeled_APC_F") exitWith {};
+
+private _engineSelection = getText (configOf _vehicle >> "HitPoints" >> "HitEngine" >> "name");
+private _enginePosition = _vehicle modelToWorld (_vehicle selectionPosition _engineSelection);
+
+if (_position distance _enginePosition < EFFECT_SIZE * 2) then {
+    _vehicle setHit [_engineSelection, 1];
+
+    if (["ace_cookoff"] call EFUNC(common,isModLoaded)) then {
+        [QEGVAR(cookoff,engineFireServer), _vehicle] call CBA_fnc_serverEvent;
+    };
+};
diff --git a/addons/grenades/functions/fnc_flare.sqf b/addons/grenades/functions/fnc_flare.sqf
index 8214a5600d..2db6335a77 100644
--- a/addons/grenades/functions/fnc_flare.sqf
+++ b/addons/grenades/functions/fnc_flare.sqf
@@ -4,7 +4,7 @@
  * Makes flare shine.
  *
  * Arguments:
- * 0: The flare <OBJECT>
+ * 0: Flare <OBJECT>
  * 1: Color of flare <ARRAY>
  * 2: Intensity of flare <NUMBER>
  * 3: Flare lifetime <OBJECT>
@@ -34,6 +34,5 @@ _light setLightFlareMaxDistance 1000;
 _light setLightDayLight true;
 
 _light lightAttachObject [_projectile, [0,0,0]];
-//_light attachTo [_projectile, [0,0,0]];
 
 [{deleteVehicle _this}, _light, _timeToLive] call CBA_fnc_waitAndExecute;
diff --git a/addons/grenades/functions/fnc_flashbangExplosionEH.sqf b/addons/grenades/functions/fnc_flashbangExplosionEH.sqf
index 5e8d17e50c..33c4bdffc2 100644
--- a/addons/grenades/functions/fnc_flashbangExplosionEH.sqf
+++ b/addons/grenades/functions/fnc_flashbangExplosionEH.sqf
@@ -4,7 +4,7 @@
  * Creates the flashbang effect and knock out AI units.
  *
  * Arguments:
- * 0: The flashBang position ASL <ARRAY>
+ * 0: Flashbang position ASL <ARRAY>
  *
  * Return Value:
  * None
@@ -18,152 +18,148 @@
 params ["_grenadePosASL"];
 TRACE_1("params",_grenadePosASL);
 
-// Create flash to illuminate environment
-if (hasInterface) then {
-    private _light = "#lightpoint" createVehicleLocal ASLtoAGL _grenadePosASL;
-    _light setPosASL _grenadePosASL;
-
-    _light setLightBrightness 20;
-    _light setLightAmbient [1,1,1];
-    _light setLightColor [1,1,1];
-    _light setLightDayLight true;
-    _light setLightAttenuation [0, 1, 5, 1000, 0, 20];
-
-    // Reduce the light after 0.1 seconds
-    [{
-        params ["_light"];
-        _light setLightBrightness 5;
-        // Delete the light after 0.2 more seconds
-        [{
-            params ["_light"];
-            deleteVehicle _light;
-        }, [_light], 0.2] call CBA_fnc_waitAndExecute;
-    }, [_light], 0.1] call CBA_fnc_waitAndExecute;
-};
-
 // Affect local AI (players are not local, except for ACE_player)
 // @todo: Affect units in static weapons, turned out, etc
-private _affected = (ASLtoAGL _grenadePosASL) nearEntities ["CAManBase", 20];
-_affected = _affected - [ACE_player];
+private _affected = ((ASLtoAGL _grenadePosASL) nearEntities ["CAManBase", 20]) - [ACE_player];
+
 {
-    if (local _x && {_x call EFUNC(common,isAwake)}) then {
-        private _unit = _x;
-        private _strength = 1 - (((eyePos _unit) vectorDistance _grenadePosASL) min 20) / 20;
+    private _unit = _x;
+    private _strength = 1 - (((eyePos _unit) vectorDistance _grenadePosASL) min 20) / 20;
 
-        TRACE_3("FlashBangEffect Start",_unit,((getPosASL _unit) vectorDistance _grenadePosASL),_strength);
+    TRACE_3("FlashBangEffect Start",_unit,((getPosASL _unit) vectorDistance _grenadePosASL),_strength);
 
-        [_unit, true] call EFUNC(common,disableAI);
+    [_unit, true] call EFUNC(common,disableAI);
 
-        // Make AI try to look away
-        private _dirToFlash = _unit getDir _grenadePosASL;
-        _unit setDir (_dirToFlash + linearConversion [0.2, 1, _strength, 40, 135] * selectRandom [-1, 1]);
+    // Make AI try to look away
+    private _dirToFlash = _unit getDir _grenadePosASL;
+    _unit setDir (_dirToFlash + linearConversion [0.2, 1, _strength, 40, 135] * selectRandom [-1, 1]);
+
+    private _flashReactionDebounce = _unit getVariable [QGVAR(flashReactionDebounce), 0];
+    _unit setVariable [QGVAR(flashReactionDebounce), _flashReactionDebounce max (CBA_missionTime + (7 * _strength))];
+
+    if (_flashReactionDebounce < CBA_missionTime) then {
+        // Not used internally but could be useful for other mods
+        _unit setVariable [QGVAR(flashStrength), _strength, true];
+
+        [QGVAR(flashbangedAI), [_unit, _strength, _grenadePosASL]] call CBA_fnc_localEvent;
+
+        {
+            _unit setSkill [_x, (_unit skill _x) / 50];
+        } forEach SUBSKILLS;
+
+        [{
+            CBA_missiontime >= _this getVariable [QGVAR(flashReactionDebounce), 0]
+        }, {
+            params ["_unit"];
+
+            _unit setVariable [QGVAR(flashStrength), 0, true];
+
+            // Make sure we don't enable AI for unconscious units
+            if (_unit call EFUNC(common,isAwake)) then {
+                [_unit, false] call EFUNC(common,disableAI);
+            };
 
-        private _flashReactionDebounce = _unit getVariable [QGVAR(flashReactionDebounce), 0];
-        _unit setVariable [QGVAR(flashReactionDebounce), _flashReactionDebounce max (CBA_missionTime + (7 * _strength))];
-        if (_flashReactionDebounce < CBA_missionTime) then {
-            // Not used interally but could be useful for other mods
-            _unit setVariable [QGVAR(flashStrength), _strength, true];
-            [QGVAR(flashbangedAI), [_unit, _strength, _grenadePosASL]] call CBA_fnc_localEvent;
             {
-                _unit setSkill [_x, (_unit skill _x) / 50];
+                _unit setSkill [_x, (_unit skill _x) * 50];
             } forEach SUBSKILLS;
-            [{
-                params ["_unit"];
-                CBA_missiontime >= _unit getVariable [QGVAR(flashReactionDebounce), 0]
-            },{
-                params ["_unit"];
-
-                _unit setVariable [QGVAR(flashStrength), 0, true];
-
-                // Make sure we don't enable AI for unconscious units
-                if !(_unit getVariable ["ace_isUnconscious", false]) then {
-                    [_unit, false] call EFUNC(common,disableAI);
-                };
-                {
-                    _unit setSkill [_x, (_unit skill _x) * 50];
-                } forEach SUBSKILLS;
-            }, [_unit]] call CBA_fnc_waitUntilAndExecute;
-        };
+        }, _unit] call CBA_fnc_waitUntilAndExecute;
     };
-} forEach _affected;
+} forEach (_affected select {local _x && {_x call EFUNC(common,isAwake)}});
+
+if (!hasInterface) exitWith {};
+
+// Create flash to illuminate environment
+private _light = "#lightpoint" createVehicleLocal ASLtoAGL _grenadePosASL;
+_light setPosASL _grenadePosASL;
+
+_light setLightBrightness 20;
+_light setLightAmbient [1,1,1];
+_light setLightColor [1,1,1];
+_light setLightDayLight true;
+_light setLightAttenuation [0, 1, 5, 1000, 0, 20];
+
+// Reduce the light after 0.1 seconds
+[{
+    _this setLightBrightness 5;
+
+    // Delete the light after 0.2 more seconds
+    [{deleteVehicle _this}, _this, 0.2] call CBA_fnc_waitAndExecute;
+}, _light, 0.1] call CBA_fnc_waitAndExecute;
+
+// Ignore dead and placeable logic (zeus / spectator)
+if (!alive ACE_player || {(getNumber (configOf ACE_player >> "isPlayableLogic")) == 1}) exitWith {};
 
 // Affect local player, independently of distance
-if (hasInterface && {!isNull ACE_player} && {alive ACE_player}) then {
-    if ((getNumber (configOf ACE_player >> "isPlayableLogic")) == 1) exitWith {
-        TRACE_1("skipping playable logic",typeOf ACE_player); // VirtualMan_F (placeable logic zeus / spectator)
-    };
-    // Do effects for player
-    // is there line of sight to the grenade?
-    private _eyePos = eyePos ACE_player; //PositionASL
-    _grenadePosASL set [2, (_grenadePosASL select 2) + 0.2]; // compensate for grenade glitching into ground
+// Check for line of sight to the grenade
+private _eyePos = eyePos ACE_player; // PositionASL
+_grenadePosASL set [2, (_grenadePosASL select 2) + 0.2]; // compensate for grenade glitching into ground
 
-    private _strength = 1 - ((_eyePos vectorDistance _grenadePosASL) min 20) / 20;
+private _strength = 1 - ((_eyePos vectorDistance _grenadePosASL) min 20) / 20;
 
-    // Check for line of sight (check 4 points in case grenade is stuck in an object or underground)
-    private _losCoefficient = 1;
-    private _losCount = {
-        !lineIntersects [_grenadePosASL vectorAdd _x, _eyePos, ACE_player]
-    } count [[0,0,0], [0,0,0.2], [0.1, 0.1, 0.1], [-0.1, -0.1, 0.1]];
-    TRACE_1("Line of sight count (out of 4)",_losCount);
-    if (_losCount <= 1) then {
-        _losCoefficient = 0.1;
-    };
-    _strength = _strength * _losCoefficient;
+// Check for line of sight (check 4 points in case grenade is stuck in an object or underground)
+private _losCount = {
+    !lineIntersects [_grenadePosASL vectorAdd _x, _eyePos, ACE_player]
+} count [[0, 0, 0], [0, 0, 0.2], [0.1, 0.1, 0.1], [-0.1, -0.1, 0.1]];
+TRACE_1("Line of sight count (out of 4)",_losCount);
 
-    // Add ace_hearing ear ringing sound effect
-    if (["ace_hearing"] call EFUNC(common,isModLoaded) && {_strength > 0 && {EGVAR(hearing,damageCoefficent) > 0.25}}) then {
-        private _earringingStrength = 40 * _strength;
-        [_earringingStrength] call EFUNC(hearing,earRinging);
-        TRACE_1("Earringing Strength",_earringingStrength);
-    };
+private _losCoefficient = [1, 0.1] select (_losCount <= 1);
+_strength = _strength * _losCoefficient;
 
-    // add ace_medical pain effect:
-    if (["ace_medical"] call EFUNC(common,isModLoaded) && {_strength > 0.1} && {isDamageAllowed _unit} && {_unit getVariable [QEGVAR(medical,allowDamage), true]}) then {
-        [ACE_player, _strength / 2] call EFUNC(medical,adjustPainLevel);
-    };
-
-    // Effect on vision has a wider range, with a higher falloff
-    _strength = 1 - (((_eyePos vectorDistance _grenadePosASL) min 25) / 25) ^ 0.4;
-    _strength = _strength * _losCoefficient;
-    // Account for people looking away by slightly reducing the effect for visual effects.
-    private _eyeDir = ((AGLtoASL positionCameraToWorld [0,0,1]) vectorDiff (AGLtoASL positionCameraToWorld [0,0,0]));
-    private _dirToUnitVector = _eyePos vectorFromTo _grenadePosASL;
-    private _angleDiff = acos (_eyeDir vectorDotProduct _dirToUnitVector);
-    TRACE_2("",_angleDiff,((1 - (_angleDiff - 45) / (120 - 45)) max 0));
-    // from 0-45deg, full effect
-    if (_angleDiff > 45) then {
-        _strength = _strength * ((1 - (_angleDiff - 45) / (120 - 45)) max 0);
-    };
-
-    // Blind player
-    if (_strength > 0.1) then {
-        private _blend = [[1,1,1,0], [0.3,0.3,0.3,1]] select EGVAR(common,epilepsyFriendlyMode);
-
-        GVAR(flashbangPPEffectCC) ppEffectEnable true;
-        GVAR(flashbangPPEffectCC) ppEffectAdjust [1, 1, (0.8 + _strength) min 1, _blend, [0,0,0,1], [0,0,0,0]];
-        GVAR(flashbangPPEffectCC) ppEffectCommit 0.01;
-
-        //PARTIALRECOVERY - start decreasing effect over time
-        [{
-            params ["_strength", "_blend"];
-
-            GVAR(flashbangPPEffectCC) ppEffectAdjust [1, 1, 0, _blend, [0,0,0,1], [0,0,0,0]];
-            GVAR(flashbangPPEffectCC) ppEffectCommit (10 * _strength);
-        }, [_strength, _blend], 7 * _strength] call CBA_fnc_waitAndExecute;
-
-        //FULLRECOVERY - end effect
-        [{
-            GVAR(flashbangPPEffectCC) ppEffectEnable false;
-        }, [], 17 * _strength] call CBA_fnc_waitAndExecute;
-    };
-
-    // Make player flinch
-    if (_strength <= 0.2) exitWith {};
-    private _minFlinch = linearConversion [0.2, 1, _strength, 0, 60, true];
-    private _maxFlinch = linearConversion [0.2, 1, _strength, 0, 95, true];
-    private _flinch    = (_minFlinch + random (_maxFlinch - _minFlinch)) * selectRandom [-1, 1];
-    ACE_player setDir (getDir ACE_player + _flinch);
-
-    [QGVAR(flashbangedPlayer), [_strength, _grenadePosASL]] call CBA_fnc_localEvent;
+// Add ace_hearing ear ringing sound effect
+if (["ace_hearing"] call EFUNC(common,isModLoaded) && {_strength > 0} && {EGVAR(hearing,damageCoefficent) > 0.25}) then {
+    private _earringingStrength = 40 * _strength;
+    [_earringingStrength] call EFUNC(hearing,earRinging);
+    TRACE_1("Earringing Strength",_earringingStrength);
 };
-true
+
+// Add ace_medical pain effect
+if (GETEGVAR(medical,enabled,false) && {_strength > 0.1} && {isDamageAllowed _unit} && {_unit getVariable [QEGVAR(medical,allowDamage), true]}) then {
+    [ACE_player, _strength / 2] call EFUNC(medical,adjustPainLevel);
+};
+
+// Effect on vision has a wider range, with a higher falloff
+_strength = 1 - (((_eyePos vectorDistance _grenadePosASL) min 25) / 25) ^ 0.4;
+_strength = _strength * _losCoefficient;
+
+// Account for people looking away by slightly reducing the effect for visual effects.
+private _eyeDir = ((AGLtoASL positionCameraToWorld [0, 0, 1]) vectorDiff (AGLtoASL positionCameraToWorld [0, 0, 0]));
+private _dirToUnitVector = _eyePos vectorFromTo _grenadePosASL;
+private _angleDiff = acos (_eyeDir vectorDotProduct _dirToUnitVector);
+TRACE_2("",_angleDiff,((1 - (_angleDiff - 45) / (120 - 45)) max 0));
+
+// From 0-45deg, full effect
+if (_angleDiff > 45) then {
+    _strength = _strength * ((1 - (_angleDiff - 45) / (120 - 45)) max 0);
+};
+
+// Blind player
+if (_strength > 0.1) then {
+    private _blend = [[1, 1, 1, 0], [0.3, 0.3, 0.3, 1]] select EGVAR(common,epilepsyFriendlyMode);
+
+    GVAR(flashbangPPEffectCC) ppEffectEnable true;
+    GVAR(flashbangPPEffectCC) ppEffectAdjust [1, 1, (0.8 + _strength) min 1, _blend, [0, 0, 0, 1], [0, 0, 0, 0]];
+    GVAR(flashbangPPEffectCC) ppEffectCommit 0.01;
+
+    // PARTIALRECOVERY - start decreasing effect over time
+    [{
+        params ["_strength", "_blend"];
+
+        GVAR(flashbangPPEffectCC) ppEffectAdjust [1, 1, 0, _blend, [0, 0, 0, 1], [0, 0, 0, 0]];
+        GVAR(flashbangPPEffectCC) ppEffectCommit (10 * _strength);
+    }, [_strength, _blend], 7 * _strength] call CBA_fnc_waitAndExecute;
+
+    // FULLRECOVERY - end effect
+    [{
+        GVAR(flashbangPPEffectCC) ppEffectEnable false;
+    }, [], 17 * _strength] call CBA_fnc_waitAndExecute;
+};
+
+// Make player flinch
+if (_strength <= 0.2) exitWith {};
+
+private _minFlinch = linearConversion [0.2, 1, _strength, 0, 60, true];
+private _maxFlinch = linearConversion [0.2, 1, _strength, 0, 95, true];
+private _flinch    = (_minFlinch + random (_maxFlinch - _minFlinch)) * selectRandom [-1, 1];
+ACE_player setDir (getDir ACE_player + _flinch);
+
+[QGVAR(flashbangedPlayer), [_strength, _grenadePosASL]] call CBA_fnc_localEvent;
diff --git a/addons/grenades/functions/fnc_flashbangThrownFuze.sqf b/addons/grenades/functions/fnc_flashbangThrownFuze.sqf
index 1c9751da37..89020842d2 100644
--- a/addons/grenades/functions/fnc_flashbangThrownFuze.sqf
+++ b/addons/grenades/functions/fnc_flashbangThrownFuze.sqf
@@ -4,7 +4,7 @@
  * Waits for the flashbang grenade fuze to trigger and 'explode'
  *
  * Arguments:
- * 0: projectile - Flashbang Grenade <OBJECT>
+ * 0: Flashbang grenade <OBJECT>
  *
  * Return Value:
  * None
@@ -18,16 +18,17 @@
 params ["_projectile"];
 TRACE_1("params",_projectile);
 
-if (alive _projectile) then {
-    private _sounds = getArray (_projectile call CBA_fnc_getObjectConfig >> QGVAR(flashbangExplodeSound));
+if (!alive _projectile) exitWith {};
 
-    (if (_sounds isEqualTo []) then {
-        [format ["A3\Sounds_F\arsenal\explosives\grenades\Explosion_HE_grenade_0%1.wss", floor (random 4) + 1], 5, 1.2, 400]
-    } else {
-        selectRandom _sounds
-    }) params ["_file", "_volume", "_pitch", "_distance"];
+private _posASL = getPosASL _projectile;
+private _sounds = getArray (_projectile call CBA_fnc_getObjectConfig >> QGVAR(flashbangExplodeSound));
 
-    playSound3D [_file, _projectile, false, getPosASL _projectile, _volume, _pitch, _distance];
+(if (_sounds isEqualTo []) then {
+    [format ["A3\Sounds_F\arsenal\explosives\grenades\Explosion_HE_grenade_0%1.wss", floor (random 4) + 1], 5, 1.2, 400]
+} else {
+    selectRandom _sounds
+}) params ["_file", "_volume", "_pitch", "_distance"];
 
-    ["ace_flashbangExploded", [getPosASL _projectile]] call CBA_fnc_globalEvent;
-};
+playSound3D [_file, _projectile, false, _posASL, _volume, _pitch, _distance];
+
+["ace_flashbangExploded", [_posASL]] call CBA_fnc_globalEvent;
diff --git a/addons/grenades/functions/fnc_incendiary.sqf b/addons/grenades/functions/fnc_incendiary.sqf
index c59d463511..f0caf82ed8 100644
--- a/addons/grenades/functions/fnc_incendiary.sqf
+++ b/addons/grenades/functions/fnc_incendiary.sqf
@@ -1,11 +1,12 @@
 #include "..\script_component.hpp"
 /*
  * Author: commy2
- * Makes incendiary burn.
+ * Makes an incendiary grenade burn.
  *
  * Arguments:
- * 0: The grenade <OBJECT>
+ * 0: Incendiary grenade <OBJECT>
  * 1: Incendiary lifetime <OBJECT>
+ * 2: Instigator's side <SIDE>
  *
  * Return Value:
  * None
@@ -30,11 +31,11 @@
 #define PARTICLE_SMOKE_LIFTING 1
 #define PARTICLE_SMOKE_WIND_EFFECT 1
 
-#define EFFECT_SIZE 1
 #define ORIENTATION 5.4
 #define EXPANSION 1
 
 #define DESTRUCTION_RADIUS 1.8
+#define SEARCH_RADIUS 5
 
 params ["_projectile", "_timeToLive", "_center"];
 
@@ -42,16 +43,16 @@ if (isNull _projectile) exitWith {TRACE_1("null",_projectile);};
 
 private _position = position _projectile;
 
-// --- AI
+// Alert nearby hostile AI
 private _nearLocalEnemies = [];
 
 {
     {
-        if (local _x && {[_center, side _x] call BIS_fnc_sideIsEnemy}) then { // WE WANT THE OBJECTS SIDE HERE!
+        if (local _x && {[_center, side group _x] call BIS_fnc_sideIsEnemy}) then { // WE WANT THE OBJECT'S SIDE HERE!
             _nearLocalEnemies pushBackUnique _x;
         };
     } forEach crew _x;
-} forEach (_position nearObjects ALERT_NEAR_ENEMY_RANGE);
+} forEach (_position nearObjects ALERT_NEAR_ENEMY_RANGE); //@todo replace with nearEntities in 2.18
 
 {
     if (behaviour _x in ["SAFE", "AWARE"]) then {
@@ -59,7 +60,7 @@ private _nearLocalEnemies = [];
     };
 } forEach _nearLocalEnemies;
 
-// --- fire
+// Fire particles
 private _fire = "#particlesource" createVehicleLocal _position;
 
 _fire setParticleParams [
@@ -99,7 +100,7 @@ _fire setParticleRandom [PARTICLE_LIFE_TIME / 4, [0.15 * EFFECT_SIZE, 0.15 * EFF
 _fire setParticleFire [1.2,1.0,0.1];
 _fire setDropInterval (1 / PARTICLE_DENSITY);
 
-// --- smoke
+// Smoke particles
 private _smoke = "#particlesource" createVehicleLocal _position;
 
 _smoke setParticleParams [
@@ -137,7 +138,7 @@ _smoke setParticleParams [
 _smoke setParticleRandom [PARTICLE_SMOKE_LIFE_TIME / 2, [0.5 * EFFECT_SIZE, 0.5 * EFFECT_SIZE, 0.2 * EFFECT_SIZE], [0.3,0.3,0.5], 1, 0, [0,0,0,0.06], 0, 0];
 _smoke setDropInterval (1 / PARTICLE_SMOKE_DENSITY);
 
-// --- light
+// Light
 private _light = "#lightpoint" createVehicleLocal (_position vectorAdd [0,0,0.5]);
 
 _light setLightBrightness 1.0;
@@ -150,91 +151,72 @@ _light setLightDayLight false;
 
 _light lightAttachObject [_projectile, [0,0,0]];
 
-// --- sound
+// Sound
 private _sound = objNull;
 
 if (isServer) then {
     _sound = createSoundSource ["Sound_Fire", _position, [], 0];
     private _radius = 1.5 * getNumber (configOf _projectile >> "indirectHitRange");
     private _intensity = getNumber (configOf _projectile >> "hit");
-    [QEGVAR(fire,addFireSource), [_projectile, _radius, _intensity, _projectile, {CBA_missionTime < _this}, CBA_missionTime + _timeToLive]] call CBA_fnc_serverEvent;
+
+    [QEGVAR(fire,addFireSource), [_projectile, _radius, _intensity, _projectile, {
+        params ["_endTime", "_projectile"];
+
+        // If incendiary no longer exists, exit
+        if (isNull _projectile) exitWith {
+            false // return
+        };
+
+        // Need to get the position every time, as grenade might have been moved
+        private _position = position _projectile;
+
+        {
+            // Damage vehicles
+            [QGVAR(damageEngineAndWheels), [_x, _position], _x] call CBA_fnc_targetEvent;
+        } forEach (_position nearEntities ["Car", SEARCH_RADIUS]);
+
+        CBA_missionTime < _endTime // return
+    }, [CBA_missionTime + _timeToLive, _projectile]]] call CBA_fnc_serverEvent;
 };
 
 [{
     {deleteVehicle _x} forEach _this;
 }, [_fire, _smoke, _light, _sound], _timeToLive] call CBA_fnc_waitAndExecute;
 
-// --- damage
+// Damage
 {
-    if (local _x) then {
-        //systemChat format ["burn: %1", _x];
+    // Inflame fireplace, barrels etc.
+    _x inflame true;
 
-        // --- destroy nearby static weapons and ammo boxes
-        if (_x isKindOf "StaticWeapon" || {_x isKindOf "ACE_RepairItem_Base"}) then {
+    // Destroy nearby static weapons and ammo boxes
+    if (_x isKindOf "StaticWeapon" || {_x isKindOf "ACE_RepairItem_Base"}) then {
+        _x setDamage 1;
+
+        continue;
+    };
+
+    if (_x isKindOf "ReammoBox_F") then {
+        if (
+            (["ace_cookoff"] call EFUNC(common,isModLoaded)) &&
+            {EGVAR(cookoff,enableAmmobox)} &&
+            {EGVAR(cookoff,ammoCookoffDuration) != 0} &&
+            {_x getVariable [QEGVAR(cookoff,enableAmmoCookoff), true]}
+        ) then {
+            [QEGVAR(cookOff,cookOffBoxServer), _box] call CBA_fnc_serverEvent;
+        } else {
             _x setDamage 1;
         };
-        if (_x isKindOf "ReammoBox_F") then {
-            if (
-                (["ace_cookoff"] call EFUNC(common,isModLoaded)) &&
-                {EGVAR(cookoff,enableAmmobox)} &&
-                {EGVAR(cookoff,ammoCookoffDuration) != 0} &&
-                {_x getVariable [QEGVAR(cookoff,enableAmmoCookoff), true]}
-            ) then {
-                [QEGVAR(cookOff,cookOffBoxServer), _box] call CBA_fnc_serverEvent;
-            } else {
-                _x setDamage 1;
-            };
-        };
 
-        // --- delete nearby ground weapon holders
-        if (_x isKindOf "WeaponHolder" || {_x isKindOf "WeaponHolderSimulated"}) then {
-            deleteVehicle _x;
-        };
-
-        // --- inflame fireplace, barrels etc.
-        _x inflame true;
+        continue;
     };
-} forEach (_position nearObjects DESTRUCTION_RADIUS);
 
-// --- damage local vehicle
-private _vehicle = _position nearestObject "Car";
-
-if (!local _vehicle) exitWith {};
-
-private _config = configOf _vehicle;
-
-// --- burn tyres
-private _fnc_isWheelHitPoint = {
-    params ["_selectionName"];
-
-    // wheels must use a selection named "wheel_X_Y_steering" for PhysX to work
-    _selectionName select [0, 6] == "wheel_" && {
-        _selectionName select [count _selectionName - 9] == "_steering"
-    } // return
-};
+    // Delete nearby ground weapon holders
+    if (_x isKindOf "WeaponHolder" || {_x isKindOf "WeaponHolderSimulated"}) then {
+        deleteVehicle _x;
+    };
+} forEach ((_position nearObjects DESTRUCTION_RADIUS) select {local _x && {isDamageAllowed _x}});
 
 {
-    private _wheelSelection = getText (_config >> "HitPoints" >> _x >> "name");
-
-    if (_wheelSelection call _fnc_isWheelHitPoint) then {
-        private _wheelPosition = _vehicle modelToWorld (_vehicle selectionPosition _wheelSelection);
-
-        if (_position distance _wheelPosition < EFFECT_SIZE * 2) then {
-            _vehicle setHit [_wheelSelection, 1];
-        };
-    };
-} forEach (getAllHitPointsDamage _vehicle param [0, []]);
-
-// --- burn car engine
-if (_vehicle isKindOf "Wheeled_APC_F") exitWith {};
-
-private _engineSelection = getText (_config >> "HitPoints" >> "HitEngine" >> "name");
-private _enginePosition = _vehicle modelToWorld (_vehicle selectionPosition _engineSelection);
-
-if (_position distance _enginePosition < EFFECT_SIZE * 2) then {
-    _vehicle setHit [_engineSelection, 1];
-
-    if (["ace_cookoff"] call EFUNC(common,isModLoaded)) then {
-        [QEGVAR(cookoff,engineFireServer), _vehicle] call CBA_fnc_serverEvent;
-    };
-};
+    // Damage vehicles (locality is checked in FUNC(damageEngineAndWheels))
+    [_x, _position] call FUNC(damageEngineAndWheels);
+} forEach (_position nearEntities ["Car", SEARCH_RADIUS]);
diff --git a/addons/grenades/functions/fnc_nextMode.sqf b/addons/grenades/functions/fnc_nextMode.sqf
index d3d25027b1..f33fa7a5a5 100644
--- a/addons/grenades/functions/fnc_nextMode.sqf
+++ b/addons/grenades/functions/fnc_nextMode.sqf
@@ -7,21 +7,16 @@
  * None
  *
  * Return Value:
- * Handeled <BOOL>
+ * Handled <BOOL>
  *
  * Example:
- * [] call ace_grenades_fnc_nextMode
+ * call ace_grenades_fnc_nextMode
  *
  * Public: No
  */
 
-private _mode = GVAR(currentThrowMode);
-
-if (_mode == 4) then {
-    _mode = 0;
-} else {
-    _mode = _mode + 1;
-};
+// _mode is 0-4, don't overflow
+private _mode = (GVAR(currentThrowMode) + 1) % 5;
 
 private _currentThrowable = currentThrowable ACE_player;
 
diff --git a/addons/grenades/functions/fnc_throwGrenade.sqf b/addons/grenades/functions/fnc_throwGrenade.sqf
index 939e0755da..a440c8fd1b 100644
--- a/addons/grenades/functions/fnc_throwGrenade.sqf
+++ b/addons/grenades/functions/fnc_throwGrenade.sqf
@@ -27,40 +27,26 @@ if (isNull _projectile) then {
 
 private _config = configFile >> "CfgAmmo" >> _ammo;
 
-// handle special grenades and sounds
+// Handle special grenades and sounds
 if (local _unit) then {
-    // handle priming sound, if present
-    private _soundConfig = getArray (configFile >> "CfgAmmo" >> _ammo >> QGVAR(pullPinSound));
+    // Handle priming sound, if present
+    private _soundConfig = getArray (_config >> QGVAR(pullPinSound));
+
     if (_soundConfig isNotEqualTo []) then {
         _soundConfig params ["_file", "_volume", "_pitch", "_distance"];
-        playSound3D [_file, objNull, false, getPosASL _projectile, _volume, _pitch, _distance];
+        playSound3D [_file, objNull, insideBuilding _unit >= 0.5, getPosASL _projectile, _volume, _pitch, _distance];
     };
 
     if (getNumber (_config >> QGVAR(flashbang)) == 1) then {
-        private _bangs = 1;
-        private _entry = _config >> QGVAR(flashbangBangs);
-        if (isNumber _entry || isText _entry) then {
-            _bangs = getNumber _entry;
-        };
-
         private _fuzeTimeBase = getNumber (_config >> "explosionTime");
-
-        private _interval = 0.5;
-        _entry = _config >> QGVAR(flashbangInterval);
-        if (isNumber _entry || isText _entry) then {
-            _interval = getNumber _entry;
-        };
-
-        private _maxDeviation = 0.1;
-        _entry = _config >> QGVAR(flashbangIntervalMaxDeviation);
-        if (isNumber _entry || isText _entry) then {
-            _maxDeviation = getNumber _entry;
-        };
+        private _bangs = [_config >> QGVAR(flashbangBangs), "NUMBER", 1] call CBA_fnc_getConfigEntry;
+        private _interval = [_config >> QGVAR(flashbangInterval), "NUMBER", 0.5] call CBA_fnc_getConfigEntry;
+        private _maxDeviation = [_config >> QGVAR(flashbangIntervalMaxDeviation), "NUMBER", 0.1] call CBA_fnc_getConfigEntry;
 
         for "_i" from 0 to (_bangs - 1) do {
-            private _fuzeTime = _fuzeTimeBase + _i*_interval + random [- _maxDeviation, 0, _maxDeviation];
+            private _fuzeTime = _fuzeTimeBase + _i * _interval + random [-_maxDeviation, 0, _maxDeviation];
 
-            [FUNC(flashbangThrownFuze), [_projectile], _fuzeTime] call CBA_fnc_waitAndExecute;
+            [LINKFUNC(flashbangThrownFuze), _projectile, _fuzeTime] call CBA_fnc_waitAndExecute;
         };
     };
 };
@@ -71,60 +57,56 @@ if (getNumber (_config >> QGVAR(flare)) == 1) then {
     private _color = getArray (_config >> QGVAR(color));
     private _intensity = _color deleteAt 3;
 
-    [FUNC(flare), [_projectile, _color, _intensity, _timeToLive], _fuzeTime] call CBA_fnc_waitAndExecute;
+    [LINKFUNC(flare), [_projectile, _color, _intensity, _timeToLive], _fuzeTime] call CBA_fnc_waitAndExecute;
 };
 
 if (getNumber (_config >> QGVAR(incendiary)) == 1) then {
     private _fuzeTime = getNumber (_config >> "explosionTime");
     private _timeToLive = getNumber (_config >> "timeToLive");
 
-    [FUNC(incendiary), [_projectile, _timeToLive, side _unit], _fuzeTime] call CBA_fnc_waitAndExecute; // WE WANT THE OBJECTS SIDE HERE!
+    [LINKFUNC(incendiary), [_projectile, _timeToLive, side group _unit], _fuzeTime] call CBA_fnc_waitAndExecute; // Get the unit's real side (will return civilian if unconscious)
 };
 
-// handle throw modes
+// Handle throw modes
 if (_unit != ACE_player) exitWith {};
 if (_unit getVariable [QEGVAR(advanced_throwing,primed), false]) exitWith {LOG("advanced_throwing throw");};
 
-private _mode = GVAR(currentThrowMode);
+if (GVAR(currentThrowMode) == 0) exitWith {};
 
-if (_mode != 0) then {
-    private _velocity = velocity _projectile;
+private _velocity = velocity _projectile;
 
-    switch (_mode) do {
-        //high throw
-        case 1 : {
-            _velocity = [
-            0.5 * (_velocity select 0),
-            0.5 * (_velocity select 1),
-            [0, 0, 0] distance (_velocity vectorMultiply 0.5)
-            ];
-        };
-        //precise throw
-        case 2 : {
-            _velocity = (_unit weaponDirection _weapon) vectorMultiply (vectorMagnitude _velocity);
-        };
-        //roll grenade
-        case 3 : {
-            private _posASL = getPosASL _projectile;
+switch (GVAR(currentThrowMode)) do {
+    // High throw
+    case 1: {
+        _velocity = _velocity vectorMultiply 0.5;
 
-            // getPos is unreliable, as surfaces in some ruins are not recognised as surfaces
-            private _lisPos = (lineIntersectsSurfaces [_posASL, _posASL vectorAdd [0, 0, -1e11], ACE_player, objNull, true, 1, "ROADWAY", "FIRE"]) select 0;
-            _projectile setPosASL ((_lisPos select 0) vectorAdd [0, 0, 0.2]);
-
-            // Rotate throwables by 90° to the side by default, so cylindrical throwables can be rolled
-            private _vectorDirAndUp = getArray (_config >> QGVAR(rollVectorDirAndUp));
-            _vectorDirAndUp params [["_vectorDir", [0, 1, 0], [[]], 3], ["_vectorUp", [1, 0, 0], [[]], 3]];
-
-            // Do as if object were facing north
-            _projectile setVectorDirAndUp ([[_vectorDir, _vectorUp], -(direction _projectile), 0, 0] call BIS_fnc_transformVectorDirAndUp);
-
-            _velocity = (vectorDir _unit) vectorMultiply 10;
-        };
-        //drop grenade
-        case 4 : {
-            _velocity = [0, 0, 0];
-        };
+        _velocity set [2, vectorMagnitude _velocity];
     };
+    // Precise throw
+    case 2: {
+        _velocity = (_unit weaponDirection _weapon) vectorMultiply (vectorMagnitude _velocity);
+    };
+    // Roll grenade
+    case 3: {
+        private _posASL = getPosASL _projectile;
 
-    _projectile setVelocity _velocity;
+        // getPos is unreliable, as surfaces in some ruins are not recognised as surfaces
+        private _lisPos = (lineIntersectsSurfaces [_posASL, _posASL vectorAdd [0, 0, -1e11], ACE_player, objNull, true, 1, "ROADWAY", "FIRE"]) select 0;
+        _projectile setPosASL ((_lisPos select 0) vectorAdd [0, 0, 0.2]);
+
+        // Rotate throwables by 90° to the side by default, so cylindrical throwables can be rolled
+        private _vectorDirAndUp = getArray (_config >> QGVAR(rollVectorDirAndUp));
+        _vectorDirAndUp params [["_vectorDir", [0, 1, 0], [[]], 3], ["_vectorUp", [1, 0, 0], [[]], 3]];
+
+        // Do as if object were facing north
+        _projectile setVectorDirAndUp ([[_vectorDir, _vectorUp], -(direction _projectile), 0, 0] call BIS_fnc_transformVectorDirAndUp);
+
+        _velocity = (vectorDir _unit) vectorMultiply 10;
+    };
+    // Drop grenade
+    case 4: {
+        _velocity = [0, 0, 0];
+    };
 };
+
+_projectile setVelocity _velocity;
diff --git a/addons/grenades/initSettings.inc.sqf b/addons/grenades/initSettings.inc.sqf
index b6fa36f459..6a6ceb8c37 100644
--- a/addons/grenades/initSettings.inc.sqf
+++ b/addons/grenades/initSettings.inc.sqf
@@ -1,9 +1,10 @@
 [
-    QGVAR(convertExplosives), "CHECKBOX",
+    QGVAR(convertExplosives),
+    "CHECKBOX",
     [LSTRING(convertExplosives_DisplayName), LSTRING(convertExplosives_Description)],
     LSTRING(Settings_DisplayName),
     true,
-    true,
-    {},
-    true
+    1,
+    {[QGVAR(convertExplosives), _this] call EFUNC(common,cbaSettings_settingChanged)},
+    true // Needs mission restart
 ] call CBA_fnc_addSetting;
diff --git a/addons/grenades/script_component.hpp b/addons/grenades/script_component.hpp
index 3da453de6f..e49fa21ca9 100644
--- a/addons/grenades/script_component.hpp
+++ b/addons/grenades/script_component.hpp
@@ -16,9 +16,6 @@
 
 #include "\z\ace\addons\main\script_macros.hpp"
 
-#define EFFECT_STAGE_RESETAI 0
-#define EFFECT_STAGE_DELETELIGHT 1
-#define EFFECT_STAGE_PARTIALRECOVERY 2
-#define EFFECT_STAGE_FULLRECOVERY 3
+#define EFFECT_SIZE 1
 
 #define MIN_EXPLOSION_TIME_FOR_ROLL 1
diff --git a/addons/grenades/stringtable.xml b/addons/grenades/stringtable.xml
index ec009fa2ba..b0630e3a43 100644
--- a/addons/grenades/stringtable.xml
+++ b/addons/grenades/stringtable.xml
@@ -105,6 +105,11 @@
         </Key>
         <Key ID="STR_ACE_Grenades_RollGrenadeDisabled">
             <English>Can't roll this grenade, switched to %1</English>
+            <Japanese>この手榴弾は転がせません、 %1 に切り替えます</Japanese>
+            <Russian>Эта граната не может быть брошена, переключитесь на %1</Russian>
+            <Korean>이 수류탄은 굴릴 수 없습니다. %1(으)로 전환되었습니다.</Korean>
+            <German>Granate kann nicht rollen, zu %1 gewechselt</German>
+            <Italian>Granata non può rotolare, cambiato a %1</Italian>
         </Key>
         <Key ID="STR_ACE_Grenades_M84_Name">
             <English>M84 Stun Grenade</English>
@@ -152,7 +157,7 @@
             <Italian>Anche conosciuta come flashbang. Causa accecamento immediato, sensazioni di sposatezza, mancanza d'equilibrio e disturbi al timpano.</Italian>
             <Portuguese>Também conhecida como flashbang. Causa uma clarão imediato, cegueira, surdez, zumbido e distúrbio no tímpano.</Portuguese>
             <Japanese>フラッシュバンとも知られています。即時に失明と難聴、耳鳴り、内耳障害を引き起こします。</Japanese>
-            <Korean>플래시뱅이라고도 알려져있습니다. 사용 즉시 섬광으로 인한 시력장애, 청각장애, 이명, 내이기관방해를 유발합니다.</Korean>
+            <Korean>플래시뱅이라고도 알려져 있습니다. 사용 즉시 섬광으로 인한 시력장애, 청각장애, 이명, 내이기관방해를 유발합니다.</Korean>
             <Chinesesimp>也被称为闪光弹，会造成暂时性失明，耳聋，耳鸣等效果。</Chinesesimp>
             <Chinese>也被稱為閃光彈，會造成暫時性失明，耳聾，耳鳴等效果</Chinese>
             <Turkish>Flashbang olarak da bilinir. Ani flaş körlüğü, sağırlık, kulak çınlaması ve iç kulak rahatsızlığına neden olur.</Turkish>
diff --git a/addons/headless/XEH_postInit.sqf b/addons/headless/XEH_postInit.sqf
index d1106b40c9..90677042f4 100644
--- a/addons/headless/XEH_postInit.sqf
+++ b/addons/headless/XEH_postInit.sqf
@@ -1,5 +1,7 @@
 #include "script_component.hpp"
 
+if (!isMultiplayer) exitWith {};
+
 ["CBA_settingsInitialized", {
     // Register and remove HCs if not client that is not server and distribution or end mission enabled
     if ((!hasInterface || isServer) && {XGVAR(enabled) || XGVAR(endMission) != 0}) then {
@@ -25,6 +27,23 @@
                     (_rebalance == FORCED_REBALANCE) call FUNC(rebalance);
                 };
             }] call CBA_fnc_addEventHandler;
+
+            // If CBA's loadout validation is enabled, warn users
+            if (XGVAR(transferLoadout) > 0 && {(missionNamespace getVariable ["CBA_network_loadoutValidation", 0]) isEqualTo 2}) then {
+                WARNING("CBA_network_loadoutValidation is enabled - acex_headless_transferLoadout should therefore be disabled");
+                [QEGVAR(common,displayTextStructured), ["CBA_network_loadoutValidation is enabled - acex_headless_transferLoadout should therefore be disabled", 3]] call CBA_fnc_globalEvent;
+            };
+
+            ["CBA_SettingChanged", {
+                params ["_setting", "_value"];
+
+                if (_setting != "CBA_network_loadoutValidation") exitWith {};
+
+                if (XGVAR(transferLoadout) > 0 && {_value isEqualTo 2}) then {
+                    WARNING("CBA_network_loadoutValidation is enabled - acex_headless_transferLoadout should therefore be disabled");
+                    [QEGVAR(common,displayTextStructured), ["CBA_network_loadoutValidation is enabled - acex_headless_transferLoadout should therefore be disabled", 3]] call CBA_fnc_globalEvent;
+                };
+            }] call CBA_fnc_addEventHandler;
         } else {
             // Register HC (this part happens on HC only)
             [QXGVAR(headlessClientJoined), [player]] call CBA_fnc_globalEvent; // Global event for API purposes
diff --git a/addons/hearing/stringtable.xml b/addons/hearing/stringtable.xml
index ff912a75d1..08419d4e42 100644
--- a/addons/hearing/stringtable.xml
+++ b/addons/hearing/stringtable.xml
@@ -370,15 +370,20 @@
             <Italian>Metti/Togli tappi</Italian>
             <Korean>귀마개 토글</Korean>
             <French>Mettre/enlever les bouchons</French>
+            <German>Ohrstöpsel einsetzen/herausnehmen</German>
             <Spanish>Poner/quitar tapones</Spanish>
+            <Portuguese>Colocar/retirar protetores auriculares</Portuguese>
         </Key>
         <Key ID="STR_ACE_Hearing_heavyWeaponUnits">
             <English>Only units with heavy weapons</English>
             <French>Uniquement les unités dotées d'armes lourdes</French>
             <Russian>Только юниты с тяжелым вооружением</Russian>
+            <German>Nur Einheiten mit schweren Waffen</German>
             <Japanese>重火器を装備したユニットのみ</Japanese>
             <Spanish>Sólo unidades con armas pesadas</Spanish>
             <Italian>Solo a unità con armi pesanti</Italian>
+            <Korean>중화기를 가진 유닛만 해당</Korean>
+            <Portuguese>Apenas unidades com armas pesadas</Portuguese>
         </Key>
     </Package>
 </Project>
diff --git a/addons/hellfire/CfgMagazines.hpp b/addons/hellfire/CfgMagazines.hpp
index 8abf2529b5..d025afadde 100644
--- a/addons/hellfire/CfgMagazines.hpp
+++ b/addons/hellfire/CfgMagazines.hpp
@@ -32,7 +32,7 @@ class CfgMagazines {
         count = 3;
         mass = 250;
         pylonWeapon = QGVAR(launcher);
-        hardpoints[] = {"B_MISSILE_PYLON", "UNI_SCALPEL", "CUP_NATO_HELO_LARGE", "RHS_HP_LONGBOW_RACK"};
+        hardpoints[] = {"B_MISSILE_PYLON", "UNI_SCALPEL", "CUP_NATO_HELO_LARGE"};
         model = "\A3\Weapons_F\DynamicLoadout\PylonPod_3x_Missile_LG_scalpel_F.p3d";
         mirrorMissilesIndexes[] = {2, 1, 3};
     };
@@ -41,7 +41,7 @@ class CfgMagazines {
         count = 4;
         mass = 340;
         pylonWeapon = QGVAR(launcher);
-        hardpoints[] = {"UNI_SCALPEL", "CUP_NATO_HELO_LARGE", "RHS_HP_HELLFIRE_RACK", "RHS_HP_LONGBOW_RACK"};
+        hardpoints[] = {"UNI_SCALPEL", "CUP_NATO_HELO_LARGE"};
         model = "\A3\Weapons_F\DynamicLoadout\PylonPod_4x_Missile_LG_scalpel_F.p3d";
         mirrorMissilesIndexes[] = {2, 1, 4, 3};
     };
diff --git a/addons/hellfire/functions/fnc_setupVehicle.sqf b/addons/hellfire/functions/fnc_setupVehicle.sqf
index 49eefd8274..ce3961d77a 100644
--- a/addons/hellfire/functions/fnc_setupVehicle.sqf
+++ b/addons/hellfire/functions/fnc_setupVehicle.sqf
@@ -46,7 +46,7 @@ if ((getNumber (configOf _vehicle >> QGVAR(addLaserDesignator))) == 1) then {
         params ["_vehicle", "_turretPath"];
         TRACE_3("checking for laser",_vehicle,_turretPath,_vehicle turretLocal _turretPath);
         if (!alive _vehicle) exitWith {};
-        if (!(_vehicle turretLocal _turretPath)) then {WARNING("Turret not local");};
+        if !(_vehicle turretLocal _turretPath) then {WARNING("Turret not local");};
         private _hasLaser = false;
         {
             // Most addons just use "Laserdesignator_mounted", but this should cover custom ones
diff --git a/addons/hitreactions/ACE_Settings.hpp b/addons/hitreactions/ACE_Settings.hpp
index 90c1445eba..78a510a141 100644
--- a/addons/hitreactions/ACE_Settings.hpp
+++ b/addons/hitreactions/ACE_Settings.hpp
@@ -1,4 +1,3 @@
-
 class ACE_Settings {
     class GVAR(minDamageToTrigger) {
       movedToSQF = 1;
diff --git a/addons/hitreactions/CfgEventHandlers.hpp b/addons/hitreactions/CfgEventHandlers.hpp
index eecf08c69d..b737b7bcbf 100644
--- a/addons/hitreactions/CfgEventHandlers.hpp
+++ b/addons/hitreactions/CfgEventHandlers.hpp
@@ -1,4 +1,3 @@
-
 class Extended_PreStart_EventHandlers {
     class ADDON {
         init = QUOTE(call COMPILE_SCRIPT(XEH_preStart));
@@ -11,6 +10,12 @@ class Extended_PreInit_EventHandlers {
     };
 };
 
+class Extended_PostInit_EventHandlers {
+    class ADDON {
+        init = QUOTE(call COMPILE_SCRIPT(XEH_postInit));
+    };
+};
+
 class Extended_Hit_EventHandlers {
     class CAManBase {
         class ADDON {
diff --git a/addons/hitreactions/XEH_PREP.hpp b/addons/hitreactions/XEH_PREP.hpp
index 7701b8ef19..eea48dcaa8 100644
--- a/addons/hitreactions/XEH_PREP.hpp
+++ b/addons/hitreactions/XEH_PREP.hpp
@@ -1,3 +1,3 @@
-
+PREP(checkWeaponDrop);
 PREP(fallDown);
 PREP(getRandomAnimation);
diff --git a/addons/hitreactions/XEH_postInit.sqf b/addons/hitreactions/XEH_postInit.sqf
new file mode 100644
index 0000000000..2750ae1159
--- /dev/null
+++ b/addons/hitreactions/XEH_postInit.sqf
@@ -0,0 +1,94 @@
+#include "script_component.hpp"
+
+
+[QGVAR(updateFiredEHs), {
+    TRACE_2("updateFiredEH",GVAR(weaponDropChanceArmHitPlayer),GVAR(weaponDropChanceArmHitAI));
+    if (GVAR(weaponDropChanceArmHitPlayer) + GVAR(weaponDropChanceArmHitAI) == 0) then {
+        if (isNil QGVAR(firedEHs)) exitWith {};
+        {
+            _x call CBA_fnc_removeEventHandler;
+        } forEach GVAR(firedEHs);
+        GVAR(firedEHs) = nil;
+        TRACE_1("removed EHs",GVAR(firedEHs));
+    } else {
+        if (!isNil QGVAR(firedEHs)) exitWith {};
+        private _firedEH = {
+            if (!local (_this select 0)) exitWith {};
+            (_this select 6) addEventHandler ["HitPart", {
+                params ["", "_entity", "", "", "", "", "_selections"];
+                [_entity, _selections] call FUNC(checkWeaponDrop);
+            }];
+        };
+        GVAR(firedEHs) = [];
+        { 
+            GVAR(firedEHs) pushBack [_x, [_x, _firedEH] call CBA_fnc_addEventHandler];
+        } forEach ["ace_firedNonPlayer", "ace_firedPlayer"];
+        TRACE_1("added EHs",GVAR(firedEHs));
+    };
+}] call CBA_fnc_addEventHandler;
+
+[QGVAR(dropWeapon), {
+    params ["_unit"];
+    TRACE_1("dropWeaponEH",_unit);
+
+    if !(_unit getVariable [QGVAR(canDropWeapon), true]) exitWith {};
+
+    // Prevents AI from losing both primary and pistol when being shot with their pistol out
+    _unit setVariable [QGVAR(canDropWeapon), false];
+
+    private _weapon = currentWeapon _unit;
+    private _thrownWeapon = _unit call EFUNC(common,throwWeapon);
+
+    [{
+        params ["_unit"];
+
+        _unit setVariable [QGVAR(canDropWeapon), nil];
+    }, _unit, 0.5] call CBA_fnc_waitAndExecute;
+
+    if (_unit call EFUNC(common,isPlayer)) exitWith {}; // Don't make players pick their own weapons up
+
+    // Wait before executing, as otherwise the unit would pick up the weapon immediately
+    [{
+        [{
+            (_this select 0) params ["_unit", "_weapon", "_thrownWeapon", "_timeout"];
+
+            // If the unit has been deleted or dead, if the weapon doesn't exist anymore or if it's been too long, stop
+            if (!alive _unit || {!local _unit} || {isNull _thrownWeapon} || {CBA_missionTime >= _timeout}) exitWith {
+                (_this select 1) call CBA_fnc_removePerFrameHandler;
+            };
+
+            // Don't pick up weapon when unit is unconscious
+            if (lifeState _unit == "INCAPACITATED") exitWith {};
+
+            // If the unit has no essential weapons, force them to get their weapon, otherwise wait until no enemies are present
+            if !(
+                (primaryWeapon _unit == "" && {handgunWeapon _unit == ""}) ||
+                {(_unit distance (_unit findNearestEnemy _unit)) > missionNamespace getVariable [QGVAR(safePickupDistance), DEFAULT_PICKUP_DISTANCE]}
+            ) exitWith {};
+
+            // If the unit is too far away, make them move closer
+            if (_unit distance _thrownWeapon >= 4) exitWith {
+                private _pos = getPosATL _thrownWeapon;
+
+                _unit setDestination [_pos, "LEADER PLANNED", true];
+                _unit doMove _pos;
+            };
+
+            (_this select 1) call CBA_fnc_removePerFrameHandler;
+
+            _unit action ["TakeWeapon", _thrownWeapon, _weapon];
+
+            // Make the unit switch weapons
+            [{
+                (_this select 0) hasWeapon (_this select 1)
+            }, {
+                params ["_unit", "_weapon"];
+
+                if (!alive _unit || {!local _unit} || {primaryWeapon _unit != _weapon}) exitWith {};
+
+                // Switch to the primary weapon, if it was picked up
+                _unit selectWeapon _weapon;
+            }, [_unit, _weapon], 5] call CBA_fnc_waitUntilAndExecute;
+        }, 5, _this] call CBA_fnc_addPerFrameHandler;
+    }, [_unit, _weapon, _thrownWeapon, CBA_missionTime + 300], random [2, 3, 4]] call CBA_fnc_waitAndExecute;
+}] call CBA_fnc_addEventHandler;
diff --git a/addons/hitreactions/XEH_preInit.sqf b/addons/hitreactions/XEH_preInit.sqf
index 894773534a..296279c7eb 100644
--- a/addons/hitreactions/XEH_preInit.sqf
+++ b/addons/hitreactions/XEH_preInit.sqf
@@ -8,4 +8,16 @@ PREP_RECOMPILE_END;
 
 #include "initSettings.inc.sqf"
 
+GVAR(armSelections) = [
+    "leftshoulder",
+    "rightshoulder",
+    "lefthand",
+    "leftforearm",
+    "leftarmroll",
+    "rightforearm",
+    "rightarmroll",
+    "righthand",
+    "rightarm"
+];
+
 ADDON = true;
diff --git a/addons/hitreactions/functions/fnc_checkWeaponDrop.sqf b/addons/hitreactions/functions/fnc_checkWeaponDrop.sqf
new file mode 100644
index 0000000000..ad4e7c4a41
--- /dev/null
+++ b/addons/hitreactions/functions/fnc_checkWeaponDrop.sqf
@@ -0,0 +1,33 @@
+#include "..\script_component.hpp"
+/*
+ * Author: KJW
+ * Checks if an entity should drop their weapon based on projectile hit info.
+ *
+ * Arguments:
+ * 0: Entity that was hit <OBJECT>
+ * 1: Selection names that were hit <ARRAY>
+ *
+ * Return Value:
+ * None
+ *
+ * Example:
+ * [player, []] call ace_hitreactions_fnc_checkWeaponDrop
+ *
+ * Public: No
+ */
+
+params ["_entity", "_selections"];
+
+// Make sure entity is a unit
+if !(_entity isKindOf "CAManBase") exitWith {};
+
+// Don't throw weapon if unit is unconscious or dead
+if !(lifeState _entity in ["HEALTHY", "INJURED"]) exitWith {};
+
+if (random 1 >= ([GVAR(weaponDropChanceArmHitAI), GVAR(weaponDropChanceArmHitPlayer)] select (_entity call EFUNC(common,isPlayer)))) exitWith {};
+
+if (_selections findAny GVAR(armSelections) == -1) exitWith {};
+
+if (getNumber ((currentWeapon _entity) call CBA_fnc_getItemConfig >> QGVAR(undroppable)) == 1) exitWith {};
+
+[QGVAR(dropWeapon), _entity, _entity] call CBA_fnc_targetEvent;
diff --git a/addons/hitreactions/initSettings.inc.sqf b/addons/hitreactions/initSettings.inc.sqf
index 2ca4ceaeac..820f664767 100644
--- a/addons/hitreactions/initSettings.inc.sqf
+++ b/addons/hitreactions/initSettings.inc.sqf
@@ -1,9 +1,30 @@
 private _category = [LELSTRING(common,categoryUncategorized), QUOTE(COMPONENT_BEAUTIFIED)];
 
 [
-    QGVAR(minDamageToTrigger), "SLIDER",
+    QGVAR(minDamageToTrigger),
+    "SLIDER",
     LSTRING(minDamageToTrigger_displayName),
     _category,
     [-1, 1, 0.1, 1],
     1
 ] call CBA_fnc_addSetting;
+
+[
+    QGVAR(weaponDropChanceArmHitPlayer),
+    "SLIDER",
+    LSTRING(weaponDropChanceArmHitPlayer_displayName),
+    _category,
+    [0, 1, 0, 2, true],
+    1,
+    {[QGVAR(updateFiredEHs)] call CBA_fnc_localEvent}
+] call CBA_fnc_addSetting;
+
+[
+    QGVAR(weaponDropChanceArmHitAI),
+    "SLIDER",
+    LSTRING(weaponDropChanceArmHitAI_displayName),
+    _category,
+    [0, 1, 0, 2, true],
+    1,
+    {[QGVAR(updateFiredEHs)] call CBA_fnc_localEvent}
+] call CBA_fnc_addSetting;
diff --git a/addons/hitreactions/script_component.hpp b/addons/hitreactions/script_component.hpp
index dccbef24f7..dd407a914b 100644
--- a/addons/hitreactions/script_component.hpp
+++ b/addons/hitreactions/script_component.hpp
@@ -15,3 +15,5 @@
 #endif
 
 #include "\z\ace\addons\main\script_macros.hpp"
+
+#define DEFAULT_PICKUP_DISTANCE 8
diff --git a/addons/hitreactions/stringtable.xml b/addons/hitreactions/stringtable.xml
index b07e9be9a0..251cd437bc 100644
--- a/addons/hitreactions/stringtable.xml
+++ b/addons/hitreactions/stringtable.xml
@@ -6,7 +6,7 @@
             <Italian>Danno Minimo per far cadere</Italian>
             <Chinese>觸發倒下前最低需受到多少傷害</Chinese>
             <Chinesesimp>触发倒下前最低需受到多少伤害</Chinesesimp>
-            <Japanese>崩れ落ちるまでの最低損傷値</Japanese>
+            <Japanese>転倒が発生するダメージの最低値</Japanese>
             <Korean>넘어질 때 발생하는 최소 피해량</Korean>
             <German>Mindestschaden, um Sturz auszulösen</German>
             <Polish>Minimalne obrażenie, żeby aktywować spadanie</Polish>
@@ -17,5 +17,23 @@
             <Turkish>Düşmeyi tetikleyen min hasar</Turkish>
             <Spanish>Daño mínimo para provocar la caída</Spanish>
         </Key>
+        <Key ID="STR_ACE_HitReactions_weaponDropChanceArmHitPlayer_displayName">
+            <English>Player Weapon Drop Chance (Arm Hit)</English>
+            <Japanese>プレイヤーが武器を落とす確率 (腕部への被弾)</Japanese>
+            <Russian>Шанс выпадения оружия у игрока (попадание в руку)</Russian>
+            <Korean>플레이어가 무기를 떨굴 확률 (팔 피격)</Korean>
+            <German>Spieler Wahrscheinlichkeit, die Waffe fallen zu lassen (Arm Treffer)</German>
+            <Italian>Probabilità dei giocatori di far cadere l'arma (colpo al braccio)</Italian>
+            <Portuguese>Probabilidade do jogador de largar a arma após tiro no braço</Portuguese>
+        </Key>
+        <Key ID="STR_ACE_HitReactions_weaponDropChanceArmHitAI_displayName">
+            <English>AI Weapon Drop Chance (Arm Hit)</English>
+            <Japanese>AIが武器を落とす確率 (腕部への被弾)</Japanese>
+            <Russian>Шанс выпадения оружия у ИИ (попадание в руку)</Russian>
+            <Korean>인공지능이 무기를 떨굴 확률 (팔 피격)</Korean>
+            <German>KI-Wahrscheinlichkeit, die Waffe fallen zu lassen (Arm Treffer)</German>
+            <Italian>Probabilità dell'IA di far cadere l'arma (colpo al braccio)</Italian>
+            <Portuguese>Probabilidade da IA de largar a arma após tiro no braço</Portuguese>
+        </Key>
     </Package>
 </Project>
diff --git a/addons/interact_menu/XEH_preInit.sqf b/addons/interact_menu/XEH_preInit.sqf
index 88269bcc04..a62996df68 100644
--- a/addons/interact_menu/XEH_preInit.sqf
+++ b/addons/interact_menu/XEH_preInit.sqf
@@ -88,8 +88,8 @@ GVAR(inheritedClassesMan) = [];
     if (GVAR(inheritedClassesAll) pushBackUnique _type == -1) exitWith { END_COUNTER(InitPost); };
 
     {
-        _x params ["_objectType", "_typeNum", "_parentPath", "_action"];
-        if (_object isKindOf _objectType) then {
+        _x params ["_objectType", "_typeNum", "_parentPath", "_action", "_excludedClasses"];
+        if (_type isKindOf _objectType && {_excludedClasses findIf {_type isKindOf _x} == -1}) then {
             [_type, _typeNum, _parentPath, _action] call FUNC(addActionToClass);
         };
     } forEach GVAR(inheritedActionsAll);
@@ -102,8 +102,10 @@ GVAR(inheritedClassesMan) = [];
 
     if (GVAR(inheritedClassesMan) pushBackUnique _type == -1) exitWith { END_COUNTER(InitPost); };
     {
-        _x params ["_typeNum", "_parentPath", "_action"];
-        [_type, _typeNum, _parentPath, _action] call FUNC(addActionToClass);
+        _x params ["_typeNum", "_parentPath", "_action", "_excludedClasses"];
+        if (_excludedClasses findIf {_type isKindOf _x} == -1) then { // skip excluded classes and children
+            [_type, _typeNum, _parentPath, _action] call FUNC(addActionToClass);
+        };
     } forEach GVAR(inheritedActionsMan);
     END_COUNTER(InitPost);
 }, true, ["VirtualMan_F"]] call CBA_fnc_addClassEventHandler;
diff --git a/addons/interact_menu/functions/fnc_addActionToClass.sqf b/addons/interact_menu/functions/fnc_addActionToClass.sqf
index ccea8c4654..91197d02d9 100644
--- a/addons/interact_menu/functions/fnc_addActionToClass.sqf
+++ b/addons/interact_menu/functions/fnc_addActionToClass.sqf
@@ -1,7 +1,7 @@
 #include "..\script_component.hpp"
 /*
  * Author: esteldunedain
- * Insert an ACE action to a class, under a certain path
+ * Inserts an ACE action to a class, under a certain path.
  * Note: This function is NOT global.
  *
  * Arguments:
@@ -10,12 +10,13 @@
  * 2: Parent path of the new action <ARRAY>
  * 3: Action <ARRAY>
  * 4: Use Inheritance <BOOL> (default: false)
+ * 5: Classes excluded from inheritance (children included) <ARRAY> (default: [])
  *
  * Return Value:
  * The entry full path, which can be used to remove the entry, or add children entries <ARRAY>.
  *
  * Example:
- * [typeOf cursorTarget, 0, ["ACE_TapShoulderRight"],VulcanPinchAction] call ace_interact_menu_fnc_addActionToClass;
+ * [typeOf cursorTarget, 0, ["ACE_TapShoulderRight"], VulcanPinchAction] call ace_interact_menu_fnc_addActionToClass;
  *
  * Public: Yes
  */
@@ -25,22 +26,30 @@ if (!params [["_objectType", "", [""]], ["_typeNum", 0, [0]], ["_parentPath", []
     ERROR("Bad Params");
     []
 };
-TRACE_4("addActionToClass",_objectType,_typeNum,_parentPath,_action);
+private _useInheritance = _this param [4, false, [false]];
+private _excludedClasses = _this param [5, [], [[]]];
+TRACE_6("addActionToClass",_objectType,_typeNum,_parentPath,_action,_useInheritance,_excludedClasses);
 
-if (param [4, false, [false]]) exitwith {
+if (_useInheritance) exitwith {
     BEGIN_COUNTER(addAction);
+    private _cfgVehicles = configFile >> "CfgVehicles"; // store this so we don't resolve for every element
+    _excludedClasses = (_excludedClasses apply {configName (_cfgVehicles >> _x)}) - [""]; // ends up being faster than toLower'ing everything else
     if (_objectType == "CAManBase") then {
-        GVAR(inheritedActionsMan) pushBack [_typeNum, _parentPath, _action];
+        GVAR(inheritedActionsMan) pushBack [_typeNum, _parentPath, _action, _excludedClasses];
         {
-            [_x, _typeNum, _parentPath, _action] call FUNC(addActionToClass);
-        } forEach GVAR(inheritedClassesMan);
-    } else {
-        GVAR(inheritedActionsAll) pushBack [_objectType, _typeNum, _parentPath, _action];
-        {
-            if (_x isKindOf _objectType) then {
+            private _type = _x;
+            if (_excludedClasses findIf {_type isKindOf _x} == -1) then { // skip excluded classes and children
                 [_x, _typeNum, _parentPath, _action] call FUNC(addActionToClass);
             };
-        } forEach GVAR(inheritedClassesAll);
+        } forEach (GVAR(inheritedClassesMan) - _excludedClasses);
+    } else {
+        GVAR(inheritedActionsAll) pushBack [_objectType, _typeNum, _parentPath, _action, _excludedClasses];
+        {
+            private _type = _x;
+            if (_type isKindOf _objectType && {_excludedClasses findIf {_type isKindOf _x} == -1}) then {
+                [_type, _typeNum, _parentPath, _action] call FUNC(addActionToClass);
+            };
+        } forEach (GVAR(inheritedClassesAll) - _excludedClasses);
     };
     END_COUNTER(addAction);
 
diff --git a/addons/interact_menu/functions/fnc_keyDown.sqf b/addons/interact_menu/functions/fnc_keyDown.sqf
index 5bce40d0a8..9cb638bcea 100644
--- a/addons/interact_menu/functions/fnc_keyDown.sqf
+++ b/addons/interact_menu/functions/fnc_keyDown.sqf
@@ -116,7 +116,7 @@ GVAR(selfMenuOffset) = (AGLtoASL (positionCameraToWorld [0, 0, 2])) vectorDiff (
 //Auto expand the first level when self, mounted vehicle or zeus (skips the first animation as there is only one choice)
 if (GVAR(openedMenuType) == 0) then {
     if (isNull curatorCamera) then {
-        if (!(isNull (ACE_controlledUAV select 0))) then {
+        if !(isNull (ACE_controlledUAV select 0)) then {
             GVAR(menuDepthPath) = [["ACE_SelfActions", (ACE_controlledUAV select 0)]];
             GVAR(expanded) = true;
             GVAR(expandedTime) = diag_tickTime;
diff --git a/addons/interact_menu/functions/fnc_removeActionFromClass.sqf b/addons/interact_menu/functions/fnc_removeActionFromClass.sqf
index 7585616ef6..87cc8609cc 100644
--- a/addons/interact_menu/functions/fnc_removeActionFromClass.sqf
+++ b/addons/interact_menu/functions/fnc_removeActionFromClass.sqf
@@ -1,29 +1,63 @@
 #include "..\script_component.hpp"
 /*
  * Author: esteldunedain
- * Removes an action from a class
+ * Removes an action from a class.
  *
  * Arguments:
  * 0: TypeOf of the class <STRING>
  * 1: Type of action, 0 for actions, 1 for self-actions <NUMBER>
  * 2: Full path of the new action <ARRAY>
+ * 3: Remove action from child classes <BOOL> (default: false)
  *
  * Return Value:
  * None
  *
  * Example:
- * [typeOf cursorTarget, 0,["ACE_TapShoulderRight","VulcanPinch"]] call ace_interact_menu_fnc_removeActionFromClass;
+ * [typeOf cursorTarget, 0, ["ACE_TapShoulderRight", "VulcanPinch"]] call ace_interact_menu_fnc_removeActionFromClass;
  *
  * Public: No
  */
 
-params ["_objectType", "_typeNum", "_fullPath"];
+params ["_objectType", "_typeNum", "_fullPath", ["_useInheritance", false, [false]]];
 
 _objectType = _objectType call EFUNC(common,getConfigName);
 
 private _res = _fullPath call FUNC(splitPath);
 _res params ["_parentPath", "_actionName"];
 
+if (_useInheritance) exitWith {
+    // Only need to run for classes that have already been initialized
+    {
+        [_x, _typeNum, _fullPath] call FUNC(removeActionFromClass);
+    } forEach (GVAR(inheritedClassesAll) select {_x isKindOf _objectType});
+
+    // Find same path and actionName, and check if it's a parent class, needs to be checked for all classes
+    private _index = GVAR(inheritedActionsAll) findIf {
+        _x params ["_currentType", "", "_currentParentPath", "_currentAction"];
+
+        [_objectType isKindOf _currentType, _currentParentPath, _currentAction select 0] isEqualTo [true, _parentPath, _actionName]
+    };
+
+     // Add to exclude classes
+    if (_index != -1) then {
+        (GVAR(inheritedActionsAll) select _index select 4) pushBackUnique _objectType;
+    };
+
+    // Children of CAManBase need special treatment because of inheritedActionsMan array
+    if (_objectType isKindOf "CAManBase") then {
+        private _index = GVAR(inheritedActionsMan) findIf {
+            _x params ["", "_currentParentPath", "_currentAction"];
+
+            [_currentParentPath, _currentAction select 0] isEqualTo [_parentPath, _actionName]
+        };
+
+        // Different index because array doesn't include _objectType
+        if (_index != -1) then {
+            (GVAR(inheritedActionsMan) select _index select 3) pushBackUnique _objectType;
+        };
+    };
+};
+
 private _namespace = [GVAR(ActNamespace), GVAR(ActSelfNamespace)] select _typeNum;
 private _actionTrees = _namespace getOrDefault [_objectType, []];
 
diff --git a/addons/interact_menu/functions/fnc_renderActionPoints.sqf b/addons/interact_menu/functions/fnc_renderActionPoints.sqf
index 4ce37aa66b..62d29be91f 100644
--- a/addons/interact_menu/functions/fnc_renderActionPoints.sqf
+++ b/addons/interact_menu/functions/fnc_renderActionPoints.sqf
@@ -123,7 +123,7 @@ GVAR(collectedActionPoints) resize 0;
 // Render nearby actions, unit self actions or vehicle self actions as appropiate
 if (GVAR(openedMenuType) == 0) then {
     if (isNull curatorCamera) then {
-        if (!(isNull (ACE_controlledUAV select 0))) then {
+        if !(isNull (ACE_controlledUAV select 0)) then {
             // Render UAV self actions when in control of UAV AI
             (ACE_controlledUAV select 0) call _fnc_renderSelfActions;
         } else {
diff --git a/addons/interact_menu/stringtable.xml b/addons/interact_menu/stringtable.xml
index ce4da0c506..cb05331633 100644
--- a/addons/interact_menu/stringtable.xml
+++ b/addons/interact_menu/stringtable.xml
@@ -12,7 +12,7 @@
             <Hungarian>Mindig legyen a saját cselekvés kurzorja látható</Hungarian>
             <Italian>Mostra sempre il cursore per le autointerazioni</Italian>
             <Portuguese>Sempre mostrar cursor para interação pessoal</Portuguese>
-            <Japanese>セルフ インタラクションへ常にカーソルを表示</Japanese>
+            <Japanese>カーソルを常に表示</Japanese>
             <Korean>자기상호작용 시 항상 커서를 보이기</Korean>
             <Chinesesimp>自我互动时永远显示光标</Chinesesimp>
             <Chinese>自我互動時永遠顯示游標</Chinese>
@@ -29,7 +29,7 @@
             <German>Immer den Mauszeiger für Fremd-Interaktionen anzeigen</German>
             <Hungarian>Mindig legyen a cselekvés kurzorja látható</Hungarian>
             <Portuguese>Sempre mostrar cursor para interação</Portuguese>
-            <Japanese>インタラクションへ常にカーソルを表示</Japanese>
+            <Japanese>カーソルを常に表示</Japanese>
             <Korean>상호작용 시 항상 커서를 보이기</Korean>
             <Chinesesimp>互动时永远显示光标</Chinesesimp>
             <Chinese>互動時永遠顯示游標</Chinese>
@@ -46,7 +46,7 @@
             <German>Interaktionsmenü in Listen anzeigen</German>
             <Hungarian>Cselekvő menük listaként való megjelenítése</Hungarian>
             <Portuguese>Mostrar menu de interação como listas</Portuguese>
-            <Japanese>インタラクションメニューを一覧表示</Japanese>
+            <Japanese>メニューをリストで表示</Japanese>
             <Korean>상호작용메뉴를 리스트화 해서 보이기</Korean>
             <Chinesesimp>以列表方式显示互动表单</Chinesesimp>
             <Chinese>以列表方式顯示互動表單</Chinese>
@@ -80,7 +80,7 @@
             <Hungarian>Saját cselekvő gomb</Hungarian>
             <Italian>Tasto autointerazioni</Italian>
             <Portuguese>Tecla de Interação Pessoal</Portuguese>
-            <Japanese>セルフ インタラクション キー</Japanese>
+            <Japanese>セルフ・インタラクション キー</Japanese>
             <Korean>자기상호작용 키</Korean>
             <Chinesesimp>自我互动键</Chinesesimp>
             <Chinese>自我互動鍵</Chinese>
@@ -131,7 +131,7 @@
             <Portuguese>Ações do Zeus</Portuguese>
             <Russian>Действия Зевса</Russian>
             <Italian>Interazioni Zeus</Italian>
-            <Japanese>Zeusでのアクション</Japanese>
+            <Japanese>Zeusのアクション</Japanese>
             <Korean>제우스 동작</Korean>
             <Chinesesimp>宙斯操作</Chinesesimp>
             <Chinese>宙斯操作</Chinese>
@@ -148,7 +148,7 @@
             <Spanish>Interacción - Texto al max.</Spanish>
             <Hungarian>Cselekvés - Szöveg max.</Hungarian>
             <Portuguese>Interação - Max. de Texto</Portuguese>
-            <Japanese>インタラクション - 文字の色</Japanese>
+            <Japanese>インタラクション - 文字の表示色の最大値</Japanese>
             <Korean>상호작용 - 문자색깔</Korean>
             <Chinesesimp>互动—文字颜色最大值</Chinesesimp>
             <Chinese>互動 - 文字最大化</Chinese>
@@ -165,7 +165,7 @@
             <Spanish>Interacción - Texto al min.</Spanish>
             <Hungarian>Cselekvés - Szöveg min.</Hungarian>
             <Portuguese>Interação - Min. de Texto</Portuguese>
-            <Japanese>インタラクション - 文字の背景色</Japanese>
+            <Japanese>インタラクション - 文字の表示色の最低値</Japanese>
             <Korean>상호작용 - 문자배경색</Korean>
             <Chinesesimp>互动—文字颜色最小值</Chinesesimp>
             <Chinese>互動 - 文字最小化</Chinese>
@@ -182,7 +182,7 @@
             <Spanish>Interacción - Sombras al max.</Spanish>
             <Hungarian>Cselekvés - Árnyék max.</Hungarian>
             <Portuguese>Interação - Max. de Sombra</Portuguese>
-            <Japanese>インタラクション - 文字への影の色</Japanese>
+            <Japanese>インタラクション - 文字の影色の最大値</Japanese>
             <Korean>상호작용 - 문자그림자색</Korean>
             <Chinesesimp>互动—阴影最大值</Chinesesimp>
             <Chinese>互動 - 陰影最大化</Chinese>
@@ -199,7 +199,7 @@
             <Spanish>Interacción - Sombras al min.</Spanish>
             <Hungarian>Cselekvés - Árnyék min.</Hungarian>
             <Portuguese>Interação - Min. de Sombra</Portuguese>
-            <Japanese>インタラクション - 文字への影の最低色</Japanese>
+            <Japanese>インタラクション - 文字の影色の最低値</Japanese>
             <Korean>상호작용 - 문자그림자배경색</Korean>
             <Chinesesimp>互动—阴影最小值</Chinesesimp>
             <Chinese>互動 - 陰影最小化</Chinese>
@@ -216,7 +216,7 @@
             <Czech>Udržuj kurzor na středu</Czech>
             <Portuguese>Manter o cursor centralizado</Portuguese>
             <Italian>Mantieni il cursore centrato</Italian>
-            <Japanese>常にカーソルを中央にする</Japanese>
+            <Japanese>カーソルを常に中心にする</Japanese>
             <Korean>커서를 항상 가운데에 둡니다</Korean>
             <Chinesesimp>保持光标在中心点</Chinesesimp>
             <Chinese>保持游標在中心點</Chinese>
@@ -233,7 +233,7 @@
             <Spanish>Mantiene el cursor centrado y despliega los menús alrededor. Útil si el tamaño de la pantalla es limitado.</Spanish>
             <Portuguese>Manter o cursor centralizado e mover o menu de opções. Útil caso o tamanho da tela seja limitado.</Portuguese>
             <Italian>Mantieni il cursore centrato e sposta il menù intorno. Utile se lo schermo è piccolo.</Italian>
-            <Japanese>常にカーソルを中央へ表示させ、オプション メニューが移動します。画面の大きさが制限されている時に使いやすくなります。</Japanese>
+            <Japanese>カーソルを常に中心に表示し、オプション メニューを移動させます。画面の大きさが制限されている時に便利です。</Japanese>
             <Korean>커서를 항상 가운데에 두고 메뉴를 움직입니다. 화면의 크기가 제한되있을 때 유용합니다.</Korean>
             <Chinesesimp>保持光标在中心点并平移周遭的选项菜单。这对在屏幕尺寸有限的玩家很有用！</Chinesesimp>
             <Chinese>保持游標在中心點並平移周遭的選項選單。這對在螢幕尺寸有限的玩家很有用!</Chinese>
@@ -250,7 +250,7 @@
             <Portuguese>Execute a ação quando soltar a tecla de menu</Portuguese>
             <Hungarian>Cselekvés végrehajtása a menügomb elengedésekor</Hungarian>
             <Italian>Esegui l'azione quando rilasci il tasto menu</Italian>
-            <Japanese>メニュー キーを離した時にアクションを実行</Japanese>
+            <Japanese>キーを離した時にアクションを実行</Japanese>
             <Korean>메뉴 키를 놓을 때 행동하기</Korean>
             <Chinesesimp>当放开菜单键后就执行动作</Chinesesimp>
             <Chinese>當放開選單鍵後就執行動作</Chinese>
@@ -267,7 +267,7 @@
             <Portuguese>Tamanho do texto de interação</Portuguese>
             <Hungarian>Cselekvő szöveg mérete</Hungarian>
             <Italian>Dimensione del testo d'interazione</Italian>
-            <Japanese>インタラクション文字の大きさ</Japanese>
+            <Japanese>文字の大きさ</Japanese>
             <Korean>상호작용 - 문자크기</Korean>
             <Chinesesimp>互动菜单文字大小</Chinesesimp>
             <Chinese>互動選單文字大小</Chinese>
@@ -284,7 +284,7 @@
             <Portuguese>Sombra do texto de interação</Portuguese>
             <Hungarian>Cselekvő szöveg árnyéka</Hungarian>
             <Italian>Ombra del testo d'interazione</Italian>
-            <Japanese>インタラクション文字へ影</Japanese>
+            <Japanese>文字の影表示</Japanese>
             <Korean>상호작용 - 문자그림자</Korean>
             <Chinesesimp>互动菜单文字阴影</Chinesesimp>
             <Chinese>互動選單文字陰影</Chinese>
@@ -301,7 +301,7 @@
             <Portuguese>Permite controlar a sombra do texto. Contorno ignora sombras com cores customizadas.</Portuguese>
             <Hungarian>Hozzáférést biztosít a szöveg árnyékának kezeléséhez. A körvonal nem veszi figyelembe az egyedi árnyékszíneket.</Hungarian>
             <Italian>Permette di controllare l'ombra del testo. L'impostazione "Contorno" ignora il colore dell'ombra.</Italian>
-            <Japanese>文字への影を設定します。縁取りは設定された影の色を無視します。</Japanese>
+            <Japanese>文字に影を表示します。縁取りは設定された影の色を無視します。</Japanese>
             <Korean>문자의 그림자를 조절하는 것을 가능케 합니다. 외곽선은 임의의 그림자색을 무시합니다.</Korean>
             <Chinesesimp>允许控制文字阴影。轮廓部分则会忽略自定义的阴影颜色。</Chinesesimp>
             <Chinese>允許控制文字陰影。輪廓部分則會忽略自定義的陰影顏色</Chinese>
@@ -335,7 +335,7 @@
             <Hungarian>Cselekvő menü háttere</Hungarian>
             <Russian>Фон меню взаимодействия</Russian>
             <Italian>Sfondo Menù Interazioni</Italian>
-            <Japanese>インタラクションメニューの背景</Japanese>
+            <Japanese>メニューの背景</Japanese>
             <Korean>상호작용 메뉴 배경</Korean>
             <Chinesesimp>互动菜单背景</Chinesesimp>
             <Chinese>互動選單背景</Chinese>
@@ -352,7 +352,7 @@
             <Hungarian>A háttér elmosása a cselekvő menü használata alatt.</Hungarian>
             <Russian>Размыть фон, пока открыто меню взаимодействия.</Russian>
             <Italian>Sfoca lo sfondo mentre il Menù Interazioni è aperto.</Italian>
-            <Japanese>インタラクションメニューを開いたとき、背景をぼかします。</Japanese>
+            <Japanese>インタラクション メニューを開いたときに背景をぼかします。</Japanese>
             <Korean>상호작용 메뉴가 열릴 시 배경을 흐릿하게 처리합니다.</Korean>
             <Chinesesimp>当互动菜单开启时，模糊背景画面。</Chinesesimp>
             <Chinese>當互動選單開啟時，模糊背景畫面</Chinese>
@@ -386,7 +386,7 @@
             <Hungarian>Fekete</Hungarian>
             <Russian>Черный</Russian>
             <Italian>Nero</Italian>
-            <Japanese>背景を黒くする</Japanese>
+            <Japanese>背景を暗くする</Japanese>
             <Korean>까맣게</Korean>
             <Chinesesimp>黑色</Chinesesimp>
             <Chinese>黑色</Chinese>
@@ -436,7 +436,7 @@
             <Spanish>Menú de interacción</Spanish>
             <Italian>Menù Interazioni</Italian>
             <French>Menu d'interaction</French>
-            <Japanese>インタラクションメニュー</Japanese>
+            <Japanese>インタラクション メニュー</Japanese>
             <Korean>상호작용 메뉴</Korean>
             <Chinesesimp>互动菜单</Chinesesimp>
             <Chinese>互動選單</Chinese>
@@ -452,7 +452,7 @@
             <Italian>Velocità di Animazione delle Interazioni</Italian>
             <Spanish>Velocidad de animación del menú de interacción</Spanish>
             <French>Vitesse de l'animation d'interaction</French>
-            <Japanese>インタラクションのアニメーション速度</Japanese>
+            <Japanese>アニメーション速度</Japanese>
             <Korean>상호작용 움직임 속도</Korean>
             <Chinesesimp>互动菜单动画速度</Chinesesimp>
             <Chinese>互動選單動畫速度</Chinese>
@@ -468,7 +468,7 @@
             <Italian>Rende le animazioni del Menù più veloci e diminuisce il tempo richiesto per mostrare sotto-azioni</Italian>
             <Spanish>Hace la animación del menú más rápida, reduciendo el tiempo necesario para abrir sub-acciones.</Spanish>
             <French>Rend les animations du menu plus rapide, et réduit le temps nécessaire à l'affichage des sous menus d'action.</French>
-            <Japanese>メニューのアニメーションを高速化し、サブアクションを表示するためのホバーに必要な時間を短縮します。</Japanese>
+            <Japanese>メニューのアニメーションを高速化し、サブアクションを表示するために必要なホバーにかかる時間を短縮します。</Japanese>
             <Chinesesimp>使菜单的动画速度更快，并减少子选项显现出来的时间</Chinesesimp>
             <Chinese>使選單的動畫速度更快，並減少子選項顯現出來的時間</Chinese>
             <Korean>상호작용을 표시하기 위해 메뉴 애니메이션을 빠르게 만들고 마우스를 가져오는 데 필요한 시간을 줄입니다.</Korean>
@@ -493,7 +493,7 @@
         <Key ID="STR_ACE_Interact_Menu_consolidateSingleChild">
             <English>Consolidate single child actions</English>
             <Russian>Объединять ед. дочерные действия</Russian>
-            <Japanese>子アクションを統合</Japanese>
+            <Japanese>1個のみの子アクションを統合</Japanese>
             <Spanish>Consolidar acciones hijo únicas</Spanish>
             <French>Combiner les sous-actions uniques</French>
             <German>Untergeordnete Aktionen zusammenfassen</German>
@@ -506,7 +506,7 @@
         <Key ID="STR_ACE_Interact_Menu_consolidateSingleChild_Description">
             <English>Combines parent action with only one child action together.</English>
             <Russian>Объединять родительское действие с единственным дочерним действием в одно.</Russian>
-            <Japanese>親アクションと子アクションの一つを統合して表示します。</Japanese>
+            <Japanese>アクションが1個のみの子アクションを親アクションと結合し表示を整理します。</Japanese>
             <Spanish>Combina acciones padre con una única accion hijo de forma conjunta</Spanish>
             <French>Lorsqu'un menu ne contient qu'une seule sous-action, elle est combinée avec son menu parent.</French>
             <Italian>Combina interazioni con una sola sotto-azione in una singola interazione.</Italian>
diff --git a/addons/interaction/CfgVehicles.hpp b/addons/interaction/CfgVehicles.hpp
index 6ae0d4a982..b3a0c1d37e 100644
--- a/addons/interaction/CfgVehicles.hpp
+++ b/addons/interaction/CfgVehicles.hpp
@@ -372,6 +372,16 @@ class CfgVehicles {
     };
 
     class Car_F: Car {};
+    class Offroad_01_base_F: Car_F {
+        class GVAR(anims) {
+            class HideBackpacks {
+                positions[] = {{-1.15, -1.15, -0.2}, {1.1, -1.15, -0.2}, {1.1, -2.5, -0.2}};
+                items[] = {"B_TacticalPack_blk", "B_TacticalPack_blk", "B_Carryall_khk", "B_Carryall_khk"};
+                name = "$STR_a3_cfgvehicleclasses_backpacks0";
+                text = "$STR_a3_cfgvehicleclasses_backpacks0";
+            };
+        };
+    };
     class Quadbike_01_base_F: Car_F {
         class ACE_Actions: ACE_Actions {
             class ACE_MainActions: ACE_MainActions {
@@ -405,6 +415,49 @@ class CfgVehicles {
         };
     };
 
+    class Wheeled_APC_F;
+    class APC_Wheeled_01_base_F: Wheeled_APC_F {
+        class GVAR(anims) {
+            class showBags {
+                phase = 0;
+                // Rotate interactions with turret rotation
+                positions[] = {
+                    "[0, -1.6, 0] vectorAdd ([[1, -1, 0.1], [0, 0, 1], deg (_target animationPhase 'MainTurret')] call CBA_fnc_vectRotate3D)",
+                    "[0, -1.6, 0] vectorAdd ([[-1, -1, 0.1], [0, 0, 1], deg (_target animationPhase 'MainTurret')] call CBA_fnc_vectRotate3D)"
+                };
+                selections[] = {"vhc_bags"};
+                items[] = {"B_Carryall_cbr", "B_Carryall_cbr"};
+                name = "$STR_a3_cfgvehicleclasses_backpacks0";
+                text = "$STR_a3_cfgvehicleclasses_backpacks0";
+            };
+        };
+    };
+    class APC_Wheeled_02_base_F: Wheeled_APC_F {
+        class GVAR(anims);
+    };
+    class APC_Wheeled_02_base_v2_F: APC_Wheeled_02_base_F {
+        class GVAR(anims): GVAR(anims) {
+            class showBags {
+                phase = 0;
+                selections[] = {"vhc_bags"};
+                items[] = {"B_Carryall_cbr"};
+                name = "$STR_BACKPACK_CONTAINER_NAME";
+                text = "$STR_BACKPACK_CONTAINER_NAME";
+            };
+        };
+    };
+    class APC_Wheeled_03_base_F: Wheeled_APC_F {
+        class GVAR(anims) {
+            class showBags {
+                phase = 0;
+                selections[] = {"vhc_bags"};
+                items[] = {"B_Carryall_cbr", "B_Carryall_cbr"};
+                name = "$STR_a3_cfgvehicleclasses_backpacks0";
+                text = "$STR_a3_cfgvehicleclasses_backpacks0";
+            };
+        };
+    };
+
     class Tank: LandVehicle {
         class ACE_Actions {
             class ACE_MainActions {
@@ -432,6 +485,88 @@ class CfgVehicles {
             };
         };
     };
+    class Tank_F;
+    class LT_01_base_F: Tank_F {
+        class GVAR(anims) {
+            class showBags {
+                phase = 0;
+                selections[] = {"vhc_bags"};
+                items[] = {"B_Carryall_cbr"};
+                name = "$STR_BACKPACK_CONTAINER_NAME";
+                text = "$STR_BACKPACK_CONTAINER_NAME";
+            };
+            class showBags2: showBags {
+                selections[] = {"vhc_bags2"};
+            };
+        };
+    };
+
+    class APC_Tracked_01_base_F: Tank_F {
+        class GVAR(anims);
+    };
+    class B_APC_Tracked_01_base_F: APC_Tracked_01_base_F {
+        class GVAR(anims): GVAR(anims) {
+            class showBags {
+                phase = 0;
+                selections[] = {"vhc_bags"};
+                positions[] = {"private _pos = _target selectionPosition 'vhc_bags'; _pos set [0, -(_pos select 0)]; _pos"}; // Mirror position to other side of vehicle
+                items[] = {"B_Carryall_cbr", "B_Carryall_cbr", "B_Carryall_cbr", "B_Carryall_cbr", "B_Carryall_cbr"};
+                name = "$STR_a3_cfgvehicleclasses_backpacks0";
+                text = "$STR_a3_cfgvehicleclasses_backpacks0";
+            };
+        };
+    };
+    class B_APC_Tracked_01_CRV_F: B_APC_Tracked_01_base_F {
+        class GVAR(anims): GVAR(anims) {
+            class showBags: showBags {
+                items[] = {"B_Carryall_cbr", "B_Carryall_cbr", "B_Carryall_cbr", "B_Carryall_cbr"};
+            };
+        };
+    };
+
+    class APC_Tracked_02_base_F: Tank_F {
+        class GVAR(anims);
+    };
+    class O_APC_Tracked_02_base_F: APC_Tracked_02_base_F {};
+    class O_APC_Tracked_02_cannon_F: O_APC_Tracked_02_base_F {
+        class GVAR(anims): GVAR(anims) {
+            class showBags {
+                phase = 0;
+                selections[] = {"vhc_bags"};
+                items[] = {"B_Carryall_cbr", "B_Carryall_cbr", "B_Carryall_cbr"};
+                name = "$STR_a3_cfgvehicleclasses_backpacks0";
+                text = "$STR_a3_cfgvehicleclasses_backpacks0";
+            };
+        };
+    };
+
+    class APC_Tracked_03_base_F: Tank_F {
+        class GVAR(anims) {
+            class showBags {
+                phase = 0;
+                selections[] = {"vhc_bags"};
+                items[] = {"B_Carryall_cbr", "B_Carryall_cbr"};
+                name = "$STR_a3_cfgvehicleclasses_backpacks0";
+                text = "$STR_a3_cfgvehicleclasses_backpacks0";
+            };
+        };
+    };
+
+    class MBT_01_base_F: Tank_F {
+        class GVAR(anims);
+    };
+    class B_MBT_01_base_F: MBT_01_base_F {};
+    class B_MBT_01_cannon_F: B_MBT_01_base_F {
+        class GVAR(anims): GVAR(anims) {
+            class showBags {
+                phase = 0;
+                selections[] = {"vhc_bags"};
+                items[] = {"B_Carryall_cbr", "B_Carryall_cbr", "B_Carryall_cbr", "B_Carryall_cbr", "B_Carryall_cbr", "B_Carryall_cbr"};
+                name = "$STR_a3_cfgvehicleclasses_backpacks0";
+                text = "$STR_a3_cfgvehicleclasses_backpacks0";
+            };
+        };
+    };
 
     class Motorcycle: LandVehicle {
         class ACE_Actions {
diff --git a/addons/interaction/XEH_PREP.hpp b/addons/interaction/XEH_PREP.hpp
index 554f903704..26d4cf4d00 100644
--- a/addons/interaction/XEH_PREP.hpp
+++ b/addons/interaction/XEH_PREP.hpp
@@ -54,4 +54,5 @@ PREP(push);
 
 // misc
 PREP(canFlip);
+PREP(initAnimActions);
 PREP(replaceTerrainObject);
diff --git a/addons/interaction/XEH_postInit.sqf b/addons/interaction/XEH_postInit.sqf
index f461e2a770..dc1c167d7c 100644
--- a/addons/interaction/XEH_postInit.sqf
+++ b/addons/interaction/XEH_postInit.sqf
@@ -149,11 +149,20 @@ GVAR(isOpeningDoor) = false;
 ["isNotOnLadder", {getNumber (configFile >> "CfgMovesMaleSdr" >> "States" >> animationState (_this select 0) >> "ACE_isLadder") != 1}] call EFUNC(common,addCanInteractWithCondition);
 
 ["CBA_settingsInitialized", {
+    TRACE_2("settingsInitialized",GVAR(disableNegativeRating),GVAR(enableAnimActions));
+
     if (GVAR(disableNegativeRating)) then {
         player addEventHandler ["HandleRating", {
             (_this select 1) max 0
         }];
     };
+
+    if (!GVAR(enableAnimActions)) exitWith {};
+
+    // Don't add inherited anim actions (but actions are added to child classes)
+    {
+        [_x, "InitPost", LINKFUNC(initAnimActions), true, [], true] call CBA_fnc_addClassEventHandler;
+    } forEach (keys (uiNamespace getVariable QGVAR(animActionsClasses)));
 }] call CBA_fnc_addEventHandler;
 
 {
@@ -162,7 +171,6 @@ GVAR(isOpeningDoor) = false;
     }] call CBA_fnc_addPlayerEventHandler;
 } forEach ["loadout", "weapon"];
 
-
 // add "Take _weapon_" action to dropped weapons
 private _action = [
     // action display name will be overwritten in modifier function
diff --git a/addons/interaction/XEH_preInit.sqf b/addons/interaction/XEH_preInit.sqf
index c5873bcfc9..ec73b62b1b 100644
--- a/addons/interaction/XEH_preInit.sqf
+++ b/addons/interaction/XEH_preInit.sqf
@@ -16,6 +16,7 @@ DFUNC(repair_Statement) = { // moved from config because of build problems
 };
 
 if (hasInterface) then {
+    GVAR(initializedAnimClasses) = [];
     GVAR(replaceTerrainModels) = createHashMapFromArray call (uiNamespace getVariable QGVAR(cacheReplaceTerrainModels));
 };
 
diff --git a/addons/interaction/XEH_preStart.sqf b/addons/interaction/XEH_preStart.sqf
index 331b5c6d36..39da54b3b5 100644
--- a/addons/interaction/XEH_preStart.sqf
+++ b/addons/interaction/XEH_preStart.sqf
@@ -23,3 +23,13 @@ private _cacheReplaceTerrainModels = createHashMap;
 } forEach _replaceTerrainClasses;
 
 uiNamespace setVariable [QGVAR(cacheReplaceTerrainModels), compileFinal str _cacheReplaceTerrainModels];
+
+
+// Cache classes with anim actions
+private _animActionsClasses = (QUOTE(isClass (_x >> QQGVAR(anims)) && {!isClass (inheritsFrom _x >> QQGVAR(anims))}) configClasses (configFile >> "CfgVehicles"));
+_animActionsClasses = _animActionsClasses apply { configName _x };
+_animActionsClasses = _animActionsClasses select {
+    private _class = _x;
+    (_animActionsClasses findIf {(_class != _x) && {_class isKindOf _x}}) == -1  // filter classes that already have a parent in the list
+};
+uiNamespace setVariable [QGVAR(animActionsClasses), compileFinal (_animActionsClasses createHashMapFromArray [])];
diff --git a/addons/interaction/functions/fnc_canJoinGroup.sqf b/addons/interaction/functions/fnc_canJoinGroup.sqf
index facc3376ee..ec2feb8240 100644
--- a/addons/interaction/functions/fnc_canJoinGroup.sqf
+++ b/addons/interaction/functions/fnc_canJoinGroup.sqf
@@ -18,7 +18,6 @@
 
 params ["_unit", "_target"];
 
-alive _target
-&& {!(_target getVariable ["ACE_isUnconscious", false])}
+_target call EFUNC(common,isAwake)
 && {side group _unit == side group _target}
 && {group _unit != group _target} // return
diff --git a/addons/interaction/functions/fnc_canJoinTeam.sqf b/addons/interaction/functions/fnc_canJoinTeam.sqf
index 09d0281dca..e0e3684ce9 100644
--- a/addons/interaction/functions/fnc_canJoinTeam.sqf
+++ b/addons/interaction/functions/fnc_canJoinTeam.sqf
@@ -18,7 +18,6 @@
 
 params ["_unit", "_target"];
 
-alive _target
-&& {!(_target getVariable ["ACE_isUnconscious", false])}
+_target call EFUNC(common,isAwake)
 && {!([_target] call EFUNC(common,isPlayer))}
 && {_target in units group _unit}
diff --git a/addons/interaction/functions/fnc_canPassMagazine.sqf b/addons/interaction/functions/fnc_canPassMagazine.sqf
index 9d0bed083d..97478bffa7 100644
--- a/addons/interaction/functions/fnc_canPassMagazine.sqf
+++ b/addons/interaction/functions/fnc_canPassMagazine.sqf
@@ -19,7 +19,7 @@
 params ["_player", "_target", "_weapon"];
 
 if (!GVAR(enableMagazinePassing)) exitWith {false};
-if (_weapon isEqualTo "") exitWith {false};
+if (_weapon isEqualTo "" || {!(_target call EFUNC(common,isAwake))}) exitWith {false};
 if (((vehicle _target) != _target) && {(vehicle _target) != (vehicle _player)}) exitWith {false};
 
 private _compatibleMags = [_weapon] call CBA_fnc_compatibleMagazines;
diff --git a/addons/interaction/functions/fnc_canPullOutBody.sqf b/addons/interaction/functions/fnc_canPullOutBody.sqf
index 167d09ecdb..2676bfc203 100644
--- a/addons/interaction/functions/fnc_canPullOutBody.sqf
+++ b/addons/interaction/functions/fnc_canPullOutBody.sqf
@@ -19,7 +19,7 @@
 params ["_body", "_unit"];
 
 // Defer to ACE Medical's unload patient if present
-if (["ace_medical"] call EFUNC(common,isModLoaded)) exitWith {false};
+if (GETEGVAR(medical,enabled,false)) exitWith {false};
 
 private _vehicle = objectParent _body;
 
diff --git a/addons/interaction/functions/fnc_canPush.sqf b/addons/interaction/functions/fnc_canPush.sqf
index 28197d12cd..ff339d5952 100644
--- a/addons/interaction/functions/fnc_canPush.sqf
+++ b/addons/interaction/functions/fnc_canPush.sqf
@@ -10,7 +10,7 @@
  * Can Push <BOOL>
  *
  * Example:
- * [target] call ace_interaction_fnc_canPush
+ * cursorObject call ace_interaction_fnc_canPush
  *
  * Public: No
  */
@@ -19,4 +19,5 @@ params ["_target"];
 
 alive _target &&
 {getMass _target <= 2600 || getNumber (configOf _target >> QGVAR(canPush)) == 1} &&
-{vectorMagnitude velocity _target < 3}
+{vectorMagnitude velocity _target < 3} &&
+{isNull isVehicleCargo _target} // Check if vehicle is loaded as ViV cargo
diff --git a/addons/interaction/functions/fnc_canTapShoulder.sqf b/addons/interaction/functions/fnc_canTapShoulder.sqf
index 049c178152..51f271fb4c 100644
--- a/addons/interaction/functions/fnc_canTapShoulder.sqf
+++ b/addons/interaction/functions/fnc_canTapShoulder.sqf
@@ -19,6 +19,5 @@
 params ["_unit", "_target"];
 
 _target isKindOf "CAManBase" &&
-{alive _target} &&
-{_unit distance _target < 4} &&
-{!(_target getVariable ["ACE_isUnconscious", false])} // return
+{_target call EFUNC(common,isAwake)} &&
+{_unit distance _target < 4} // return
diff --git a/addons/interaction/functions/fnc_getWeaponAttachmentsActions.sqf b/addons/interaction/functions/fnc_getWeaponAttachmentsActions.sqf
index c771589904..e91a027068 100644
--- a/addons/interaction/functions/fnc_getWeaponAttachmentsActions.sqf
+++ b/addons/interaction/functions/fnc_getWeaponAttachmentsActions.sqf
@@ -1,6 +1,6 @@
 #include "..\script_component.hpp"
 /*
- * Author: mharis001, Dystopian
+ * Author: mharis001, Dystopian, PabstMirror, johnb43
  * Returns children actions for weapon attachment switching.
  *
  * Arguments:
@@ -21,48 +21,115 @@ params ["_unit"];
     params ["_unit"];
 
     private _currentWeapon = currentWeapon _unit;
-    if (_currentWeapon isEqualTo "") exitWith {[]};
-    private _weaponItems = _unit weaponAccessories _currentWeapon;
+
+    if (_currentWeapon == "") exitWith {[]};
+
     private _cfgWeapons = configFile >> "CfgWeapons";
-    private _actions = [];
+    private _weaponItems = _unit weaponAccessories _currentWeapon;
 
-    // "attach" actions
-    private _items = _unit call EFUNC(common,uniqueItems);
-    private _compatibleItems = _currentWeapon call CBA_fnc_compatibleItems;
-    {
+    // Get current weapon attachments, as well as compatible attachments in inventory
+    private _allAttachments = (+_weaponItems) - [""];
+    _allAttachments append ((_unit call EFUNC(common,uniqueItems)) arrayIntersect (compatibleItems _currentWeapon));
+
+    (_allAttachments arrayIntersect _allAttachments) apply {
         private _config = _cfgWeapons >> _x;
-        private _name = format [LLSTRING(weaponAttachmentsAttach), getText (_config >> "displayName")];
-        private _picture = getText (_config >> "picture");
-        private _type = getNumber (_config >> "itemInfo" >> "type");
-        private _oldAttachment = _weaponItems select ([TYPE_MUZZLE, TYPE_FLASHLIGHT, TYPE_OPTICS, TYPE_BIPOD] find _type);
-
-        private _action = [
-            _x, _name, _picture,
-            LINKFUNC(switchWeaponAttachment),
-            {true},
-            {},
-            [_currentWeapon, _x, _oldAttachment]
-        ] call EFUNC(interact_menu,createAction);
-        _actions pushBack [_action, [], _unit];
-    } forEach ((_items arrayIntersect _compatibleItems) - _weaponItems);
-
-    // "detach" actions
-    {
-        if (_x isEqualTo "") then {continue};
-
-        private _config = _cfgWeapons >> _x;
-        private _name = format [LLSTRING(weaponAttachmentsDetach), getText (_config >> "displayName")];
+        private _name = getText (_config >> "displayName");
         private _picture = getText (_config >> "picture");
 
-        private _action = [
-            _x, _name, _picture,
-            LINKFUNC(switchWeaponAttachment),
-            {true},
-            {},
-            [_currentWeapon, "", _x]
-        ] call EFUNC(interact_menu,createAction);
-        _actions pushBack [_action, [], _unit];
-    } forEach _weaponItems;
+        [
+            [
+                _x,
+                _name,
+                _picture,
+                {},
+                {true},
+                {
+                    params ["", "_unit", "_args"];
+                    _args params ["_attachment", "_name", "_picture", "_weaponItems", "_currentWeapon"];
 
-    _actions
+                    private _cfgWeapons = configFile >> "CfgWeapons";
+                    private _attachmentNotOnGun = !(_attachment in _weaponItems);
+                    private _actions = [];
+
+                    // "attach" action
+                    if (_attachmentNotOnGun && {[_unit, _attachment] call EFUNC(common,hasItem)}) then {
+                        private _type = getNumber (_cfgWeapons >> _attachment >> "itemInfo" >> "type");
+                        private _currentAttachment = _weaponItems select ([TYPE_MUZZLE, TYPE_FLASHLIGHT, TYPE_OPTICS, TYPE_BIPOD] find _type);
+
+                        _actions pushBack [
+                            [
+                                QGVAR(attach_) + _attachment,
+                                LLSTRING(weaponAttachmentsAttach),
+                                _picture,
+                                LINKFUNC(switchWeaponAttachment),
+                                {true},
+                                {},
+                                [_currentWeapon, _attachment, _currentAttachment]
+                            ] call EFUNC(interact_menu,createAction),
+                            [],
+                            _unit
+                        ];
+                    };
+
+                    // Don't show interaction with attachments that aren't on the current weapon
+                    if (_attachmentNotOnGun) exitWith {_actions};
+
+                    // "detach" action
+                    _actions pushBack [
+                        [
+                            QGVAR(detach_) + _attachment,
+                            LLSTRING(weaponAttachmentsDetach),
+                            _picture,
+                            LINKFUNC(switchWeaponAttachment),
+                            {true},
+                            {},
+                            [_currentWeapon, "", _attachment]
+                        ] call EFUNC(interact_menu,createAction),
+                        [],
+                        _unit
+                    ];
+
+                    private _CBA_PIPItems = configFile >> "CBA_PIPItems";
+
+                    // "switch" action
+                    {
+                        // Ignore 2D scopes when using a PIP scope (e.g. CUP uses this)
+                        if (getText (_CBA_PIPItems >> _x) == _attachment) then {
+                            continue;
+                        };
+
+                        private _config = _cfgWeapons >> _x;
+                        private _modeName = getText (_config >> "MRT_SwitchItemHintText");
+
+                        if (_modeName == "") then {
+                            _modeName = getText (_config >> "displayName");
+                        };
+
+                        _actions pushBack [
+                            [
+                                QGVAR(switch_) + _x,
+                                format ["%1: %2", localize "str_sensortype_switch", _modeName],
+                                getText (_config >> "picture"),
+                                {
+                                    params ["", "_unit", "_actionParams"];
+                                    _actionParams params ["_weapon", "_newAttachment", "_oldAttachment"];
+                                    [_unit, _weapon, _oldAttachment, _newAttachment] call EFUNC(common,switchAttachmentMode);
+                                },
+                                {true},
+                                {},
+                                [_currentWeapon, _x, _attachment]
+                            ] call EFUNC(interact_menu,createAction),
+                            [],
+                            _unit
+                        ];
+                    } forEach ((_attachment call CBA_fnc_switchableAttachments) - [_attachment]); // Don't allow switching to current mode
+
+                    _actions
+                },
+                [_x, _name, _picture, _weaponItems, _currentWeapon]
+            ] call EFUNC(interact_menu,createAction),
+            [],
+            _unit
+        ]
+    } // return
 }, _unit, QGVAR(weaponAttachmentsActions), 5, QGVAR(clearWeaponAttachmentsActionsCache)] call EFUNC(common,cachedCall);
diff --git a/addons/interaction/functions/fnc_initAnimActions.sqf b/addons/interaction/functions/fnc_initAnimActions.sqf
new file mode 100644
index 0000000000..673946a2e1
--- /dev/null
+++ b/addons/interaction/functions/fnc_initAnimActions.sqf
@@ -0,0 +1,194 @@
+#include "..\script_component.hpp"
+/*
+ * Author: Dystopian
+ * Initializes object interactions based on animations.
+ *
+ * Arguments:
+ * 0: Target <OBJECT>
+ *
+ * Return Value:
+ * None
+ *
+ * Example:
+ * cursorObject call ace_interaction_fnc_initAnimActions
+ *
+ * Public: No
+ */
+
+params ["_object"];
+
+private _class = typeOf _object;
+
+if (_class in GVAR(initializedAnimClasses)) exitWith {};
+
+GVAR(initializedAnimClasses) pushBack _class;
+
+private _statement = {
+    params ["_target", "_player", "_params"];
+    _params params ["_anim", "_phase", "_duration", "_text"];
+    TRACE_5("statement",_target,_player,_anim,_phase,_duration);
+
+    [
+        _duration,
+        [_target, _player, _anim, _phase],
+        {
+            (_this select 0) params ["_target", "_player", "_anim", "_phase"];
+
+            private _items = _target getVariable [
+                format [QGVAR(animsItems_%1), _anim],
+                getArray (configOf _target >> QGVAR(anims) >> _anim >> "items")
+            ];
+
+            // If 1 object was spawned in, consider it a success
+            private _success = false;
+
+            if (_items isNotEqualTo []) then {
+                if (_items isEqualType "") then {
+                    _items = [_items];
+                };
+
+                private _weaponHolder = objNull;
+
+                {
+                    private _type = (_x call EFUNC(common,getItemType)) select 0;
+
+                    if (_type == "") then {
+                        private _emptyPosAGL = [];
+
+                        // This covers testing vehicle stability and finding a safe position
+                        for "_i" from 1 to 3 do {
+                            _emptyPosAGL = [_target, _x, _player] call EFUNC(common,findUnloadPosition);
+
+                            if (_emptyPosAGL isNotEqualTo []) exitWith {};
+                        };
+
+                        // If still no valid position, try the next item
+                        if (_emptyPosAGL isEqualTo []) then {
+                            [LELSTRING(common,NoRoomToUnload)] call EFUNC(common,displayTextStructured);
+
+                            continue;
+                        };
+
+                        private _object = createVehicle [_x, _emptyPosAGL, [], 0, "CAN_COLLIDE"];
+
+                        if (!isNull _object) then {
+                            // Prevent items from taking damage when unloaded
+                            [_object, "blockDamage", QUOTE(ADDON), true] call EFUNC(common,statusEffect_set);
+                            [EFUNC(common,statusEffect_set), [_object, "blockDamage", QUOTE(ADDON), false], 2] call CBA_fnc_waitAndExecute;
+
+                            _success = true;
+                        } else {
+                            WARNING_1("Failed to create object of type '%1'",_x);
+                        };
+
+                        continue;
+                    };
+
+                    // Functions/code below are guaranteed to spawn in objects
+                    _success = true;
+
+                    // getItemType considers backpacks as weapons, so handle them first
+                    if (getNumber (configFile >> "CfgVehicles" >> _x >> "isBackpack") == 1) then {
+                        if (backpack _player == "") then {
+                            _player addBackpackGlobal _x;
+                        } else {
+                            if (isNull _weaponHolder) then {
+                                _weaponHolder = nearestObject [_player, "WeaponHolder"];
+
+                                if (isNull _weaponHolder || {_player distance _weaponHolder > 2}) then {
+                                    _weaponHolder = createVehicle ["GroundWeaponHolder", [0, 0, 0], [], 0, "NONE"];
+                                    _weaponHolder setPosASL getPosASL _player;
+                                };
+                            };
+
+                            _weaponHolder addBackpackCargoGlobal [_x, 1];
+                        };
+
+                        continue;
+                    };
+
+                    switch (_type) do {
+                        case "weapon": {
+                            [_player, _x, true] call CBA_fnc_addWeapon;
+                        };
+                        case "item": {
+                            [_player, _x, true] call CBA_fnc_addItem;
+                        };
+                        case "magazine": {
+                            [_player, _x, -1, true] call CBA_fnc_addMagazine;
+                        };
+                    };
+                } forEach _items;
+            };
+
+            if (!_success) exitWith {};
+
+            _target animate [_anim, _phase, true];
+        },
+        {},
+        _text,
+        {
+            (_this select 0) params ["_target", "", "_anim", "_phase"];
+
+            _target animationPhase _anim != _phase
+        },
+        ["isNotSwimming"]
+    ] call EFUNC(common,progressBar);
+};
+
+private _condition = {
+    params ["_target", "_player", "_params"];
+    _params params ["_anim", "_phase"];
+
+    _target animationPhase _anim != _phase
+    && {[_player, _target, ["isNotSwimming"]] call EFUNC(common,canInteractWith)}
+};
+
+private _config = configOf _object;
+
+{
+    private _animConfig = _x;
+    private _anim = configName _animConfig;
+
+    private _animationSourcesConfig = _config >> "AnimationSources" >> _anim;
+
+    if !(
+        isClass _animationSourcesConfig // anim exist
+        && {0 != [_animationSourcesConfig >> "scope", "NUMBER", 1] call CBA_fnc_getConfigEntry} // anim not hidden
+        && {isNumber (_animationSourcesConfig >> "initPhase")} // anim correct (some CUP anims are inherited and cleared)
+        && {0 != [_animConfig >> "enabled", "NUMBER", 1] call CBA_fnc_getConfigEntry} // anim enabled
+    ) then {continue};
+
+    private _positions = [];
+    {
+        if (_x isEqualType "") then {
+            _positions pushBack compile _x;
+        } else {
+            _positions pushBack _x;
+        };
+    } forEach getArray (_animConfig >> "positions");
+
+    _positions append getArray (_animConfig >> "selections");
+
+    if (_positions isEqualTo []) then {
+        ERROR_2("No action position for _class %1 anim %2",_class,_anim);
+        continue;
+    };
+
+    private _phase = [_animConfig >> "phase", "NUMBER", 1] call CBA_fnc_getConfigEntry;
+    private _name = [_animConfig >> "name", "TEXT", localize "str_a3_cfgactions_unmountitem0"] call CBA_fnc_getConfigEntry;
+    private _icon = [_animConfig >> "icon", "TEXT", "\A3\ui_f\data\igui\cfg\actions\take_ca.paa"] call CBA_fnc_getConfigEntry;
+    private _duration = [_animConfig >> "duration", "NUMBER", 10] call CBA_fnc_getConfigEntry;
+    private _text = getText (_animConfig >> "text");
+
+    {
+        private _action = [
+            format [QGVAR(anim_%1_%2), _anim, _forEachIndex],
+            _name, _icon, _statement, _condition, {},
+            [_anim, _phase, _duration, _text],
+            _x
+        ] call EFUNC(interact_menu,createAction);
+        [_class, 0, [], _action] call EFUNC(interact_menu,addActionToClass);
+        TRACE_3("add anim",_class,_anim,_x);
+    } forEach _positions;
+} forEach configProperties [_config >> QGVAR(anims), "isClass _x"];
diff --git a/addons/interaction/functions/fnc_switchWeaponAttachment.sqf b/addons/interaction/functions/fnc_switchWeaponAttachment.sqf
index aaefb3315e..6fede34962 100644
--- a/addons/interaction/functions/fnc_switchWeaponAttachment.sqf
+++ b/addons/interaction/functions/fnc_switchWeaponAttachment.sqf
@@ -4,9 +4,12 @@
  * Switches weapon attachment.
  *
  * Arguments:
- * 0: Target <OBJECT>
- * 1: Player (not used) <OBJECT>
+ * 0: Target (not used) <OBJECT>
+ * 1: Player <OBJECT>
  * 2: Action params <ARRAY>
+ * - 0: Weapon <STRING>
+ * - 1: New Attachment <STRING>
+ * - 2: Old Attachment <STRING>
  *
  * Return Value:
  * None
@@ -17,11 +20,13 @@
  * Public: No
  */
 
-params ["_unit", "", "_actionParams"];
+params ["", "_unit", "_actionParams"];
 _actionParams params ["_weapon", "_newAttachment", "_oldAttachment"];
 TRACE_3("Switching attachment",_weapon,_newAttachment,_oldAttachment);
 
-[_unit, "Gear"] call EFUNC(common,doGesture);
+private _currWeaponType = [_unit, _weapon] call EFUNC(common,getWeaponIndex);
+
+if (_currWeaponType == -1) exitWith {};
 
 private _addNew = _newAttachment isNotEqualTo "";
 private _removeOld = _oldAttachment isNotEqualTo "";
@@ -38,22 +43,33 @@ if (_removeOld && {!([_unit, _oldAttachment] call CBA_fnc_canAddItem)}) exitWith
     };
 };
 
+[_unit, "Gear"] call EFUNC(common,doGesture);
+
 if (_removeOld) then {
     [{
-        params ["_unit", "_weapon", "_oldAttachment"];
-        switch (_weapon) do {
-            case (primaryWeapon _unit): {_unit removePrimaryWeaponItem _oldAttachment;};
-            case (handgunWeapon _unit): {_unit removeHandgunItem _oldAttachment;};
-            default {_unit removeSecondaryWeaponItem _oldAttachment;};
+        params ["_unit", "_currWeaponType", "_oldAttachment"];
+
+        switch (_currWeaponType) do {
+            case 0: {_unit removePrimaryWeaponItem _oldAttachment};
+            case 1: {_unit removeSecondaryWeaponItem _oldAttachment};
+            case 2: {_unit removeHandgunItem _oldAttachment};
+            default {};
         };
+
         _unit addItem _oldAttachment;
-    }, [_unit, _weapon, _oldAttachment], 0.3] call CBA_fnc_waitAndExecute;
+    }, [_unit, _currWeaponType, _oldAttachment], 0.3] call CBA_fnc_waitAndExecute;
 };
 
 if (!_addNew) exitWith {};
 
 [{
     params ["_unit", "_weapon", "_newAttachment"];
+
     _unit addWeaponItem [_weapon, _newAttachment];
+
+    if (_unit != ACE_player) exitWith {};
+
     [[getText (configFile >> "CfgWeapons" >> _newAttachment >> "picture"), 4], true] call CBA_fnc_notify;
+
+    playSound "click";
 }, [_unit, _weapon, _newAttachment], 1] call CBA_fnc_waitAndExecute;
diff --git a/addons/interaction/initSettings.inc.sqf b/addons/interaction/initSettings.inc.sqf
index 2cefb162a7..4adc5a6daf 100644
--- a/addons/interaction/initSettings.inc.sqf
+++ b/addons/interaction/initSettings.inc.sqf
@@ -38,6 +38,16 @@
     true
 ] call CBA_fnc_addSetting;
 
+[
+    QGVAR(enableAnimActions), "CHECKBOX",
+    LSTRING(SettingAnimActionsName),
+    format ["ACE %1", LLSTRING(DisplayName)],
+    true,
+    true,
+    {[QGVAR(enableAnimActions), _this] call EFUNC(common,cbaSettings_settingChanged)},
+    true // Needs mission restart
+] call CBA_fnc_addSetting;
+
 [
     QGVAR(interactWithTerrainObjects), "CHECKBOX",
     ["str_a3_modules_moduleomquest_defend_f_attributes_useterrainobject0", LSTRING(interactWithTerrainObjects_Description)],
diff --git a/addons/interaction/stringtable.xml b/addons/interaction/stringtable.xml
index 41861dcb31..3d1daf9c3c 100644
--- a/addons/interaction/stringtable.xml
+++ b/addons/interaction/stringtable.xml
@@ -164,7 +164,7 @@
             <Hungarian>Cselekvő menü</Hungarian>
             <Portuguese>Menu de Interação</Portuguese>
             <Italian>Menù Interazioni</Italian>
-            <Japanese>インタラクションメニュー</Japanese>
+            <Japanese>インタラクション メニュー</Japanese>
             <Korean>상호작용 메뉴</Korean>
             <Chinesesimp>互动菜单</Chinesesimp>
             <Chinese>互動選單</Chinese>
@@ -181,7 +181,7 @@
             <Hungarian>Cselekvő menü (saját) </Hungarian>
             <Portuguese>Menu de Interação (Individual)</Portuguese>
             <Italian>Menù Interazioni (su se stesso)</Italian>
-            <Japanese>インタラクションメニュー (セルフ)</Japanese>
+            <Japanese>インタラクション メニュー (セルフ)</Japanese>
             <Korean>상호작용 메뉴(자신)</Korean>
             <Chinesesimp>互动菜单（自我）</Chinesesimp>
             <Chinese>互動選單 (自我)</Chinese>
@@ -458,7 +458,7 @@
             <Russian>Вас похлопали по ПРАВОМУ плечу</Russian>
             <Portuguese>Você foi tocado no ombro</Portuguese>
             <Italian>Ti è stato dato un colpetto sulla spalla destra</Italian>
-            <Japanese>右肩を叩かれました</Japanese>
+            <Japanese>右肩を叩かれた</Japanese>
             <Korean>누군가 오른쪽 어깨를 쳤다</Korean>
             <Chinesesimp>你的右肩膀被轻拍了一下</Chinesesimp>
             <Chinese>你的右肩膀被輕拍了一下</Chinese>
@@ -475,7 +475,7 @@
             <Russian>Вас похлопали по ЛЕВОМУ плечу</Russian>
             <Portuguese>Você foi tocado no ombro.</Portuguese>
             <Italian>Ti è stato dato un colpetto sulla spalla sinistra</Italian>
-            <Japanese>左肩を叩かれました</Japanese>
+            <Japanese>左肩を叩かれた</Japanese>
             <Korean>누군가 왼쪽 어깨를 쳤다</Korean>
             <Chinesesimp>你的左肩膀被轻拍了一下</Chinesesimp>
             <Chinese>你的左肩膀被輕拍了一下</Chinese>
@@ -848,7 +848,7 @@
             <Portuguese>Perdão</Portuguese>
             <Italian>Perdona</Italian>
             <Hungarian>Megbocsátás</Hungarian>
-            <Japanese>許す</Japanese>
+            <Japanese>赦免する</Japanese>
             <Korean>허용</Korean>
             <Chinesesimp>原谅</Chinesesimp>
             <Chinese>原諒</Chinese>
@@ -1247,30 +1247,30 @@
             <Korean>전면유리 부수기</Korean>
         </Key>
         <Key ID="STR_ACE_Interaction_weaponAttachmentsAttach">
-            <English>Attach %1</English>
-            <Russian>Установить %1</Russian>
-            <Japanese>%1 を取り付け</Japanese>
-            <Spanish>Acoplar %1</Spanish>
-            <French>Fixer %1</French>
-            <Polish>Przyczep %1</Polish>
-            <German>Befestige %1</German>
-            <Italian>Attacca %1</Italian>
-            <Chinesesimp>附加 %1</Chinesesimp>
-            <Korean>%1 붙이기</Korean>
-            <Portuguese>Fixar %1</Portuguese>
+            <English>Attach</English>
+            <Russian>Установить</Russian>
+            <Japanese>を取り付け</Japanese>
+            <Spanish>Acoplar</Spanish>
+            <French>Fixer</French>
+            <Polish>Przyczep</Polish>
+            <German>Befestige</German>
+            <Italian>Attacca</Italian>
+            <Chinesesimp>附加</Chinesesimp>
+            <Korean>붙이기</Korean>
+            <Portuguese>Fixar</Portuguese>
         </Key>
         <Key ID="STR_ACE_Interaction_weaponAttachmentsDetach">
-            <English>Detach %1</English>
-            <Russian>Снять %1</Russian>
-            <Japanese>%1 を外す</Japanese>
-            <Spanish>Desacoplar %1</Spanish>
-            <French>Retirer %1</French>
-            <Polish>Odczep %1</Polish>
-            <German>Löse %1</German>
-            <Italian>Stacca %1</Italian>
-            <Chinesesimp>拆卸 %1</Chinesesimp>
-            <Korean>%1 떼내기</Korean>
-            <Portuguese>Desfixar %1</Portuguese>
+            <English>Detach</English>
+            <Russian>Снять</Russian>
+            <Japanese>を外す</Japanese>
+            <Spanish>Desacoplar</Spanish>
+            <French>Retirer</French>
+            <Polish>Odczep</Polish>
+            <German>Löse</German>
+            <Italian>Stacca</Italian>
+            <Chinesesimp>拆卸</Chinesesimp>
+            <Korean>떼내기</Korean>
+            <Portuguese>Desfixar</Portuguese>
         </Key>
         <Key ID="STR_ACE_Interaction_weaponAttachments_Description">
             <English>Enables attach/detach weapon attachment actions for current weapon.</English>
@@ -1324,5 +1324,9 @@
             <Spanish>Advertencia: puede provocar que algunos objetos choquen con otros.</Spanish>
             <Portuguese>Aviso: pode causar que alguns objetos colidam com outros.</Portuguese>
         </Key>
+        <Key ID="STR_ACE_Interaction_SettingAnimActionsName">
+            <English>Interaction with animations</English>
+            <Russian>Взаимодействие с анимациями</Russian>
+        </Key>
     </Package>
 </Project>
diff --git a/addons/killtracker/XEH_postInit.sqf b/addons/killtracker/XEH_postInit.sqf
index c5adc26692..35050d1dc3 100644
--- a/addons/killtracker/XEH_postInit.sqf
+++ b/addons/killtracker/XEH_postInit.sqf
@@ -19,7 +19,8 @@
 if ((getText (missionconfigfile >> "CfgDebriefingSections" >> QUOTE(XADDON) >> "variable")) != QXGVAR(outputText)) exitWith {
     TRACE_1("no mission debriefing config",_this);
 };
-if (!(["ace_medical"] call EFUNC(common,isModLoaded))) exitWith {
+
+if !(GETEGVAR(medical,enabled,false)) exitWith {
     WARNING("No ACE-Medical");
     XGVAR(outputText) = "No ACE-Medical";
 };
@@ -64,7 +65,7 @@ GVAR(killCount) = 0;
     private _killInfo = [];
 
     if (!isNull _killer) then {
-        if (!(_killer isKindof "CAManBase")) then { // If killer is a vehicle log the vehicle type
+        if !(_killer isKindof "CAManBase") then { // If killer is a vehicle log the vehicle type
             _killInfo pushBack format [LLSTRING(Vehicle), getText ((configOf _killer) >> "displayName")];
         };
         if (isNull _instigator) then {
@@ -73,11 +74,11 @@ GVAR(killCount) = 0;
         };
     };
     private _unitIsPlayer = hasInterface && {_unit in [player, ace_player]}; // isPlayer check will fail at this point
-    private _killerIsPlayer = (!isNull _instigator) && {_unit != _instigator} && {[_instigator] call EFUNC(common,isPlayer)};
-    TRACE_2("",_unitIsPlayer,_killerIsPlayer);
+    private _instigatorIsPlayer = (!isNull _instigator) && {_unit != _instigator} && {[_instigator] call EFUNC(common,isPlayer)};
+    TRACE_2("",_unitIsPlayer,_instigatorIsPlayer);
 
     // Don't do anything if neither are players
-    if (!(_unitIsPlayer || _killerIsPlayer)) exitWith {};
+    if !(_unitIsPlayer || _instigatorIsPlayer) exitWith {};
 
     // Log firendly fire
     private _fnc_getSideFromConfig = {
@@ -89,7 +90,7 @@ GVAR(killCount) = 0;
             default {civilian};
         };
     };
-    if ((!isNull _instigator) && {_unit != _instigator} && {_instigator isKindOf "CAManBase"}) then {
+    if (!isNull _instigator && {_unit != _instigator} && {_instigator isKindOf "CAManBase"}) then {
         // Because of unconscious group switching/captives it's probably best to just use unit's config side
         private _unitSide = [_unit] call _fnc_getSideFromConfig;
         private _killerSide = [_instigator] call _fnc_getSideFromConfig;
@@ -110,23 +111,23 @@ GVAR(killCount) = 0;
 
     // If unit was player then send event to self
     if (_unitIsPlayer) then {
-        private _killerName = "Self?";
-        if ((!isNull _killer) && {_unit != _killer}) then {
-            if (_killerIsPlayer) then {
-                _killerName = [_killer, true, false] call EFUNC(common,getName);
+        private _instigatorName = "Self?";
+        if ((!isNull _instigator) && {_unit != _instigator}) then {
+            if (_instigatorIsPlayer) then {
+                _instigatorName = [_instigator, true, false] call EFUNC(common,getName);
             } else {
-                _killerName = _killer getVariable [QGVAR(aiName), ""]; // allow setting a custom AI name (e.g. VIP Target)
-                if (_killerName == "") then {
-                    _killerName = format ["*AI* - %1", getText ((configOf _killer) >> "displayName")];
+                _instigatorName = _instigator getVariable [QGVAR(aiName), ""]; // allow setting a custom AI name (e.g. VIP Target)
+                if (_instigatorName == "") then {
+                    _instigatorName = format ["*AI* - %1", getText ((configOf _instigator) >> "displayName")];
                 };
             };
         };
-        TRACE_3("send death event",_unit,_killerName,_killInfo);
-        [QGVAR(death), [_killerName, _killInfo]] call CBA_fnc_localEvent;
+        TRACE_3("send death event",_unit,_instigatorName,_killInfo);
+        [QGVAR(death), [_instigatorName, _killInfo]] call CBA_fnc_localEvent;
     };
 
-    // If killer was player then send event to killer
-    if (_killerIsPlayer) then {
+    // If shooter was player then send event to them (and optionally the whole crew)
+    if (_instigatorIsPlayer && {_unitIsPlayer || GVAR(trackAI)}) then {
         private _unitName = "";
         if (_unitIsPlayer) then {
             _unitName = [_unit, true, false] call EFUNC(common,getName); // should be same as profileName
@@ -136,9 +137,18 @@ GVAR(killCount) = 0;
                 _unitName = format ["*AI* - %1", getText ((configOf _unit) >> "displayName")];
             };
         };
-        if (_unitIsPlayer || GVAR(trackAI)) then {
-            TRACE_3("send kill event",_killer,_unitName,_killInfo);
-            [QGVAR(kill), [_unitName, _killInfo], _killer] call CBA_fnc_targetEvent;
+        TRACE_3("send kill event",_instigator,_unitName,_killInfo);
+        [QGVAR(kill), [_unitName, _killInfo], _instigator] call CBA_fnc_targetEvent;
+
+        if (GVAR(showCrewKills) && {!(_killer isKindOf "CAManBase")}) then {
+            private _crew = [driver _killer, gunner _killer, commander _killer] - [_instigator];
+            _crew = _crew select {[_x] call EFUNC(common,isPlayer)};
+            _crew = _crew arrayIntersect _crew;
+            TRACE_1("showCrewKills",_crew);
+            _killInfo = format [" - [<t color='#99ff99'>%1</t>, %2", localize "str_a3_rscdisplaygarage_tab_crew", _killInfo select [4]];
+            {
+                [QGVAR(kill), [_unitName, _killInfo], _x] call CBA_fnc_targetEvent;
+            } forEach _crew;
         };
     };
 }] call CBA_fnc_addEventHandler;
diff --git a/addons/killtracker/initSettings.inc.sqf b/addons/killtracker/initSettings.inc.sqf
index ebe1e55ccb..9e4775bd7f 100644
--- a/addons/killtracker/initSettings.inc.sqf
+++ b/addons/killtracker/initSettings.inc.sqf
@@ -6,3 +6,12 @@
     true,
     1
 ] call CBA_fnc_addSetting;
+
+[
+    QGVAR(showCrewKills),
+    "CHECKBOX",
+    [LSTRING(showCrewKills_DisplayName), LSTRING(showCrewKills_Description)],
+    LSTRING(Category),
+    false,
+    1
+] call CBA_fnc_addSetting;
diff --git a/addons/killtracker/stringtable.xml b/addons/killtracker/stringtable.xml
index 63196a442e..64b9ee764d 100644
--- a/addons/killtracker/stringtable.xml
+++ b/addons/killtracker/stringtable.xml
@@ -6,15 +6,16 @@
             <Italian>ACE Tracciatore di Uccisioni</Italian>
             <Czech>ACE Kill Tracker</Czech>
             <Russian>ACE Отслеживание убийств</Russian>
-            <Japanese>ACE キルトラッカー</Japanese>
+            <Japanese>ACE キル追跡</Japanese>
             <Korean>ACE 킬트래커</Korean>
             <French>ACE Suivi des morts</French>
+            <German>ACE Abschüsse</German>
             <Spanish>ACE Contador de Muertes</Spanish>
         </Key>
         <Key ID="STR_ACE_KillTracker_Title">
             <English>ACE Killed Events</English>
             <Japanese>ACE キルイベント</Japanese>
-            <German>ACE Abgeschossene Ereignisse</German>
+            <German>ACE Abschusszähler</German>
             <Italian>ACE Eventi di Morte</Italian>
             <Polish>ACE Licznik Zabójstw</Polish>
             <Chinesesimp>ACE 击杀事件</Chinesesimp>
@@ -29,7 +30,7 @@
             <Russian>Всего убийств:</Russian>
             <Polish>Liczba zabójstw:</Polish>
             <Turkish>Toplam Öldürme:</Turkish>
-            <Japanese>総キル:</Japanese>
+            <Japanese>合計キル数:</Japanese>
             <German>Gesammte Abschüsse:</German>
             <Italian>Uccisioni Totali:</Italian>
             <Chinesesimp>总击杀数：</Chinesesimp>
@@ -43,7 +44,7 @@
             <Russian>Убил: %1 %2</Russian>
             <Polish>Zabójstwo: %1 %2</Polish>
             <Turkish>Öldürülen: %1 %2</Turkish>
-            <Japanese>キル: %1 %2</Japanese>
+            <Japanese>殺害: %1 %2</Japanese>
             <German>Abschuss: %1 %2</German>
             <Italian>Uccisione: %1 %2</Italian>
             <Chinesesimp>击杀：%1 %2</Chinesesimp>
@@ -57,7 +58,7 @@
             <Russian>Убийца: %1 %2</Russian>
             <Polish>Zabójca: %1 %2</Polish>
             <Turkish>Öldüren: %1 %2</Turkish>
-            <Japanese>キラー: %1 %2</Japanese>
+            <Japanese>殺害者: %1 %2</Japanese>
             <German>Täter: %1 %2</German>
             <Italian>Uccisore: %1 %2</Italian>
             <Chinesesimp>击杀者：%1 %2</Chinesesimp>
@@ -101,9 +102,10 @@
             <Italian>Traccia IA uccise da giocatori</Italian>
             <Czech>Sledovat AI zabité hráči</Czech>
             <Russian>Отслеживание юнитов ИИ, убитых игроком</Russian>
-            <Japanese>プレイヤーに殺害されたAIユニットを追跡</Japanese>
+            <Japanese>プレイヤーがキルしたAIユニットを追跡</Japanese>
             <Korean>플레이어가 죽인 AI 트래킹</Korean>
             <French>Suivi de l'IA tuée par les joueurs</French>
+            <German>Zähle vom Spieler getöteten KI-Einheiten</German>
             <Spanish>Cuenta las unidades de IA matadas por el jugador</Spanish>
         </Key>
         <Key ID="STR_ACE_KillTracker_TrackAI_Description">
@@ -111,10 +113,27 @@
             <Italian>Determina se IA uccise verranno visualizzate nel tracciatore durante il debriefing della missione.</Italian>
             <Czech>Udává zdali se zabité AI budou ukazovat v kill trackeru v průběhu debriefingu po misi.</Czech>
             <Russian>Определяет, будут ли убитые ИИ отображаться в трекере убийств во время дебрифинга миссии.</Russian>
-            <Japanese>ミッションデブリーフィングのキルトラッカーに殺害されたAIが表示されるかどうかを定義します。</Japanese>
+            <Japanese>キルしたAIをミッション終了デブリーフィング画面に表示させるかどうかを定義します。</Japanese>
             <Korean>사후강평 중 살해된 AI가 킬트래킹에 표시되는지 여부를 정의합니다.</Korean>
             <French>Définit si les IA tuées seront affichées dans le tracker pendant le débriefing de la mission.</French>
+            <German>Legt fest, ob getötete KIs während des Endbildschirms der Mission in den Abschüssen angezeigt werden.</German>
             <Spanish>Define si las IAs matadas se mostrarán en el contador de muertes en el debiefring de la misión.</Spanish>
         </Key>
+        <Key ID="STR_ACE_KillTracker_showCrewKills_DisplayName">
+            <English>Show vehicle kills to other crew members</English>
+            <Russian>Показать уничтоженные машины другим членам экипажа</Russian>
+            <German>Zeige der Fahrzeugbesatzung die Abschüsse des Fahrzeugs</German>
+            <Italian>Mostra uccisioni del veicolo a membri dell'equipaggio</Italian>
+            <Japanese>車両でのキルを乗員全員に表示する</Japanese>
+            <Korean>다른 승무원에게 차량 처치 표시</Korean>
+        </Key>
+        <Key ID="STR_ACE_KillTracker_showCrewKills_Description">
+            <English>Show kills from a vehicle to driver, gunner and commander</English>
+            <Russian>Показать уничтоженную технику водителю, стрелку и командиру</Russian>
+            <German>Zeige Abschüsse des Fahrzeugs dem Fahrer, Richtschützen und Kommandanten an</German>
+            <Italian>Mostra uccisioni del veicolo al pilota, artigliere e comandante</Italian>
+            <Japanese>車両でのキルを操縦手、砲手、車長で共有して表示する</Japanese>
+            <Korean>차량 처치를 운전수, 사수, 지휘관에게 보여줍니다</Korean>
+        </Key>
     </Package>
 </Project>
diff --git a/addons/laser/functions/fnc_addLaserTarget.sqf b/addons/laser/functions/fnc_addLaserTarget.sqf
index 3fc02b2189..f0414fd3ad 100644
--- a/addons/laser/functions/fnc_addLaserTarget.sqf
+++ b/addons/laser/functions/fnc_addLaserTarget.sqf
@@ -20,9 +20,9 @@ params ["_targetObject", "_vehicle"];
 TRACE_2("params",_targetObject,_vehicle);
 
 // Get the designator variables, or use defaults
-private _waveLength = _vehicle getVariable [QEGVAR(laser,waveLength), ACE_DEFAULT_LASER_WAVELENGTH];
-private _laserCode = _vehicle getVariable [QEGVAR(laser,code), ACE_DEFAULT_LASER_CODE];
-private _beamSpread = _vehicle getVariable [QEGVAR(laser,beamSpread), ACE_DEFAULT_LASER_BEAMSPREAD];
+private _waveLength = _vehicle getVariable [QGVAR(waveLength), ACE_DEFAULT_LASER_WAVELENGTH];
+private _laserCode = _vehicle getVariable [QGVAR(code), ACE_DEFAULT_LASER_CODE];
+private _beamSpread = _vehicle getVariable [QGVAR(beamSpread), ACE_DEFAULT_LASER_BEAMSPREAD];
 TRACE_3("codes",_waveLength,_laserCode,_beamSpread);
 
 // Laser method is the method ACE_Laser will use to determine from where to where it should project the designator cone
diff --git a/addons/laser/functions/fnc_laserTargetPFH.sqf b/addons/laser/functions/fnc_laserTargetPFH.sqf
index 0b19b4d1c3..af2098a6f8 100644
--- a/addons/laser/functions/fnc_laserTargetPFH.sqf
+++ b/addons/laser/functions/fnc_laserTargetPFH.sqf
@@ -29,7 +29,7 @@ GVAR(trackedLaserTargets) = GVAR(trackedLaserTargets) select {
         TRACE_1("Laser off:",_laserUuid);
         false
     } else {
-        private _newCode = _owner getVariable [QEGVAR(laser,code), ACE_DEFAULT_LASER_CODE];
+        private _newCode = _owner getVariable [QGVAR(code), ACE_DEFAULT_LASER_CODE];
         if (_laserCode != _newCode) then {
             TRACE_2("code change",_newCode,_laserCode);
             [QGVAR(updateCode), [_laserUuid, _newCode]] call CBA_fnc_globalEvent;
diff --git a/addons/laser/functions/fnc_seekerFindLaserSpot.sqf b/addons/laser/functions/fnc_seekerFindLaserSpot.sqf
index aa3e43d35a..4ceb15d814 100644
--- a/addons/laser/functions/fnc_seekerFindLaserSpot.sqf
+++ b/addons/laser/functions/fnc_seekerFindLaserSpot.sqf
@@ -115,7 +115,7 @@ if (_spots isNotEqualTo []) then {
     while { count(_spots) != count(_excludes) && _c < (count _spots) } do {
         scopeName "mainSearch";
         {
-            if (!(_forEachIndex in _excludes)) then {
+            if !(_forEachIndex in _excludes) then {
                 private _index = _buckets pushBack [_x, [_x]];
                 _excludes pushBack _forEachIndex;
                 _bucketPos = _x select 0;
@@ -124,7 +124,7 @@ if (_spots isNotEqualTo []) then {
             };
         } forEach _spots;
         {
-            if (!(_forEachIndex in _excludes)) then {
+            if !(_forEachIndex in _excludes) then {
                 private _testPos = (_x select 0);
                 if ((_testPos vectorDistanceSqr _bucketPos) <= 100) then {
                     _bucketList pushBack _x;
diff --git a/addons/laser/functions/fnc_showVehicleHud.sqf b/addons/laser/functions/fnc_showVehicleHud.sqf
index 778df61a6c..35120a294d 100644
--- a/addons/laser/functions/fnc_showVehicleHud.sqf
+++ b/addons/laser/functions/fnc_showVehicleHud.sqf
@@ -91,7 +91,7 @@ GVAR(pfID) = [{
     // Do Laser Scan:
     private _ammo = getText (configFile >> "CfgMagazines" >> _vehicle currentMagazineTurret _turretPath >> "ammo");
     private _laserSource = _vehicle modelToWorldWorld (_vehicle selectionPosition _seekerSource);
-    private _laserCode = _vehicle getVariable [QEGVAR(laser,code), ACE_DEFAULT_LASER_CODE];
+    private _laserCode = _vehicle getVariable [QGVAR(code), ACE_DEFAULT_LASER_CODE];
     private _seekerAngle = getNumber (configFile >> "CfgAmmo" >> _ammo >> "ace_missileguidance" >> "seekerAngle");
     private _seekerMaxRange = getNumber (configFile >> "CfgAmmo" >> _ammo >> "ace_missileguidance" >> "seekerMaxRange");
     private _laserResult = [_laserSource, vectorDir _vehicle, _seekerAngle, _seekerMaxRange, [ACE_DEFAULT_LASER_WAVELENGTH,ACE_DEFAULT_LASER_WAVELENGTH], _laserCode, _vehicle] call EFUNC(laser,seekerFindLaserSpot);
diff --git a/addons/laser/functions/fnc_toggleLST.sqf b/addons/laser/functions/fnc_toggleLST.sqf
index 59969d014e..eae4ad68ef 100644
--- a/addons/laser/functions/fnc_toggleLST.sqf
+++ b/addons/laser/functions/fnc_toggleLST.sqf
@@ -39,7 +39,7 @@ if (_enabled) exitWith {};
         [_pfhID] call CBA_fnc_removePerFrameHandler;
     };
 
-    private _laserCode = _vehicle getVariable [QEGVAR(laser,code), ACE_DEFAULT_LASER_CODE];
+    private _laserCode = _vehicle getVariable [QGVAR(code), ACE_DEFAULT_LASER_CODE];
     private _angle = 25;
 
     private _pos = _vehicle modelToWorldVisualWorld [0,0,0];
diff --git a/addons/logistics_uavbattery/functions/fnc_canRefuelUAV.sqf b/addons/logistics_uavbattery/functions/fnc_canRefuelUAV.sqf
index 3e7ce4f15c..925178d642 100644
--- a/addons/logistics_uavbattery/functions/fnc_canRefuelUAV.sqf
+++ b/addons/logistics_uavbattery/functions/fnc_canRefuelUAV.sqf
@@ -18,4 +18,4 @@
 
 params ["_caller", "_target"];
 
-("ACE_UAVBattery" in (_caller call EFUNC(common,uniqueItems))) && {(fuel _target) < 1} && {(speed _target) < 1} && {!(isEngineOn _target)} && {(_target distance _caller) <= 4}
+(alive _target) && {"ACE_UAVBattery" in (_caller call EFUNC(common,uniqueItems))} && {(fuel _target) < 1} && {(speed _target) < 1} && {!(isEngineOn _target)} && {(_target distance _caller) <= 4}
diff --git a/addons/logistics_uavbattery/functions/fnc_refuelUAV.sqf b/addons/logistics_uavbattery/functions/fnc_refuelUAV.sqf
index 8c73052c45..a471e82cbf 100644
--- a/addons/logistics_uavbattery/functions/fnc_refuelUAV.sqf
+++ b/addons/logistics_uavbattery/functions/fnc_refuelUAV.sqf
@@ -17,7 +17,7 @@
  */
 params ["_caller", "_target"];
 
-if (!(_this call FUNC(canRefuelUAV))) exitWith {};
+if !(_this call FUNC(canRefuelUAV)) exitWith {};
 
 private _onFinish = {
     (_this select 0) params ["_caller", "_target"];
diff --git a/addons/magazinerepack/functions/fnc_magazineRepackFinish.sqf b/addons/magazinerepack/functions/fnc_magazineRepackFinish.sqf
index 9383089d28..c2785c5fad 100644
--- a/addons/magazinerepack/functions/fnc_magazineRepackFinish.sqf
+++ b/addons/magazinerepack/functions/fnc_magazineRepackFinish.sqf
@@ -25,7 +25,7 @@ _args params ["_magazineClassname", "_lastAmmoCount"];
 private _fullMagazineCount = getNumber (configFile >> "CfgMagazines" >> _magazineClassname >> "count");
 
 // Don't show anything if player can't interact
-if (!([ACE_player, objNull, ["isNotInside", "isNotSitting", "isNotSwimming"]] call EFUNC(common,canInteractWith))) exitWith {};
+if !([ACE_player, objNull, ["isNotInside", "isNotSitting", "isNotSwimming"]] call EFUNC(common,canInteractWith)) exitWith {};
 
 // Count mags
 private _fullMags = 0;
diff --git a/addons/map/XEH_postInitClient.sqf b/addons/map/XEH_postInitClient.sqf
index ea3ce19464..534b37da8b 100644
--- a/addons/map/XEH_postInitClient.sqf
+++ b/addons/map/XEH_postInitClient.sqf
@@ -8,7 +8,7 @@ LOG(MSG_INIT);
 // Calculate the maximum zoom allowed for this map
 call FUNC(determineZoom);
 
-GVAR(flashlights) = [] call CBA_fnc_createNamespace;
+GVAR(flashlights) = createHashMap;
 
 ["CBA_settingsInitialized", {
     if (isMultiplayer && {GVAR(DefaultChannel) != -1}) then {
diff --git a/addons/map/functions/fnc_isFlashlight.sqf b/addons/map/functions/fnc_isFlashlight.sqf
index e563d74114..ae26b41569 100644
--- a/addons/map/functions/fnc_isFlashlight.sqf
+++ b/addons/map/functions/fnc_isFlashlight.sqf
@@ -17,14 +17,12 @@
 
 params [["_class", "", [""]]];
 
-private _isFlashlight = GVAR(flashlights) getVariable _class;
-
-if (isNil "_isFlashlight") then {
+GVAR(flashlights) getOrDefaultCall [_class, {
     private _items = ([_class] + (_class call CBA_fnc_switchableAttachments));
     private _cfgWeapons = configFile >> "CfgWeapons";
 
     // if this item or any of the switchable items is a flashlight
-    _isFlashlight = _items findIf {
+    _items findIf {
         private _weaponConfig = _cfgWeapons >> _x;
 
         [
@@ -34,10 +32,5 @@ if (isNil "_isFlashlight") then {
             isText (_x >> "ACE_Flashlight_Colour")
             || {!(getArray (_x >> "ambient") in [[], [0,0,0]]) && {getNumber (_x >> "irLight") == 0}}
         } != -1 // return
-    } != -1;
-
-    // cache value
-    GVAR(flashlights) setVariable [_class, _isFlashlight];
-};
-
-_isFlashlight // return
+    } != -1 // return
+}, true] // return
diff --git a/addons/map_gestures/XEH_preInit.sqf b/addons/map_gestures/XEH_preInit.sqf
index e603e5398a..42090ac724 100644
--- a/addons/map_gestures/XEH_preInit.sqf
+++ b/addons/map_gestures/XEH_preInit.sqf
@@ -8,6 +8,6 @@ PREP_RECOMPILE_END;
 
 #include "initSettings.inc.sqf"
 
-GVAR(GroupColorCfgMappingNew) = call CBA_fnc_createNamespace;
+GVAR(GroupColorCfgMappingNew) = createHashMap;
 
 ADDON = true;
diff --git a/addons/map_gestures/functions/fnc_addGroupColorMapping.sqf b/addons/map_gestures/functions/fnc_addGroupColorMapping.sqf
index 17a8ffbb04..f533f9df34 100644
--- a/addons/map_gestures/functions/fnc_addGroupColorMapping.sqf
+++ b/addons/map_gestures/functions/fnc_addGroupColorMapping.sqf
@@ -25,7 +25,7 @@ TRACE_3("params",_group,_leadColor,_unitColor);
 if (_group isEqualType grpNull) then {_group = groupID _group};
 
 if (_group == "") exitWith {ERROR("Group ID is blank, which is not valid.")};
-if (!([_leadColor] call FUNC(isValidColorArray))) exitWith {ERROR("leadColor is not a valid color array.")};
-if (!([_unitColor] call FUNC(isValidColorArray))) exitWith {ERROR("color is not a valid color array.")};
+if !([_leadColor] call FUNC(isValidColorArray)) exitWith {ERROR("leadColor is not a valid color array.")};
+if !([_unitColor] call FUNC(isValidColorArray)) exitWith {ERROR("color is not a valid color array.")};
 
-GVAR(GroupColorCfgMappingNew) setVariable [_group, [_leadColor, _unitColor]];
+GVAR(GroupColorCfgMappingNew) set [toLower _group, [_leadColor, _unitColor]];
diff --git a/addons/map_gestures/functions/fnc_drawMapGestures.sqf b/addons/map_gestures/functions/fnc_drawMapGestures.sqf
index 2f0c80de3e..0a69c1924b 100644
--- a/addons/map_gestures/functions/fnc_drawMapGestures.sqf
+++ b/addons/map_gestures/functions/fnc_drawMapGestures.sqf
@@ -41,7 +41,7 @@ private _players = [_positions, FUNC(getProximityPlayers), missionNamespace, QGV
         };
 
         // If color settings for the group exist, then use those, otherwise fall back to the default colors
-        private _colorMap = GVAR(GroupColorCfgMappingNew) getVariable [(groupID (group _x)), [GVAR(defaultLeadColor), GVAR(defaultColor)]];
+        private _colorMap = GVAR(GroupColorCfgMappingNew) getOrDefault [toLower groupID (group _x), [GVAR(defaultLeadColor), GVAR(defaultColor)]];
         private _color = _colorMap select (_x != leader _x);
 
         TRACE_2("",_colorMap,_color);
diff --git a/addons/map_gestures/functions/fnc_isValidColorArray.sqf b/addons/map_gestures/functions/fnc_isValidColorArray.sqf
index 7cc9335800..bcd5fea38c 100644
--- a/addons/map_gestures/functions/fnc_isValidColorArray.sqf
+++ b/addons/map_gestures/functions/fnc_isValidColorArray.sqf
@@ -20,7 +20,7 @@ scopeName "main";
 params ["_colorArray"];
 
 if (isNil "_colorArray") exitWith {false};
-if (!(_colorArray isEqualType [])) exitWith {false};
+if !(_colorArray isEqualType []) exitWith {false};
 if (count _colorArray != 4) exitWith {false};
 
 {
diff --git a/addons/map_gestures/functions/fnc_moduleGroupSettings.sqf b/addons/map_gestures/functions/fnc_moduleGroupSettings.sqf
index 07be21fc90..36bef695d5 100644
--- a/addons/map_gestures/functions/fnc_moduleGroupSettings.sqf
+++ b/addons/map_gestures/functions/fnc_moduleGroupSettings.sqf
@@ -24,9 +24,10 @@ if (!_activated) exitWith {};
 
 // Transcode string setting into usable array. Example: "1,1,1,1" -> [1, 1, 1, 1]
 private _leadColor = call compile ("[" + (_logic getVariable ["leadColor", ""]) + "]");
-if (!([_leadColor] call FUNC(isValidColorArray))) exitWith {ERROR("leadColor is not a valid color array.")};
+if !([_leadColor] call FUNC(isValidColorArray)) exitWith {ERROR("leadColor is not a valid color array.")};
+
 private _color = call compile ("[" + (_logic getVariable ["color", ""]) + "]");
-if (!([_color] call FUNC(isValidColorArray))) exitWith {ERROR("color is not a valid color array.")};
+if !([_color] call FUNC(isValidColorArray)) exitWith {ERROR("color is not a valid color array.")};
 
 // Add all synchronized groups and reference custom configuration for them
 {
diff --git a/addons/map_gestures/functions/fnc_moduleSettings.sqf b/addons/map_gestures/functions/fnc_moduleSettings.sqf
index b637997af7..22913dceef 100644
--- a/addons/map_gestures/functions/fnc_moduleSettings.sqf
+++ b/addons/map_gestures/functions/fnc_moduleSettings.sqf
@@ -29,14 +29,14 @@ if (!_activated) exitWith {};
 private _defaultLeadColor = _logic getVariable ["defaultLeadColor", ""];
 if (_defaultLeadColor != "") then {
     _defaultLeadColor = call compile ("[" + _defaultLeadColor + "]");
-    if (!([_defaultLeadColor] call FUNC(isValidColorArray))) exitWith {ERROR("defaultLeadColor is not a valid color array.")};
+    if !([_defaultLeadColor] call FUNC(isValidColorArray)) exitWith {ERROR("defaultLeadColor is not a valid color array.")};
     ["CBA_settings_setSettingMission", [QGVAR(defaultLeadColor), _defaultLeadColor, true]] call CBA_fnc_localEvent;
 };
 
 private _defaultColor = _logic getVariable ["defaultColor", ""];
 if (_defaultColor != "") then {
     _defaultColor = call compile ("[" + _defaultColor + "]");
-    if (!([_defaultColor] call FUNC(isValidColorArray))) exitWith {ERROR("defaultColor is not a valid color array.")};
+    if !([_defaultColor] call FUNC(isValidColorArray)) exitWith {ERROR("defaultColor is not a valid color array.")};
     ["CBA_settings_setSettingMission", [QGVAR(defaultColor), _defaultColor, true]] call CBA_fnc_localEvent;
 };
 
diff --git a/addons/map_gestures/stringtable.xml b/addons/map_gestures/stringtable.xml
index 91f07c7cdf..cff2d15f4f 100644
--- a/addons/map_gestures/stringtable.xml
+++ b/addons/map_gestures/stringtable.xml
@@ -11,7 +11,7 @@
             <German>Kartenzeichen</German>
             <Spanish>Gestos en mapa</Spanish>
             <French>Pointage sur carte</French>
-            <Japanese>マップ ジェスチャー</Japanese>
+            <Japanese>マップ ジェスチャ</Japanese>
             <Korean>지도 신호</Korean>
             <Chinesesimp>地图指示</Chinesesimp>
             <Chinese>地圖指示器</Chinese>
@@ -43,7 +43,7 @@
             <German>Aktiviert die Kartenzeichen.</German>
             <Spanish>Activar Gestos en Mapa</Spanish>
             <French>Active le pointage sur carte.</French>
-            <Japanese>マップ ジェスチャーを有効化</Japanese>
+            <Japanese>マップ ジェスチャを有効化</Japanese>
             <Korean>지도 신호 활성화</Korean>
             <Chinesesimp>启用地图指示</Chinesesimp>
             <Chinese>啟用地圖指示器</Chinese>
@@ -59,7 +59,7 @@
             <German>Maximale Reichweite der Kartenzeichen</German>
             <Spanish>Máx. dist. para gestos en mapa</Spanish>
             <French>Portée du pointage sur carte</French>
-            <Japanese>マップ ジェスチャーの最大範囲</Japanese>
+            <Japanese>マップ ジェスチャの最大範囲</Japanese>
             <Korean>지도 신호 최대 거리</Korean>
             <Chinesesimp>地图指示最大范围</Chinesesimp>
             <Chinese>地圖指示器最大範圍</Chinese>
@@ -75,7 +75,7 @@
             <German>Maximale Reichweite zwischen Spielern um Kartenzeichen anzuzeigen</German>
             <Spanish>Máxima distancia a la cual pueden verse el indicador de gestos</Spanish>
             <French>Définit le rayon au-delà duquel un joueur ne verra plus l'indicateur de pointage des autres joueurs.</French>
-            <Japanese>マップ ジェスチャーのインジケーターを表示可能なプレーヤー間の最大距離</Japanese>
+            <Japanese>マップ ジェスチャのインジケータを表示可能なプレーヤー間の最大距離</Japanese>
             <Korean>플레이어간에 지도 신호 표시거리를 설정합니다.</Korean>
             <Chinesesimp>设定地图指示显示的最大范围距离</Chinesesimp>
             <Chinese>設定地圖指示器顯示的最大範圍距離</Chinese>
@@ -137,7 +137,7 @@
             <German>Farbe der Namenstexte neben der Kartenzeichen-Markierung.</German>
             <Spanish>Color de los nombres dibujados al lado del marcados de gestos.</Spanish>
             <French>Définit la couleur du texte pour le nom à côté du marqueur de pointage sur carte.</French>
-            <Japanese>マップ ジェスチャーに添えて表示される名前の文字色。</Japanese>
+            <Japanese>マップ ジェスチャに添えて表示される名前の文字色。</Japanese>
             <Korean>지도 색상에 표시되는 이름의 색상을 결정합니다.</Korean>
             <Chinesesimp>定义名称文字颜色。使其与地图指示颜色有所区别。</Chinesesimp>
             <Chinese>定義名稱文字顏色。使其與地圖指示器顏色有所區別</Chinese>
@@ -270,7 +270,7 @@
             <Russian>Показывать только союзные жесты</Russian>
             <Polish>Pokazuj jedynie sojusznicze gesty</Polish>
             <French>Afficher uniquement le pointage des alliés</French>
-            <Japanese>友軍のジェスチャーのみ表示</Japanese>
+            <Japanese>友軍のジェスチャのみ表示</Japanese>
             <Spanish>Mostrar sólo gestos de aliados</Spanish>
             <German>Nur Gesten befreundeter Einheiten zeigen</German>
             <Italian>Mostra solo gesti di alleati</Italian>
@@ -283,7 +283,7 @@
             <Russian>Показывать жесты только от игроков союзной стороны.</Russian>
             <French>Affiche uniquement les pointages effectués par des unités qui sont du même camp, ou d'un camp allié.</French>
             <Italian>Mostra solo gesti effettuati da unità che sono della stessa fazione o una fazione alleata.</Italian>
-            <Japanese>同じ陣営または味方陣営のユニットからのジェスチャーのみを表示します。</Japanese>
+            <Japanese>同じ陣営または味方陣営のユニットからのジェスチャのみを表示します。</Japanese>
             <Spanish>Muestra únicamente gestos de las unidades que son del mismo bando o de un bando aliado</Spanish>
             <Polish>Pokazuj tylko Gesty od jednostek z tej samej lub sojuszniczej strony</Polish>
             <German>Nur Gesten von Einheiten der selben oder einer verbündeten Seite zeigen.</German>
@@ -308,7 +308,7 @@
             <English>Max range between a Camera and players to show the map gesture indicator</English>
             <Russian>Устанавливает макс. дальность между игроком и камерой для отображения жестов на карте</Russian>
             <French>Définit le rayon au-delà duquel une caméra ne verra plus l'indicateur de pointage des autres joueurs.</French>
-            <Japanese>観戦カメラから確認可能なマップ ジェスチャーのインジケーターを表示するカメラとプレーヤー間の最大距離</Japanese>
+            <Japanese>観戦カメラから確認可能なマップ ジェスチャのインジケータを表示するカメラとプレーヤー間の最大距離</Japanese>
             <Spanish>Máxima distancia entre una cámara y los jugadores para mostrar el indicador de gestos en mapa</Spanish>
             <Italian>Distanza massima da cui videocamere (spettatore/zeus) può vedere i gesti di giocatori.</Italian>
             <Polish>Maksymalny zasięg pomiędzy kamerą a graczami do pokazania gestów na mapie</Polish>
@@ -334,7 +334,7 @@
             <English>Allows Spectator to See Map Gestures</English>
             <Russian>Позволяет наблюдателю видеть жесты на карте</Russian>
             <French>Permet aux spectateurs de voir le pointage des autres joueurs.</French>
-            <Japanese>観戦者からマップ ジェスチャーを表示できるようにします。</Japanese>
+            <Japanese>観戦者からマップ ジェスチャを表示できるようにします。</Japanese>
             <Italian>Permetti agli spettatori di vedere gesti in mappa</Italian>
             <Spanish>Permitir al espectador ver los gestos de mapa</Spanish>
             <Polish>Zezwól Obserwatorowi widzieć Gesty na mapie</Polish>
@@ -360,7 +360,7 @@
             <English>Allows Curator to See Map Gestures</English>
             <Russian>Позволяет куратору видеть жесты на карте</Russian>
             <French>Permet aux curateurs de voir le pointage des autres joueurs.</French>
-            <Japanese>キュレーターからマップ ジェスチャーを表示できるようにします。</Japanese>
+            <Japanese>キュレーターからマップ ジェスチャを表示できるようにします。</Japanese>
             <Spanish>Permitir al Curador ver los gestos de mapa</Spanish>
             <Italian>Permetti agli Zeus di vedere gesti in mappa</Italian>
             <Polish>Zezwól Zeusowi widzieć gesty na mapie</Polish>
@@ -473,7 +473,7 @@
             <German>Kartenzeichen - Gruppeneinstellungen</German>
             <Spanish>Gestos en mapas - Configuración de grupos</Spanish>
             <French>Pointage sur carte - réglages de groupe</French>
-            <Japanese>マップ ジェスチャー - グループ設定</Japanese>
+            <Japanese>マップ ジェスチャ - グループ設定</Japanese>
             <Korean>지도 신호 - 그룹 설정</Korean>
             <Chinesesimp>地图指示—队伍设定</Chinesesimp>
             <Chinese>地圖指示器 - 隊伍設定</Chinese>
@@ -488,7 +488,7 @@
             <German>ACE Kartenzeichen</German>
             <Spanish>ACE Gestos en mapa</Spanish>
             <French>ACE Pointage sur carte</French>
-            <Japanese>ACE マップ ジェスチャー</Japanese>
+            <Japanese>ACE マップ ジェスチャ</Japanese>
             <Korean>ACE 지도 신호</Korean>
             <Chinesesimp>ACE 地图指示</Chinesesimp>
             <Chinese>ACE 地圖指示器</Chinese>
diff --git a/addons/maptools/stringtable.xml b/addons/maptools/stringtable.xml
index f71cc8489f..7e1d0cee97 100644
--- a/addons/maptools/stringtable.xml
+++ b/addons/maptools/stringtable.xml
@@ -42,6 +42,7 @@
             <Italian>Tavola di calcolo</Italian>
             <Russian>Графическая доска</Russian>
             <French>Planche traçante</French>
+            <German>Wurfparabel Kartenwerkzeug</German>
             <Spanish>Tablero de Trazado</Spanish>
         </Key>
         <Key ID="STR_ACE_MapTools_PlottingBoard_Description">
@@ -51,6 +52,7 @@
             <Italian>La tavola di calcolo è uno strumento utilizzato per dirigere fuoco di artiglieria a corto raggio.</Italian>
             <Russian>Графическая доска - это картографический инструмент, предназначенный для использования при ведении непрямого огня с малой дистанции.</Russian>
             <French>Une planche traçante est un outil cartographique conçu pour diriger des tirs indirects à courte distance.</French>
+            <German>Das Wurfparabel-Kartenwerkzeug ist ein Werkzeug, das für die Steuerung indirekten Feuers auf kurze Distanz entwickelt wurde.</German>
             <Spanish>El Tablero de Trazado es una herramienta de mapa utilizada para dirigir fuego indirecto de corto alcance.</Spanish>
         </Key>
         <Key ID="STR_ACE_MapTools_MapTools_Menu">
@@ -277,6 +279,7 @@
             <Italian>Canali ammessi su tavola di calcolo</Italian>
             <Russian>Разрешить создание каналов на миллиметровой доске.</Russian>
             <French>Canaux autorisés sur la planche traçante</French>
+            <German>Wurfparabel Kartenwerkzeug erlaubte Kanäle</German>
             <Spanish>Permitir Canales de Dibujado de Tablero de Trazado</Spanish>
         </Key>
         <Key ID="STR_ACE_MapTools_allowChannelDrawing_description">
@@ -286,6 +289,7 @@
             <Italian>Canali in cui si può disegnare sulla tavola di calcolo.</Italian>
             <Russian>Каналы, в которых включено рисование на миллиметровой доске.</Russian>
             <French>Canaux dans lesquels vous pouvez dessiner sur le planche traçante</French>
+            <German>Kanäle, in denen das Zeichnen mit dem Wurfparabel-Kartenwerkzeug auf der Karte erlaubt ist.</German>
             <Spanish>Canales en los que el tablero de trazado está habilitado.</Spanish>
         </Key>
         <Key ID="STR_ACE_MapTools_allowDirectCommsOnly">
@@ -295,6 +299,7 @@
             <Italian>Comunicazioni Dirette (solo linee)</Italian>
             <Russian>Разрешать только прямую связь (только полилинии)</Russian>
             <French>Communications directes uniquement (lignes uniquement)</French>
+            <German>Nur direkte Kommunikation zulassen (nur Polylinien)</German>
             <Spanish>Permitir Sólo Comunicaciones Directas (Sólo Polylineas)</Spanish>
         </Key>
         <Key ID="STR_ACE_MapTools_allowDirectGroupComms">
@@ -304,6 +309,7 @@
             <Italian>Comunicazioni dirette/gruppo (linee e marker)</Italian>
             <Russian>Разрешить прямую/групповую связь (полилинии и групповые маркеры)</Russian>
             <French>Autoriser les communications directes/de groupe (polylignes et marqueurs de groupe)</French>
+            <German>Direkte/Gruppenkommunikation zulassen (Polylinien und Gruppenmarkierungen)</German>
             <Spanish>Permitir Comunicaciones Directas/Grupales (Polylineas y Marcadores de Grupo)</Spanish>
         </Key>
         <Key ID="STR_ACE_MapTools_PlottingBoardLabel">
@@ -313,6 +319,7 @@
             <Italian>Tavola di calcolo</Italian>
             <Russian>Миллиметровая доска</Russian>
             <French>Planche traçante</French>
+            <German>Wurfparabel Kartenwerkzeug</German>
             <Spanish>Tablero de Trazado</Spanish>
         </Key>
         <Key ID="STR_ACE_MapTools_PlottingBoardAcrylicLabel">
@@ -322,6 +329,7 @@
             <Italian>Acrilico tavola di calcolo</Italian>
             <Russian>Миллиметровая доска акрилловая</Russian>
             <French>Planche traçante Acrylique</French>
+            <German>Wurfparabel Kartenwerkzeug Acryl</German>
             <Spanish>Tablero de Trazado Acrílico</Spanish>
         </Key>
         <Key ID="STR_ACE_MapTools_PlottingBoardRulerLabel">
@@ -331,6 +339,7 @@
             <Italian>Righello tavola di calcolo</Italian>
             <Russian>Линейка для миллиметровой доски</Russian>
             <French>Règle de la planche traçante</French>
+            <German>Wurfparabel Kartenwerkzeug Lineal</German>
             <Spanish>Regla de Tablero de Trazado</Spanish>
         </Key>
         <Key ID="STR_ACE_MapTools_ToPlottingBoardLabel">
@@ -340,6 +349,7 @@
             <Italian>Su tavola di calcolo</Italian>
             <Russian>К миллиметровой доске.</Russian>
             <French>Sur la planche traçante</French>
+            <German>Zum Wurfparabel Kartenwerkzeug</German>
             <Spanish>A Tablero de Trazado</Spanish>
         </Key>
         <Key ID="STR_ACE_MapTools_ToPlottingBoardAcrylicLabel">
@@ -349,6 +359,7 @@
             <Italian>Su acrilico tavola di calcolo</Italian>
             <Russian>К миллиметровой доске акрилловой</Russian>
             <French>Sur la planche traçante Acrylique</French>
+            <German>Zum Wurfparabel Kartenwerkzeug Acryl</German>
             <Spanish>A Tablero de Trazado Acrílico</Spanish>
         </Key>
         <Key ID="STR_ACE_MapTools_ToPlottingBoardRulerLabel">
@@ -358,6 +369,7 @@
             <Italian>Su righello tavola di calcolo</Italian>
             <Russian>К линейке миллиметровой доски.</Russian>
             <French>Sur la règle de la planche traçante</French>
+            <German>Zum Wurfparabel Kartenwerkzeug Lineal</German>
             <Spanish>A Regla de Tablero de Trazado</Spanish>
         </Key>
         <Key ID="STR_ACE_MapTools_WipeBoard">
@@ -367,6 +379,7 @@
             <Italian>Cancella tutti i disegni dalla tavola</Italian>
             <Russian>Сотрите все маркеры с миллиметровой доски.</Russian>
             <French>Effacer tous les dessins de la planche traçante</French>
+            <German>Alle Markierungen vom Wurfparabel Kartenwerkzeug entfernen</German>
             <Spanish>Borrar todas las marcas del Tablero de Trazado</Spanish>
         </Key>
         <Key ID="STR_ACE_MapTools_ShowPlottingBoard">
@@ -376,6 +389,7 @@
             <Italian>Mostra tavola di calcolo</Italian>
             <Russian>Показать миллиметровую доску.</Russian>
             <French>Afficher la planche traçante</French>
+            <German>Zeige Wurfparabel Kartenwerkzeug</German>
             <Spanish>Mostrar Tablero de Trazado</Spanish>
         </Key>
         <Key ID="STR_ACE_MapTools_HidePlottingBoard">
@@ -385,6 +399,7 @@
             <Italian>Nascondi tavola di calcolo</Italian>
             <Russian>Скрыть миллиметровую доску.</Russian>
             <French>Masquer la planche traçante</French>
+            <German>Verstecke Wurfparabel Kartenwerkzeug</German>
             <Spanish>Ocultar Tablero de Trazado</Spanish>
         </Key>
         <Key ID="STR_ACE_MapTools_TogglePlottingBoardRuler">
@@ -394,6 +409,7 @@
             <Italian>Mostra/Nascondi Righello</Italian>
             <Russian>Переключить линейку миллиметровой доски.</Russian>
             <French>Afficher/masquer la règle</French>
+            <German>Schalte das Lineal des Wurfparabel-Kartenwerkzeuges um</German>
             <Spanish>Alternar Regla de Tablero de Trazado</Spanish>
         </Key>
         <Key ID="STR_ACE_MapTools_AlignTo">
@@ -445,6 +461,7 @@
             <Italian>Su</Italian>
             <Russian>Вверх</Russian>
             <French>Monter</French>
+            <German>Nach oben</German>
             <Spanish>Arriba</Spanish>
         </Key>
         <Key ID="STR_ACE_MapTools_ToMapToolLabel">
@@ -454,6 +471,7 @@
             <Italian>Su strumento cartografico</Italian>
             <Russian>К инструментам карты</Russian>
             <French>Outil cartographique</French>
+            <German>Zum Kartenwerkzeug</German>
             <Spanish>A Herramienta de Mapa</Spanish>
         </Key>
     </Package>
diff --git a/addons/markers/functions/fnc_removeTimestamp.sqf b/addons/markers/functions/fnc_removeTimestamp.sqf
index 073d9ce613..5d2c7c3c1f 100644
--- a/addons/markers/functions/fnc_removeTimestamp.sqf
+++ b/addons/markers/functions/fnc_removeTimestamp.sqf
@@ -43,8 +43,8 @@ private _index = 1;
 private _keepCheckingDigits = true;
 private _validTimestamp = true;
 while {_keepCheckingDigits} do {
-    if (!(_string select [_index, 1] in DIGITS)) exitWith { _validTimestamp = false; };
-    if (!(_string select [_index+1, 1] in DIGITS)) exitWith { _validTimestamp = false; };
+    if !(_string select [_index, 1] in DIGITS) exitWith { _validTimestamp = false; };
+    if !(_string select [_index+1, 1] in DIGITS) exitWith { _validTimestamp = false; };
     switch (_string select [_index+2, 1]) do {
         case (":"): {
             _index = _index + 3;
@@ -54,7 +54,7 @@ while {_keepCheckingDigits} do {
         };
         case (" "): {
             _keepCheckingDigits = false;
-            if (!(_string select [_index+3, 3] in ["am]", "pm]"])) then {_validTimestamp = false; };
+            if !(_string select [_index+3, 3] in ["am]", "pm]"]) then {_validTimestamp = false; };
         };
         default {
             _keepCheckingDigits = false;
diff --git a/addons/medical/dev/test_hitpointConfigs.sqf b/addons/medical/dev/test_hitpointConfigs.sqf
index 9de5c5e686..ff1c3a95b7 100644
--- a/addons/medical/dev/test_hitpointConfigs.sqf
+++ b/addons/medical/dev/test_hitpointConfigs.sqf
@@ -10,7 +10,11 @@ private _cfgWeapons = configFile >> "CfgWeapons";
 private _cfgVehicles = configFile >> "CfgVehicles";
 
 private _uniforms = "getNumber (_x >> 'scope') == 2 && {configName _x isKindOf ['Uniform_Base', _cfgWeapons]}" configClasses _cfgWeapons;
-private _units = _uniforms apply {_cfgVehicles >> getText (_x >> "ItemInfo" >> "uniformClass")};
+private _units = _uniforms apply {
+    private _unitCfg = _cfgVehicles >> getText (_x >> "ItemInfo" >> "uniformClass");
+    if (isNull _unitCfg) then { WARNING_2("%1 has invalid uniformClass %2",configName _x,getText (_x >> "ItemInfo" >> "uniformClass")) };
+    _unitCfg
+};
 if (param [0, false]) then { // Check all units (if naked)
     INFO("checking ALL units");
    _units append ((configProperties [configFile >> "CfgVehicles", "(isClass _x) && {(getNumber (_x >> 'scope')) == 2} && {configName _x isKindOf 'CAManBase'}", true]));
@@ -21,23 +25,17 @@ INFO_1("Checking uniforms for correct medical hitpoints [%1 units]",count _units
 private _testPass = true;
 {
     private _typeOf = configName _x;
-    private _hitpoints = (configProperties [_x >> "HitPoints", "isClass _x", true]) apply {configName _x};
+    if (_typeOf == "") then { continue };
+    private _hitpoints = (configProperties [_x >> "HitPoints", "isClass _x", true]) apply {toLowerANSI configName _x};
+    private _expectedHitPoints = ["hitleftarm","hitrightarm","hitleftleg","hitrightleg","hithead","hitbody"];
+    private _missingHitPoints = _expectedHitPoints select {!(_x in _hitpoints)};
+    if (_missingHitPoints isNotEqualTo []) then {
+        WARNING_3("%1 missing ace hitpoints: %2 - class hitpoints: %3",_typeOf,_missingHitPoints,_hitpoints);
+        _testPass = false;
+    };
 
     // _typeOf createUnit [position player, group player, "z = this"];
     // deleteVehicle z;
-
-    private _lastHitpoint = (_hitpoints param [(count _hitpoints) - 1, "#array"]);
-    if (_lastHitpoint != "ACE_HDBracket") then {
-        WARNING_2("%1 has bad last hitpoint: %2",_typeOf,_hitpoints);
-        _testPass = false;
-    };
-
-    if (((_hitpoints findIf {_x == "HitLeftArm"}) == -1) || {(_hitpoints findIf {_x == "HitRightArm"}) == -1}
-            || {(_hitpoints findIf {_x == "HitLeftLeg"}) == -1} || {(_hitpoints findIf {_x == "HitRightLeg"}) == -1}
-            || {(_hitpoints findIf {_x == "HitHead"}) == -1} || {(_hitpoints findIf {_x == "HitBody"}) == -1}) then {
-        WARNING_2("%1 missing ace hitpoints: %2",_typeOf,_hitpoints);
-        _testPass = false;
-    };
 } forEach _units;
 
 _testPass
diff --git a/addons/medical/dev/watchVariable.sqf b/addons/medical/dev/watchVariable.sqf
index 05cb094ba8..a0e064595a 100644
--- a/addons/medical/dev/watchVariable.sqf
+++ b/addons/medical/dev/watchVariable.sqf
@@ -10,10 +10,10 @@ GVAR(dev_watchVariableRunning) = true;
     if (!isNull _display) exitWith {"Paused"};
 
     private _unit = cursorTarget;
-    if (!(_unit isKindOf "CAManBase")) then {_unit = cursorObject};
-    if (!(_unit isKindOf "CAManBase")) then {_unit = ACE_player};
+    if !(_unit isKindOf "CAManBase") then {_unit = cursorObject};
+    if !(_unit isKindOf "CAManBase") then {_unit = ACE_player};
     if ((_unit != ACE_player) && {IS_UNCONSCIOUS(ACE_player)}) then {_unit = ACE_player};
-    if (!(_unit isKindOf "CAManBase")) exitWith {"No Unit?"};
+    if !(_unit isKindOf "CAManBase") exitWith {"No Unit?"};
 
     private _return = [];
 
diff --git a/addons/medical/stringtable.xml b/addons/medical/stringtable.xml
index 6a081fa648..1a6cb07dbb 100644
--- a/addons/medical/stringtable.xml
+++ b/addons/medical/stringtable.xml
@@ -32,7 +32,7 @@
             <Chinesesimp>ACE 医疗 界面</Chinesesimp>
             <Chinese>ACE 醫療系統 介面</Chinese>
             <Turkish>ACE Medikal Arayüz</Turkish>
-            <Japanese>ACE 医療 インターフェース</Japanese>
+            <Japanese>ACE 医療 インタフェース</Japanese>
         </Key>
         <Key ID="STR_ACE_Medical_SpontaneousWakeUpChance_DisplayName">
             <English>Unconscious Wake Up Chance</English>
diff --git a/addons/medical_ai/XEH_PREP.hpp b/addons/medical_ai/XEH_PREP.hpp
index de4ac3c38a..3cf2b3e244 100644
--- a/addons/medical_ai/XEH_PREP.hpp
+++ b/addons/medical_ai/XEH_PREP.hpp
@@ -1,3 +1,4 @@
+PREP(addHealingCommandActions);
 PREP(canRequestMedic);
 PREP(healingLogic);
 PREP(healSelf);
diff --git a/addons/medical_ai/XEH_postInit.sqf b/addons/medical_ai/XEH_postInit.sqf
index 0b225c7f0b..9ddd8273fd 100644
--- a/addons/medical_ai/XEH_postInit.sqf
+++ b/addons/medical_ai/XEH_postInit.sqf
@@ -2,6 +2,7 @@
 
 ["CBA_settingsInitialized", {
     TRACE_1("settingsInitialized",GVAR(enabledFor));
+
     if (GVAR(enabledFor) == 0) exitWith {}; // 0: disabled
     if ((GVAR(enabledFor) == 1) && {!isServer} && {hasInterface}) exitWith {}; // 1: Don't Run on non-hc Clients
 
@@ -19,6 +20,19 @@
         _unit setVariable [QGVAR(lastSuppressed), CBA_missionTime];
     }] call CBA_fnc_addClassEventHandler;
 
-    #include "stateMachine.inc.sqf"
+    // Add command actions to command AI medics to treat other units
+    call FUNC(addHealingCommandActions);
 
+    if (GVAR(requireItems) == 2) then {
+        ["CAManBase", "InitPost", {
+            [{
+                params ["_unit"];
+                if ((!local _unit) || {!alive _unit} || {isPlayer _unit}) exitWith {};
+                TRACE_2("replacing medical items on AI",_unit,typeOf _unit);
+                [_unit] call EFUNC(common,replaceRegisteredItems);
+            }, _this] call CBA_fnc_execNextFrame; // need to delay a frame before modifying items in a backpack
+        }, nil, [IGNORE_BASE_UAVPILOTS], true] call CBA_fnc_addClassEventHandler;
+    };
+
+    #include "stateMachine.inc.sqf"
 }] call CBA_fnc_addEventHandler;
diff --git a/addons/medical_ai/XEH_preInit.sqf b/addons/medical_ai/XEH_preInit.sqf
index 5725d1e119..8cdc2ee6ad 100644
--- a/addons/medical_ai/XEH_preInit.sqf
+++ b/addons/medical_ai/XEH_preInit.sqf
@@ -13,6 +13,6 @@ if (isNil QGVAR(timeSafe_shoot)) then { GVAR(timeSafe_shoot) = 30; };
 if (isNil QGVAR(timeSafe_hit)) then { GVAR(timeSafe_hit) = 30; };
 if (isNil QGVAR(timeSafe_suppressed)) then { GVAR(timeSafe_suppressed) = 30; };
 
-GVAR(itemHash) = uinamespace getVariable QGVAR(itemHash);
+GVAR(itemHash) = uiNamespace getVariable QGVAR(itemHash);
 
 ADDON = true;
diff --git a/addons/medical_ai/XEH_preStart.sqf b/addons/medical_ai/XEH_preStart.sqf
index b4d795cbbf..ccb92538b7 100644
--- a/addons/medical_ai/XEH_preStart.sqf
+++ b/addons/medical_ai/XEH_preStart.sqf
@@ -20,6 +20,7 @@ private _itemHash = createHashMap;
 } forEach [
     ["@bandage", ["FieldDressing", "PackingBandage", "ElasticBandage", "QuikClot"]],
     ["@iv", ["SalineIV", "SalineIV_500", "SalineIV_250", "BloodIV", "BloodIV_500", "BloodIV_250", "PlasmaIV", "PlasmaIV_500", "PlasmaIV_250"]],
+    ["tourniquet", ["ApplyTourniquet"]],
     ["splint", ["splint"]],
     ["morphine", ["morphine"]],
     ["epinephrine", ["epinephrine"]]
diff --git a/addons/medical_ai/functions/fnc_addHealingCommandActions.sqf b/addons/medical_ai/functions/fnc_addHealingCommandActions.sqf
new file mode 100644
index 0000000000..cc91ca7eb3
--- /dev/null
+++ b/addons/medical_ai/functions/fnc_addHealingCommandActions.sqf
@@ -0,0 +1,88 @@
+#include "..\script_component.hpp"
+/*
+ * Author: johnb43
+ * Adds ACE actions for the player to command medics to heal injured units.
+ *
+ * Arguments:
+ * None
+ *
+ * Return Value:
+ * None
+ *
+ * Example:
+ * call ace_medical_ai_fnc_addHealingCommandActions
+ *
+ * Public: No
+ */
+
+if (!hasInterface) exitWith {};
+
+private _action = [
+    QGVAR(heal),
+    localize "STR_A3_Task180_name",
+    "",
+    {},
+    {_player == leader _player},
+    {
+        private _units = units _player;
+
+        (_units select {_x call EFUNC(common,isAwake) && {_x call EFUNC(medical_treatment,isMedic)} && {!(_x call EFUNC(common,isPlayer))}}) apply {
+            [
+                [
+                    QGVAR(medicHeal_) + str _x,
+                    format ["%1: (%2)", [_x, false, true] call EFUNC(common,getName), groupID _x],
+                    "",
+                    {},
+                    {true},
+                    {
+                        (_this select 2) params ["_healer", "_units"];
+
+                        (_units select {_x call FUNC(isInjured)}) apply {
+                            [
+                                [
+                                    QGVAR(healUnit_) + str _x,
+                                    format [localize "str_action_heal_soldier", ([_x, false, true] call EFUNC(common,getName)) + " (" + str groupID _x + ")"],
+                                    "",
+                                    {
+                                        (_this select 2) params ["_healer", "_target"];
+
+                                        private _assignedMedic = _target getVariable [QGVAR(assignedMedic), objNull];
+
+                                        // Remove from previous medic's queue
+                                        if (!isNull _assignedMedic && {_healer != _assignedMedic}) then {
+                                            private _healQueue = _assignedMedic getVariable [QGVAR(healQueue), []];
+
+                                            _healQueue deleteAt (_healQueue find _target);
+
+                                            _assignedMedic setVariable [QGVAR(healQueue), _healQueue];
+                                        };
+
+                                        _target setVariable [QGVAR(assignedMedic), _healer];
+
+                                        // Add to new medic
+                                        private _healQueue = _healer getVariable [QGVAR(healQueue), []];
+
+                                        _healQueue deleteAt (_healQueue find _target);
+                                        _healQueue insert [0, [_target]];
+
+                                        _healer setVariable [QGVAR(healQueue), _healQueue];
+                                    },
+                                    {true},
+                                    {},
+                                    [_healer, _x]
+                                ] call EFUNC(interact_menu,createAction),
+                                [],
+                                _x
+                            ]
+                        };
+                    },
+                    [_x, _units]
+                ] call EFUNC(interact_menu,createAction),
+                [],
+                _x
+            ]
+        };
+    }
+] call EFUNC(interact_menu,createAction);
+
+["CAManBase", 1, ["ACE_SelfActions"], _action, true] call EFUNC(interact_menu,addActionToClass);
diff --git a/addons/medical_ai/functions/fnc_canRequestMedic.sqf b/addons/medical_ai/functions/fnc_canRequestMedic.sqf
index 685bd57f54..5064e1a732 100644
--- a/addons/medical_ai/functions/fnc_canRequestMedic.sqf
+++ b/addons/medical_ai/functions/fnc_canRequestMedic.sqf
@@ -4,13 +4,13 @@
  * Checks if there is a medic available in the unit's group.
  *
  * Arguments:
- * None
+ * Unit <OBJECT>
  *
  * Return Value:
  * Can request medic <BOOL>
  *
  * Example:
- * player call ACE_medical_ai_fnc_canRequestMedic
+ * player call ace_medical_ai_fnc_canRequestMedic
  *
  * Public: No
  */
diff --git a/addons/medical_ai/functions/fnc_healSelf.sqf b/addons/medical_ai/functions/fnc_healSelf.sqf
index 5747637995..60f2b83712 100644
--- a/addons/medical_ai/functions/fnc_healSelf.sqf
+++ b/addons/medical_ai/functions/fnc_healSelf.sqf
@@ -4,13 +4,13 @@
  * Makes the unit heal itself.
  *
  * Arguments:
- * None
+ * Unit <OBJECT>
  *
  * Return Value:
  * None
  *
  * Example:
- * call ACE_medical_ai_fnc_healSelf
+ * cursorObject call ace_medical_ai_fnc_healSelf
  *
  * Public: No
  */
diff --git a/addons/medical_ai/functions/fnc_healUnit.sqf b/addons/medical_ai/functions/fnc_healUnit.sqf
index ad867d2570..319d5533b1 100644
--- a/addons/medical_ai/functions/fnc_healUnit.sqf
+++ b/addons/medical_ai/functions/fnc_healUnit.sqf
@@ -4,16 +4,17 @@
  * Makes a medic heal the next unit that needs treatment.
  *
  * Arguments:
- * None
+ * Unit <OBJECT>
  *
  * Return Value:
  * None
  *
  * Example:
- * call ACE_medical_ai_fnc_healUnit
+ * cursorObject call ace_medical_ai_fnc_healUnit
  *
  * Public: No
  */
+
 // Player will have to do this manually of course
 if ([_this] call EFUNC(common,isPlayer)) exitWith {};
 // Can't heal other units when unconscious
@@ -23,10 +24,10 @@ if IS_UNCONSCIOUS(_this) exitWith {
 
 // Find next unit to treat
 private _healQueue = _this getVariable [QGVAR(healQueue), []];
-private _target = _healQueue select 0;
+private _target = _healQueue param [0, objNull];
 
 // If unit died or was healed, be lazy and wait for the next tick
-if (isNull _target || {!alive _target} || {!(_target call FUNC(isInjured))}) exitWith {
+if (!alive _target || {!(_target call FUNC(isInjured))}) exitWith {
     _this forceSpeed -1;
     _target forceSpeed -1;
     _healQueue deleteAt 0;
@@ -46,6 +47,10 @@ if (_this distance _target > 2.5) exitWith {
     _this setVariable [QGVAR(currentTreatment), nil];
     if (CBA_missionTime >= (_this getVariable [QGVAR(nextMoveOrder), CBA_missionTime])) then {
         _this setVariable [QGVAR(nextMoveOrder), CBA_missionTime + 10];
+
+        // Medic, when doing a lot of treatment, moves away from injured over time (because of animations)
+        // Need to allow the medic to move back to the injured again
+        _this forceSpeed -1;
         _this doMove getPosATL _target;
         #ifdef DEBUG_MODE_FULL
         systemChat format ["%1 moving to %2", _this, _target];
diff --git a/addons/medical_ai/functions/fnc_healingLogic.sqf b/addons/medical_ai/functions/fnc_healingLogic.sqf
index fa35b49284..84b05327a5 100644
--- a/addons/medical_ai/functions/fnc_healingLogic.sqf
+++ b/addons/medical_ai/functions/fnc_healingLogic.sqf
@@ -1,7 +1,7 @@
 #include "..\script_component.hpp"
 /*
  * Author: BaerMitUmlaut, PabstMirror
- * Applies healing to target
+ * Applies healing to target.
  *
  * Arguments:
  * 0: Healer <OBJECT>
@@ -11,7 +11,7 @@
  * Nothing
  *
  * Example:
- * [a, b] call ACE_medical_ai_fnc_healingLogic
+ * [cursorObject, cursorObject] call ace_medical_ai_fnc_healingLogic
  *
  * Public: No
  */
@@ -24,14 +24,58 @@ if (_finishTime > 0) exitWith {
     if (CBA_missionTime >= _finishTime) then {
         TRACE_5("treatment finished",_finishTime,_treatmentTarget,_treatmentEvent,_treatmentArgs,_treatmentItem);
         _healer setVariable [QGVAR(currentTreatment), nil];
+
+        private _usedItem = "";
+
         if ((GVAR(requireItems) > 0) && {_treatmentItem != ""}) then {
             ([_healer, _treatmentItem] call FUNC(itemCheck)) params ["_itemOk", "_itemClassname", "_treatmentClass"];
-            if (!_itemOk) exitWith { _treatmentEvent = "#fail"; }; // no item after delay
+             // No item after treatment done
+            if (!_itemOk) exitWith {
+                _treatmentEvent = "#fail";
+            };
+
             _healer removeItem _itemClassname;
-            if (_treatmentClass != "") then { _treatmentArgs set [2, _treatmentClass]; };
+            _usedItem = _itemClassname;
+
+            if (_treatmentClass != "") then {
+                _treatmentArgs set [2, _treatmentClass];
+            };
         };
         if ((_treatmentTarget == _target) && {(_treatmentEvent select [0, 1]) != "#"}) then {
+            // There is no event for tourniquet removal, so handle calling function directly
+            if (_treatmentEvent == QGVAR(tourniquetRemove)) exitWith {
+                _treatmentArgs call EFUNC(medical_treatment,tourniquetRemove);
+            };
+
             [_treatmentEvent, _treatmentArgs, _target] call CBA_fnc_targetEvent;
+
+            // Splints are already logged on their own
+            switch (_treatmentEvent) do {
+                case QEGVAR(medical_treatment,bandageLocal): {
+                    [_target, "activity", ELSTRING(medical_treatment,Activity_bandagedPatient), [[_healer, false, true] call EFUNC(common,getName)]] call EFUNC(medical_treatment,addToLog);
+                };
+                case QEGVAR(medical_treatment,ivBagLocal): {
+                    if (_usedItem == "") then {
+                        _usedItem = "ACE_salineIV";
+                    };
+
+                    [_target, _usedItem] call EFUNC(medical_treatment,addToTriageCard);
+                    [_target, "activity", ELSTRING(medical_treatment,Activity_gaveIV), [[_healer, false, true] call EFUNC(common,getName)]] call EFUNC(medical_treatment,addToLog);
+                };
+                case QEGVAR(medical_treatment,medicationLocal): {
+                    if (_usedItem == "") then {
+                        _usedItem = ["ACE_epinephrine", "ACE_morphine"] select (_treatmentArgs select 2 == "Morphine");
+                    };
+
+                    [_target, _usedItem] call EFUNC(medical_treatment,addToTriageCard);
+                    [_target, "activity", ELSTRING(medical_treatment,Activity_usedItem), [[_healer, false, true] call EFUNC(common,getName), getText (configFile >> "CfgWeapons" >> _usedItem >> "displayName")]] call EFUNC(medical_treatment,addToLog);
+                };
+                case QEGVAR(medical_treatment,tourniquetLocal): {
+                    [_target, "ACE_tourniquet"] call EFUNC(medical_treatment,addToTriageCard);
+                    [_target, "activity", ELSTRING(medical_treatment,Activity_appliedTourniquet), [[_healer, false, true] call EFUNC(common,getName)]] call EFUNC(medical_treatment,addToLog);
+                };
+            };
+
             #ifdef DEBUG_MODE_FULL
             INFO_4("%1->%2: %3 - %4",_healer,_target,_treatmentEvent,_treatmentArgs);
             systemChat format ["Applying [%1->%2]: %3", _healer, _treatmentTarget, _treatmentEvent];
@@ -40,38 +84,164 @@ if (_finishTime > 0) exitWith {
     };
 };
 
-private _isMedic = [_healer] call EFUNC(medical_treatment,isMedic);
-private _heartRate = GET_HEART_RATE(_target);
-private _fractures = GET_FRACTURES(_target);
+// Bandage a limb up, then remove the tourniquet on it
+private _fnc_removeTourniquet = {
+    params [["_removeAllTourniquets", false]];
+
+    // Ignore head & torso if not removing all tourniquets (= administering drugs/IVs)
+    private _offset = [2, 0] select _removeAllTourniquets;
+
+    // Bandage the least bleeding body part
+    private _bodyPartBleeding = [];
+    _bodyPartBleeding resize [[4, 6] select _removeAllTourniquets, -1];
+
+    {
+        // Ignore head and torso, if only looking for place to administer drugs/IVs
+        private _partIndex = (ALL_BODY_PARTS find _x) - _offset;
+
+        if (_partIndex >= 0 && {_tourniquets select _partIndex != 0}) then {
+            {
+                _x params ["", "_amountOf", "_bleeding"];
+
+                // max 0, to set the baseline to 0, as body parts with no wounds are marked with -1
+                _bodyPartBleeding set [_partIndex, ((_bodyPartBleeding select _partIndex) max 0) + (_amountOf * _bleeding)];
+            } forEach _y;
+        };
+    } forEach GET_OPEN_WOUNDS(_target);
+
+    // If there are no open wounds, check if there are tourniquets on limbs with no open wounds (stitched or fully healed),
+    // as we know there have to be tourniquets at this point
+    if (_bodyPartBleeding findIf {_x != -1} == -1) then {
+        _bodyPartBleeding set [_tourniquets findIf {_x != 0}, 0];
+    };
+
+    // Ignore body parts that don't have open wounds (-1)
+    private _minBodyPartBleeding = selectMin (_bodyPartBleeding select {_x != -1});
+    private _selection = ALL_BODY_PARTS select ((_bodyPartBleeding find _minBodyPartBleeding) + _offset);
+
+    // If not bleeding anymore, remove the tourniquet
+    if (_minBodyPartBleeding == 0) exitWith {
+        _treatmentEvent = QGVAR(tourniquetRemove);
+        _treatmentTime = 7;
+        _treatmentArgs = [_healer, _target, _selection];
+    };
+
+    // If no bandages available, wait
+    // If check is done at the start of the scope, it will miss the edge case where the unit ran out of bandages just as they finished bandaging tourniqueted body part
+    if !(([_healer, "@bandage"] call FUNC(itemCheck)) # 0) exitWith {
+        _treatmentEvent = "#waitForBandages"; // TODO: Medic can move onto another patient/should be flagged as out of supplies
+    };
+
+    // Otherwise keep bandaging
+    _treatmentEvent = QEGVAR(medical_treatment,bandageLocal);
+    _treatmentTime = 5;
+    _treatmentArgs = [_target, _selection, "FieldDressing"];
+    _treatmentItem = "@bandage";
+};
+
+// Find a suitable limb (no tourniquets) for adminstering drugs/IVs
+private _fnc_findNoTourniquet = {
+    private _bodyPart = "";
+
+    // If all limbs have tourniquets, find the least damaged limb and try to bandage it
+    if ((_tourniquets select [2]) find 0 == -1) then {
+        call _fnc_removeTourniquet;
+    } else {
+        // Select a random non-tourniqueted limb otherwise
+        private _bodyParts = ["leftarm", "rightarm", "leftleg", "rightleg"];
+
+        while {_bodyParts isNotEqualTo []} do {
+            _bodyPart = selectRandom _bodyParts;
+
+            // If no tourniquet on, use that body part
+            if (_tourniquets select (ALL_BODY_PARTS find _bodyPart) == 0) exitWith {};
+
+            _bodyParts deleteAt (_bodyParts find _bodyPart);
+        };
+    };
+
+    _bodyPart // return
+};
+
+private _tourniquets = GET_TOURNIQUETS(_target);
 
 private _treatmentEvent = "#none";
 private _treatmentArgs = [];
 private _treatmentTime = 6;
 private _treatmentItem = "";
-switch (true) do {
-    case ((GET_WOUND_BLEEDING(_target) > 0)
-    && {([_healer, "@bandage"] call FUNC(itemCheck)) # 0}): {
-        // Select first bleeding wound and bandage it
-        private _selection = "?";
+
+if (true) then {
+    if (IS_BLEEDING(_target)) exitWith {
+        private _hasBandage = ([_healer, "@bandage"] call FUNC(itemCheck)) # 0;
+        private _hasTourniquet = ([_healer, "tourniquet"] call FUNC(itemCheck)) # 0;
+
+        // Patient is not worth treating if bloodloss can't be stopped
+        if !(_hasBandage || _hasTourniquet) exitWith {
+            _treatmentEvent = "#cantStabilise"; // TODO: Medic should be flagged as out of supplies
+        };
+
+        // Bandage the heaviest bleeding body part
+        private _bodyPartBleeding = [0, 0, 0, 0, 0, 0];
+
         {
-            private _foundBleeding = _y findIf {
-                _x params ["", "_amount", "_percentage"];
-                (_amount * _percentage) > 0
+            private _partIndex = ALL_BODY_PARTS find _x;
+
+            // Ignore tourniqueted limbs
+            if (_tourniquets select _partIndex == 0) then {
+                {
+                    _x params ["", "_amountOf", "_bleeding"];
+                    _bodyPartBleeding set [_partIndex, (_bodyPartBleeding select _partIndex) + (_amountOf * _bleeding)];
+                } forEach _y;
             };
-            if (_foundBleeding != -1) exitWith { _selection = _x; };
         } forEach GET_OPEN_WOUNDS(_target);
+
+        private _maxBodyPartBleeding = selectMax _bodyPartBleeding;
+        private _bodyPartIndex = _bodyPartBleeding find _maxBodyPartBleeding;
+        private _selection = ALL_BODY_PARTS select _bodyPartIndex;
+
+        // Apply tourniquet if moderate bleeding or no bandage is available, and if not head and torso
+        if (_hasTourniquet && {_bodyPartIndex > HITPOINT_INDEX_BODY} && {!_hasBandage || {_maxBodyPartBleeding > 0.3}}) exitWith {
+            _treatmentEvent = QEGVAR(medical_treatment,tourniquetLocal);
+            _treatmentTime = 7;
+            _treatmentArgs = [_target, _selection];
+            _treatmentItem = "tourniquet";
+        };
+
         _treatmentEvent = QEGVAR(medical_treatment,bandageLocal);
         _treatmentTime = 5;
         _treatmentArgs = [_target, _selection, "FieldDressing"];
         _treatmentItem = "@bandage";
     };
-    case (IN_CRDC_ARRST(_target) && {EGVAR(medical_treatment,cprSuccessChanceMin) > 0}): {
+
+    private _bloodVolume = GET_BLOOD_VOLUME(_target);
+    private _needsIV = _bloodVolume < MINIMUM_BLOOD_FOR_STABLE_VITALS;
+    private _canGiveIV = _needsIV &&
+                         {_healer call EFUNC(medical_treatment,isMedic)} &&
+                         {([_healer, "@iv"] call FUNC(itemCheck)) # 0}; // Has IVs
+    private _doCPR = IN_CRDC_ARRST(_target) && {EGVAR(medical_treatment,cprSuccessChanceMin) > 0};
+
+    // If in cardiac arrest, first add some blood to injured if necessary, then do CPR (doing CPR when not enough blood is suboptimal if you have IVs)
+    // If healer has no IVs, allow AI to do CPR to keep injured alive
+    if (
+        _doCPR &&
+        {!_canGiveIV || {_bloodVolume >= BLOOD_VOLUME_CLASS_3_HEMORRHAGE}}
+    ) exitWith {
         _treatmentEvent = QEGVAR(medical_treatment,cprLocal);
         _treatmentArgs = [_healer, _target];
         _treatmentTime = 15;
     };
-    case (_isMedic && {GET_BLOOD_VOLUME(_target) < MINIMUM_BLOOD_FOR_STABLE_VITALS}
-    && {([_healer, "@iv"] call FUNC(itemCheck)) # 0}): {
+
+    private _bodypart = "";
+
+    if (
+        _canGiveIV && {
+            // If all limbs are tourniqueted, bandage the one with the least amount of wounds, so that the tourniquet can be removed
+            _bodyPart = call _fnc_findNoTourniquet;
+            _bodyPart == ""
+        }
+    ) exitWith {};
+
+    if (_canGiveIV) then {
         // Check if patient's blood volume + remaining IV volume is enough to allow the patient to wake up
         private _totalIvVolume = 0; //in ml
         {
@@ -79,57 +249,125 @@ switch (true) do {
             _totalIvVolume = _totalIvVolume + _volumeRemaining;
         } forEach (_target getVariable [QEGVAR(medical,ivBags), []]);
 
-        if (GET_BLOOD_VOLUME(_target) + (_totalIvVolume / 1000) > MINIMUM_BLOOD_FOR_STABLE_VITALS) exitWith {
-            _treatmentEvent = "#waitForBlood";
+        // Check if the medic has to wait, which allows for a little multitasking
+        if (_bloodVolume + (_totalIvVolume / 1000) >= MINIMUM_BLOOD_FOR_STABLE_VITALS) then {
+            _treatmentEvent = "#waitForIV";
+            _needsIV = false;
+            _canGiveIV = false;
         };
+    };
+
+    if (_canGiveIV) exitWith {
         _treatmentEvent = QEGVAR(medical_treatment,ivBagLocal);
         _treatmentTime = 5;
-        _treatmentArgs = [_target, selectRandom ["leftarm", "rightarm", "leftleg", "rightleg"], "SalineIV"];
+        _treatmentArgs = [_target, _bodyPart, "SalineIV"];
         _treatmentItem = "@iv";
     };
-    case ((count (_target getVariable [VAR_MEDICATIONS, []])) >= 6): {
-        _treatmentEvent = "#tooManyMeds";
-    };
-    case (((_fractures select 4) == 1)
-    && {([_healer, "splint"] call FUNC(itemCheck)) # 0}): {
+
+    private _fractures = GET_FRACTURES(_target);
+
+    if (
+        ((_fractures select 4) == 1) &&
+        {([_healer, "splint"] call FUNC(itemCheck)) # 0}
+    ) exitWith {
         _treatmentEvent = QEGVAR(medical_treatment,splintLocal);
         _treatmentTime = 6;
         _treatmentArgs = [_healer, _target, "leftleg"];
         _treatmentItem = "splint";
     };
-    case (((_fractures select 5) == 1)
-    && {([_healer, "splint"] call FUNC(itemCheck)) # 0}): {
+
+    if (
+        ((_fractures select 5) == 1) &&
+        {([_healer, "splint"] call FUNC(itemCheck)) # 0}
+    ) exitWith {
         _treatmentEvent = QEGVAR(medical_treatment,splintLocal);
         _treatmentTime = 6;
         _treatmentArgs = [_healer, _target, "rightleg"];
         _treatmentItem = "splint";
     };
-    case ((IS_UNCONSCIOUS(_target) || {_heartRate <= 50})
-    && {([_healer, "epinephrine"] call FUNC(itemCheck)) # 0}): {
-        if (CBA_missionTime < (_target getVariable [QGVAR(nextEpinephrine), -1])) exitWith {
+
+    // Wait until the injured has enough blood before administering drugs
+     // (_needsIV && !_canGiveIV), but _canGiveIV is false here, otherwise IV would be given
+    if (_needsIV || {_doCPR && {_treatmentEvent == "#waitForIV"}}) exitWith {
+        // If injured is in cardiac arrest and the healer is doing nothing else, start CPR
+        if (_doCPR) exitWith {
+            _treatmentEvent = QEGVAR(medical_treatment,cprLocal); // TODO: Medic remains in this loop until injured is given enough IVs or dies
+            _treatmentArgs = [_healer, _target];
+            _treatmentTime = 15;
+        };
+
+        // If the injured needs IVs, but healer can't give it to them, have healder wait
+        if (_needsIV) exitWith {
+            _treatmentEvent = "#needsIV"; // TODO: Medic can move onto another patient
+        };
+    };
+
+    // These checks are not exitWith, so that the medic can try to bandage up tourniqueted body parts
+    if ((count (_target getVariable [VAR_MEDICATIONS, []])) >= 6) then {
+        _treatmentEvent = "#tooManyMeds"; // TODO: Medic can move onto another patient
+    };
+
+    private _heartRate = GET_HEART_RATE(_target);
+    private _canGiveEpinephrine = !(_treatmentEvent in ["#tooManyMeds", "#waitForIV"]) &&
+                                  {IS_UNCONSCIOUS(_target) || {_heartRate <= 50}} &&
+                                  {([_healer, "epinephrine"] call FUNC(itemCheck)) # 0};
+
+    // This allows for some multitasking
+    if (_canGiveEpinephrine) then {
+        if (CBA_missionTime < (_target getVariable [QGVAR(nextEpinephrine), -1])) then {
             _treatmentEvent = "#waitForEpinephrineToTakeEffect";
+            _canGiveEpinephrine = false;
         };
-        if (_heartRate > 180) exitWith {
-            _treatmentEvent = "#waitForSlowerHeart";
+
+        if (_heartRate > 180) then {
+            _treatmentEvent = "#waitForSlowerHeart"; // TODO: Medic can move onto another patient, after X amount of time of high HR
+            _canGiveEpinephrine = false;
         };
+    };
+
+    if (_canGiveEpinephrine) exitWith {
+        // If all limbs are tourniqueted, bandage the one with the least amount of wounds, so that the tourniquet can be removed
+        _bodyPart = call _fnc_findNoTourniquet;
+
+        if (_bodyPart == "") exitWith {};
+
         _target setVariable [QGVAR(nextEpinephrine), CBA_missionTime + 10];
         _treatmentEvent = QEGVAR(medical_treatment,medicationLocal);
         _treatmentTime = 2.5;
-        _treatmentArgs = [_target, selectRandom ["leftarm", "rightarm", "leftleg", "rightleg"], "Epinephrine"];
+        _treatmentArgs = [_target, _bodyPart, "Epinephrine"];
         _treatmentItem = "epinephrine";
     };
-    case (((GET_PAIN_PERCEIVED(_target) > 0.25) || {_heartRate >= 180})
-    && {([_healer, "morphine"] call FUNC(itemCheck)) # 0}): {
+
+    // Remove all remaining tourniquets by bandaging all body parts
+    if (_tourniquets isNotEqualTo DEFAULT_TOURNIQUET_VALUES) then {
+        true call _fnc_removeTourniquet;
+    };
+
+    // If the healer can bandage or remove tourniquets, do that
+    if (_treatmentEvent in [QEGVAR(medical_treatment,bandageLocal), QGVAR(tourniquetRemove)]) exitWith {};
+
+    // Otherwise, if the healer is either done or out of bandages, continue
+    if (
+        !(_treatmentEvent in ["#tooManyMeds", "#waitForIV"]) &&
+        {(GET_PAIN_PERCEIVED(_target) > 0.25) || {_heartRate >= 180}} &&
+        {([_healer, "morphine"] call FUNC(itemCheck)) # 0}
+    ) exitWith {
         if (CBA_missionTime < (_target getVariable [QGVAR(nextMorphine), -1])) exitWith {
             _treatmentEvent = "#waitForMorphineToTakeEffect";
         };
         if (_heartRate < 60) exitWith {
-            _treatmentEvent = "#waitForFasterHeart";
+            _treatmentEvent = "#waitForFasterHeart"; // TODO: Medic can move onto another patient, after X amount of time of low HR
         };
+
+        // If all limbs are tourniqueted, bandage the one with the least amount of wounds, so that the tourniquet can be removed
+        _bodyPart = call _fnc_findNoTourniquet;
+
+        if (_bodyPart == "") exitWith {};
+
         _target setVariable [QGVAR(nextMorphine), CBA_missionTime + 30];
         _treatmentEvent = QEGVAR(medical_treatment,medicationLocal);
         _treatmentTime = 2.5;
-        _treatmentArgs = [_target, selectRandom ["leftarm", "rightarm", "leftleg", "rightleg"], "Morphine"];
+        _treatmentArgs = [_target, _bodyPart, "Morphine"];
         _treatmentItem = "morphine";
     };
 };
@@ -137,10 +375,16 @@ switch (true) do {
 _healer setVariable [QGVAR(currentTreatment), [CBA_missionTime + _treatmentTime, _target, _treatmentEvent, _treatmentArgs, _treatmentItem]];
 
 // Play animation
-if ((_treatmentEvent select [0,1]) != "#") then {
-    private _treatmentClassname = _treatmentArgs select 2;
-    if (_treatmentEvent == QEGVAR(medical_treatment,splintLocal)) then { _treatmentClassname = "Splint" };
-    [_healer, _treatmentClassname, (_healer == _target)] call FUNC(playTreatmentAnim);
+if ((_treatmentEvent select [0, 1]) != "#") then {
+    private _treatmentClassname = switch (_treatmentEvent) do {
+        case QEGVAR(medical_treatment,splintLocal): {"Splint"};
+        case QEGVAR(medical_treatment,cprLocal): {"CPR"};
+        case QEGVAR(medical_treatment,tourniquetLocal): {"ApplyTourniquet"};
+        case QGVAR(tourniquetRemove): {"RemoveTourniquet"};
+        default {_treatmentArgs select 2};
+    };
+
+    [_healer, _treatmentClassname, _healer == _target] call FUNC(playTreatmentAnim);
 };
 
 #ifdef DEBUG_MODE_FULL
diff --git a/addons/medical_ai/functions/fnc_isInjured.sqf b/addons/medical_ai/functions/fnc_isInjured.sqf
index a163a4c808..2a4b689514 100644
--- a/addons/medical_ai/functions/fnc_isInjured.sqf
+++ b/addons/medical_ai/functions/fnc_isInjured.sqf
@@ -10,7 +10,7 @@
  * Does unit need treatment <BOOL>
  *
  * Example:
- * player call ACE_medical_ai_fnc_isInjured
+ * cursorObject call ace_medical_ai_fnc_isInjured
  *
  * Public: No
  */
@@ -24,3 +24,4 @@ if !(alive _this) exitWith {false};
     private _fractures = GET_FRACTURES(_this);
     ((_fractures select 4) == 1) || {(_fractures select 5) == 1}
 }
+|| { GET_TOURNIQUETS(_this) isNotEqualTo DEFAULT_TOURNIQUET_VALUES }
diff --git a/addons/medical_ai/functions/fnc_isSafe.sqf b/addons/medical_ai/functions/fnc_isSafe.sqf
index 04da058ce0..21d59a15d6 100644
--- a/addons/medical_ai/functions/fnc_isSafe.sqf
+++ b/addons/medical_ai/functions/fnc_isSafe.sqf
@@ -10,7 +10,7 @@
  * Is unit safe enough <BOOL>
  *
  * Example:
- * call ACE_medical_ai_fnc_isSafe
+ * cursorObject call ace_medical_ai_fnc_isSafe
  *
  * Public: No
  */
diff --git a/addons/medical_ai/functions/fnc_itemCheck.sqf b/addons/medical_ai/functions/fnc_itemCheck.sqf
index 6d91594ce4..320ae62410 100644
--- a/addons/medical_ai/functions/fnc_itemCheck.sqf
+++ b/addons/medical_ai/functions/fnc_itemCheck.sqf
@@ -1,7 +1,7 @@
 #include "..\script_component.hpp"
 /*
  * Author: PabstMirror
- * Checks if AI healer has items
+ * Checks if AI healer has items.
  *
  * Arguments:
  * 0: Healer <OBJECT>
@@ -13,7 +13,7 @@
  * 2: Treatment <STRING> (Optional)
  *
  * Example:
- * [cursorObject, "@bandage"] call ACE_medical_ai_fnc_itemCheck
+ * [cursorObject, "@bandage"] call ace_medical_ai_fnc_itemCheck
  *
  * Public: No
  */
diff --git a/addons/medical_ai/functions/fnc_playTreatmentAnim.sqf b/addons/medical_ai/functions/fnc_playTreatmentAnim.sqf
index b8e77aab43..9b663f65b2 100644
--- a/addons/medical_ai/functions/fnc_playTreatmentAnim.sqf
+++ b/addons/medical_ai/functions/fnc_playTreatmentAnim.sqf
@@ -12,10 +12,11 @@
  * None
  *
  * Example:
- * [bob, true, true] call ACE_medical_ai_fnc_playTreatmentAnim
+ * [cursorObject, "Splint", true] call ace_medical_ai_fnc_playTreatmentAnim
  *
  * Public: No
  */
+
 params ["_unit", "_actionName", "_isSelfTreatment"];
 TRACE_3("playTreatmentAnim",_unit,_actionName,_isSelfTreatment);
 
diff --git a/addons/medical_ai/functions/fnc_requestMedic.sqf b/addons/medical_ai/functions/fnc_requestMedic.sqf
index 9e59181204..758fa80a1f 100644
--- a/addons/medical_ai/functions/fnc_requestMedic.sqf
+++ b/addons/medical_ai/functions/fnc_requestMedic.sqf
@@ -4,21 +4,24 @@
  * Sends a request to the units assigned medic to heal it.
  *
  * Arguments:
- * None
+ * Unit <OBJECT>
  *
  * Return Value:
  * None
  *
  * Example:
- * call ACE_medical_ai_fnc_requestMedic
+ * cursorObject call ace_medical_ai_fnc_requestMedic
  *
  * Public: No
  */
 
 private _assignedMedic = _this getVariable QGVAR(assignedMedic);
 private _healQueue = _assignedMedic getVariable [QGVAR(healQueue), []];
-_healQueue pushBack _this;
-_assignedMedic setVariable [QGVAR(healQueue), _healQueue];
+
+// Only update if it was actually changed
+if (_healQueue pushBackUnique _this != -1) then {
+    _assignedMedic setVariable [QGVAR(healQueue), _healQueue];
+};
 
 #ifdef DEBUG_MODE_FULL
     systemChat format ["%1 requested %2 for medical treatment", _this, _assignedMedic];
diff --git a/addons/medical_ai/functions/fnc_wasRequested.sqf b/addons/medical_ai/functions/fnc_wasRequested.sqf
index 3b6c1cf059..ffb9aa3780 100644
--- a/addons/medical_ai/functions/fnc_wasRequested.sqf
+++ b/addons/medical_ai/functions/fnc_wasRequested.sqf
@@ -4,13 +4,13 @@
  * Checks if the unit was requested to treat another unit.
  *
  * Arguments:
- * None
+ * Unit <OBJECT>
  *
  * Return Value:
  * Was requested <BOOL>
  *
  * Example:
- * call ACE_medical_ai_fnc_wasRequested
+ * cursorObject call ace_medical_ai_fnc_wasRequested
  *
  * Public: No
  */
diff --git a/addons/medical_ai/initSettings.inc.sqf b/addons/medical_ai/initSettings.inc.sqf
index a2b06519a4..b8ff7e6134 100644
--- a/addons/medical_ai/initSettings.inc.sqf
+++ b/addons/medical_ai/initSettings.inc.sqf
@@ -1,7 +1,8 @@
 private _categoryArray = [ELSTRING(medical,Category), "STR_TEAM_SWITCH_AI"];
 
 [
-    QGVAR(enabledFor), "LIST",
+    QGVAR(enabledFor),
+    "LIST",
     [LLSTRING(enableFor_title), LLSTRING(enableFor_desc)],
     _categoryArray,
     [
@@ -15,7 +16,8 @@ private _categoryArray = [ELSTRING(medical,Category), "STR_TEAM_SWITCH_AI"];
 ] call CBA_fnc_addSetting;
 
 [
-    QGVAR(requireItems), "LIST",
+    QGVAR(requireItems),
+    "LIST",
     [LSTRING(requireItems_title), LSTRING(requireItems_desc)],
     _categoryArray,
     [
@@ -24,16 +26,6 @@ private _categoryArray = [ELSTRING(medical,Category), "STR_TEAM_SWITCH_AI"];
         0
     ],
     true, // isGlobal
-    {
-        if (GVAR(requireItems) != 2) exitWith {};
-        ["CAManBase", "initPost", {
-            [{
-                params ["_unit"];
-                if ((!local _unit) || {!alive _unit} || {isPlayer _unit}) exitWith {};
-                TRACE_2("replacing medical items on AI",_unit,typeOf _unit);
-                [_unit] call EFUNC(common,replaceRegisteredItems);
-            }, _this] call CBA_fnc_execNextFrame; // need to delay a frame before modifying items in a backpack 
-        }, nil, [IGNORE_BASE_UAVPILOTS], true] call CBA_fnc_addClassEventHandler;
-    },
+    {[QGVAR(requireItems), _this] call EFUNC(common,cbaSettings_settingChanged)},
     true // Needs mission restart
 ] call CBA_fnc_addSetting;
diff --git a/addons/medical_ai/stateMachine.inc.sqf b/addons/medical_ai/stateMachine.inc.sqf
index 03483f4981..73b82f98a9 100644
--- a/addons/medical_ai/stateMachine.inc.sqf
+++ b/addons/medical_ai/stateMachine.inc.sqf
@@ -17,13 +17,8 @@ GVAR(stateMachine) = [{call EFUNC(common,getLocalUnits)}, true] call CBA_statema
     #endif
 }, {}, {}, "Safe"] call CBA_statemachine_fnc_addState;
 
-[GVAR(stateMachine), LINKFUNC(healSelf), {}, {
-    _this setVariable [QGVAR(treatmentOverAt), nil];
-}, "HealSelf"] call CBA_statemachine_fnc_addState;
-
-[GVAR(stateMachine), LINKFUNC(healUnit), {}, {
-    _this setVariable [QGVAR(treatmentOverAt), nil];
-}, "HealUnit"] call CBA_statemachine_fnc_addState;
+[GVAR(stateMachine), LINKFUNC(healSelf), {}, {}, "HealSelf"] call CBA_statemachine_fnc_addState;
+[GVAR(stateMachine), LINKFUNC(healUnit), {}, {}, "HealUnit"] call CBA_statemachine_fnc_addState;
 
 // Add Transistions [statemachine, originalState, targetState, condition, onTransition, name]
 [GVAR(stateMachine), "Initial", "Injured", LINKFUNC(isInjured), {}, "Injured"] call CBA_statemachine_fnc_addTransition;
diff --git a/addons/medical_blood/XEH_postInit.sqf b/addons/medical_blood/XEH_postInit.sqf
index daf4595584..b08921b441 100644
--- a/addons/medical_blood/XEH_postInit.sqf
+++ b/addons/medical_blood/XEH_postInit.sqf
@@ -1,7 +1,5 @@
 #include "script_component.hpp"
 
-GVAR(useAceMedical) = ["ace_medical"] call EFUNC(common,isModLoaded);
-
 // To support public API regardless of component settings
 [QGVAR(spurt), LINKFUNC(spurt)] call CBA_fnc_addEventHandler;
 
diff --git a/addons/medical_blood/XEH_preInit.sqf b/addons/medical_blood/XEH_preInit.sqf
index 852b4dbe73..93da039be5 100644
--- a/addons/medical_blood/XEH_preInit.sqf
+++ b/addons/medical_blood/XEH_preInit.sqf
@@ -8,22 +8,8 @@ PREP_RECOMPILE_END;
 
 #include "initSettings.inc.sqf"
 
-// Damage types which do not cause blood spurts
-GVAR(noBloodDamageTypes) = createHashMapFromArray (call (uiNamespace getVariable QGVAR(noBloodDamageTypes)));
-
 // blood object model namespace
-GVAR(models) = [] call CBA_fnc_createNamespace;
-
-{
-    _x params ["_name", "_model"];
-
-    // createSimpleObject expects a path without the leading slash
-    if ((_model select [0,1]) isEqualTo "\") then {
-        _model = _model select [1];
-    };
-
-    GVAR(models) setVariable [_name, _model];
-} forEach [
+GVAR(models) = createHashMapFromArray [
     // higher number means bigger model
     ["blooddrop_1", QPATHTOF(data\ace_drop_1.p3d)],
     ["blooddrop_2", QPATHTOF(data\ace_drop_2.p3d)],
diff --git a/addons/medical_blood/XEH_preStart.sqf b/addons/medical_blood/XEH_preStart.sqf
index d051879f3c..e2683ff586 100644
--- a/addons/medical_blood/XEH_preStart.sqf
+++ b/addons/medical_blood/XEH_preStart.sqf
@@ -4,7 +4,4 @@
 
 // Damage types which do not cause blood spurts
 private _noBloodDamageTypes = "getNumber (_x >> 'noBlood') == 1" configClasses (configFile >> "ACE_Medical_Injuries" >> "damageTypes");
-uiNamespace setVariable [
-    QGVAR(noBloodDamageTypes),
-    compileFinal str (_noBloodDamageTypes apply {[configName _x, nil]})
-];
+uiNamespace setVariable [QGVAR(noBloodDamageTypes), compileFinal (_noBloodDamageTypes createHashMapFromArray [])];
diff --git a/addons/medical_blood/functions/fnc_createBlood.sqf b/addons/medical_blood/functions/fnc_createBlood.sqf
index e6740ef459..fbff6cc3c6 100644
--- a/addons/medical_blood/functions/fnc_createBlood.sqf
+++ b/addons/medical_blood/functions/fnc_createBlood.sqf
@@ -21,7 +21,7 @@
 params ["_type", "_position", "_source"];
 TRACE_3("Creating blood",_type,_position,_source);
 
-private _model = GVAR(models) getVariable _type;
+private _model = GVAR(models) get _type;
 
 private _bloodDrop = createSimpleObject [_model, [0, 0, 0]];
 _bloodDrop setDir random 360;
diff --git a/addons/medical_blood/functions/fnc_handleWoundReceived.sqf b/addons/medical_blood/functions/fnc_handleWoundReceived.sqf
index 8b46233af2..53d5d2361b 100644
--- a/addons/medical_blood/functions/fnc_handleWoundReceived.sqf
+++ b/addons/medical_blood/functions/fnc_handleWoundReceived.sqf
@@ -22,7 +22,7 @@ params ["_unit", "_allDamages", "_shooter", "_damageType"];
 (_allDamages select 0) params ["_damage"];
 
 // Don't bleed if damage type does not cause bleeding
-if (_damageType in GVAR(noBloodDamageTypes)) exitWith {};
+if (_damageType in (uiNamespace getVariable QGVAR(noBloodDamageTypes))) exitWith {};
 
 // Don't bleed when players only and a non-player unit is wounded
 if (GVAR(enabledFor) == BLOOD_ONLY_PLAYERS && {!isPlayer _unit && {_unit != ACE_player}}) exitWith {};
diff --git a/addons/medical_blood/functions/fnc_isBleeding.sqf b/addons/medical_blood/functions/fnc_isBleeding.sqf
index 2d57dcf73b..a21a50913a 100644
--- a/addons/medical_blood/functions/fnc_isBleeding.sqf
+++ b/addons/medical_blood/functions/fnc_isBleeding.sqf
@@ -17,7 +17,7 @@
 
 params ["_unit"];
 
-if (GVAR(useAceMedical)) exitWith {
+if (GETEGVAR(medical,enabled,false)) exitWith {
     IS_BLEEDING(_unit);
 };
 
diff --git a/addons/medical_blood/functions/fnc_onBleeding.sqf b/addons/medical_blood/functions/fnc_onBleeding.sqf
index 02ddd93fd0..4963aaa21d 100644
--- a/addons/medical_blood/functions/fnc_onBleeding.sqf
+++ b/addons/medical_blood/functions/fnc_onBleeding.sqf
@@ -25,7 +25,7 @@ if !(_unit call FUNC(isBleeding)) exitWith {};
 if (!isNull objectParent _unit && {!(vehicle _unit isKindOf "StaticWeapon")}) exitWith {};
 
 if (CBA_missionTime > (_unit getVariable [QGVAR(nextTime), -10])) then {
-    private _bloodLoss = (if (GVAR(useAceMedical)) then {GET_BLOOD_LOSS(_unit) * 2.5} else {getDammage _unit * 2}) min 6;
+    private _bloodLoss = ([damage _unit * 2, GET_BLOOD_LOSS(_unit) * 2.5] select GETEGVAR(medical,enabled,false)) min 6;
     _unit setVariable [QGVAR(nextTime), CBA_missionTime + 8 + random 2 - _bloodLoss];
 
     TRACE_2("Creating blood drop for bleeding unit",_unit,_bloodLoss);
diff --git a/addons/medical_blood/stringtable.xml b/addons/medical_blood/stringtable.xml
index a63de99ea0..3167b38ef2 100644
--- a/addons/medical_blood/stringtable.xml
+++ b/addons/medical_blood/stringtable.xml
@@ -27,7 +27,7 @@
             <Italian>Abilita Chiazze di Sangue</Italian>
             <Chinesesimp>开启血液滴落效果</Chinesesimp>
             <Chinese>開啟血液滴落效果</Chinese>
-            <Russian>Разрешить капли крови</Russian>
+            <Russian>Вкл. капли крови</Russian>
             <Portuguese>Permitir gotas de sangue</Portuguese>
             <Czech>Povolit kapky krve</Czech>
             <Spanish>Habilitar manchas de sangre</Spanish>
@@ -37,7 +37,7 @@
             <English>Enables the creation of blood drops when units are bleeding or take damage.</English>
             <Japanese>ユニットが出血や負傷した時に、血痕を残すようにします。</Japanese>
             <French>Si une unité saigne, elle laissera des traces de sang derrière elle.</French>
-            <Russian>Разрешает создание капель крови при кровотечении или получении урона</Russian>
+            <Russian>Включает создание капель крови при кровотечении или получении урона</Russian>
             <Portuguese>Permitir a criação de gotas de sangue quando as unidades recebem ferimentos ou estão sangrando.</Portuguese>
             <Chinesesimp>当单位失血或受伤的时，启用出血效果。</Chinesesimp>
             <Chinese>啟用出血效果當單位失血或受傷的時候。</Chinese>
diff --git a/addons/medical_damage/stringtable.xml b/addons/medical_damage/stringtable.xml
index 3f274dd37a..fa4e1c4ae4 100644
--- a/addons/medical_damage/stringtable.xml
+++ b/addons/medical_damage/stringtable.xml
@@ -36,7 +36,7 @@
             <English>AI Critical Damage Threshold</English>
             <Japanese>AIのクリティカルダメージしきい値</Japanese>
             <French>Seuil de dégât critique de l'IA</French>
-            <Russian>Порог критического урона AI</Russian>
+            <Russian>Порог критического урона ИИ</Russian>
             <Portuguese>Limite de Dano Crítico da IA</Portuguese>
             <Chinese>AI重擊承受量</Chinese>
             <Chinesesimp>AI 临界伤害阈值</Chinesesimp>
diff --git a/addons/medical_engine/XEH_postInit.sqf b/addons/medical_engine/XEH_postInit.sqf
index 2514c62254..ed66091498 100644
--- a/addons/medical_engine/XEH_postInit.sqf
+++ b/addons/medical_engine/XEH_postInit.sqf
@@ -6,27 +6,23 @@
     [_new] call FUNC(updateDamageEffects); // Run on new controlled unit to update QGVAR(aimFracture)
 }, true] call CBA_fnc_addPlayerEventHandler;
 
-
 ["CAManBase", "init", {
     params ["_unit"];
 
-    // Check if last hit point is our dummy.
-    private _allHitPoints = getAllHitPointsDamage _unit param [0, []];
-    reverse _allHitPoints;
-    while {(_allHitPoints param [0, ""]) select [0,1] == "#"} do { WARNING_1("Ignoring Reflector hitpoint %1",_allHitPoints deleteAt 0); };
+    if (unitIsUAV _unit) exitWith {TRACE_1("ignore UAV AI",typeOf _unit);};
+    if (getNumber (configOf _unit >> "isPlayableLogic") == 1) exitWith {TRACE_1("ignore logic unit",typeOf _unit);};
 
-    if (_allHitPoints param [0, ""] != "ACE_HDBracket") then {
-        if (unitIsUAV _unit) exitWith {TRACE_1("ignore UAV AI",typeOf _unit);};
-        if (getNumber ((configOf _unit) >> "isPlayableLogic") == 1) exitWith {TRACE_1("ignore logic unit",typeOf _unit)};
+    private _allHitPoints = getAllHitPointsDamage _unit param [0, []];
+    if ((GVAR(customHitpoints) arrayIntersect _allHitPoints) isNotEqualTo GVAR(customHitpoints)) exitWith {
         ERROR_1("Bad hitpoints for unit type ""%1""",typeOf _unit);
-    } else {
-        // Calling this function inside curly brackets allows the usage of
-        // "exitWith", which would be broken with "HandleDamage" otherwise.
-        _unit setVariable [
-            QEGVAR(medical,HandleDamageEHID),
-            _unit addEventHandler ["HandleDamage", {_this call FUNC(handleDamage)}]
-        ];
     };
+
+    // Calling this function inside curly brackets allows the usage of
+    // "exitWith", which would be broken with "HandleDamage" otherwise.
+    _unit setVariable [
+        QEGVAR(medical,HandleDamageEHID),
+        _unit addEventHandler ["HandleDamage", {_this call FUNC(handleDamage)}]
+    ];
 }, nil, [IGNORE_BASE_UAVPILOTS], true] call CBA_fnc_addClassEventHandler;
 
 #ifdef DEBUG_MODE_FULL
@@ -88,7 +84,7 @@
     };
 }] call CBA_fnc_addEventHandler;
 
-["CAManBase", "deleted", {
+["CAManBase", "Deleted", {
     params ["_unit"];
     TRACE_3("unit deleted",_unit,objectParent _unit,local _unit);
     if ((!isNull objectParent _unit) && {local objectParent _unit}) then {
diff --git a/addons/medical_engine/XEH_preInit.sqf b/addons/medical_engine/XEH_preInit.sqf
index b0304f167f..035b9f4b05 100644
--- a/addons/medical_engine/XEH_preInit.sqf
+++ b/addons/medical_engine/XEH_preInit.sqf
@@ -40,11 +40,14 @@ GVAR(armorCache) = createHashMap;
 // with handle damage not returning full results.
 GVAR(fixedStatics) = [];
 
-GVAR(animations) = [] call CBA_fnc_createNamespace;
-GVAR(animations) setVariable [QUNCON_ANIM(faceUp), [QUNCON_ANIM(2),QUNCON_ANIM(2_1),QUNCON_ANIM(7_1),QUNCON_ANIM(8_1),QUNCON_ANIM(5_1),QUNCON_ANIM(6_1)]];
-GVAR(animations) setVariable [QUNCON_ANIM(faceDown), [QUNCON_ANIM(1),QUNCON_ANIM(3),QUNCON_ANIM(4),"unconscious",QUNCON_ANIM(9),QUNCON_ANIM(3_1),QUNCON_ANIM(4_1)]];
-GVAR(animations) setVariable [QUNCON_ANIM(faceLeft), [QUNCON_ANIM(7),QUNCON_ANIM(8),QUNCON_ANIM(1_1),QUNCON_ANIM(7_1),QUNCON_ANIM(8_1)]];
-GVAR(animations) setVariable [QUNCON_ANIM(faceRight), [QUNCON_ANIM(5),QUNCON_ANIM(6),QUNCON_ANIM(10),QUNCON_ANIM(5_1),QUNCON_ANIM(6_1)]];
+GVAR(animations) = createHashMapFromArray [
+    [toLowerANSI QUNCON_ANIM(faceUp), [QUNCON_ANIM(2),QUNCON_ANIM(2_1),QUNCON_ANIM(7_1),QUNCON_ANIM(8_1),QUNCON_ANIM(5_1),QUNCON_ANIM(6_1)]],
+    [toLowerANSI QUNCON_ANIM(faceDown), [QUNCON_ANIM(1),QUNCON_ANIM(3),QUNCON_ANIM(4),"unconscious",QUNCON_ANIM(9),QUNCON_ANIM(3_1),QUNCON_ANIM(4_1)]],
+    [toLowerANSI QUNCON_ANIM(faceLeft), [QUNCON_ANIM(7),QUNCON_ANIM(8),QUNCON_ANIM(1_1),QUNCON_ANIM(7_1),QUNCON_ANIM(8_1)]],
+    [toLowerANSI QUNCON_ANIM(faceRight), [QUNCON_ANIM(5),QUNCON_ANIM(6),QUNCON_ANIM(10),QUNCON_ANIM(5_1),QUNCON_ANIM(6_1)]]
+];
+
+GVAR(customHitpoints) = ["hitleftarm", "hitrightarm", "hitleftleg", "hitrightleg"];
 
 private _fnc_fixStatic = {
     params ["_vehicle"];
@@ -84,4 +87,7 @@ addMissionEventHandler ["Loaded", {
 
 [] call FUNC(disableThirdParty);
 
+// Future-proofing
+EGVAR(medical,enabled) = true; // TODO: remove when medical enable setting is implemented
+
 ADDON = true;
diff --git a/addons/medical_engine/functions/fnc_applyAnimAfterRagdoll.sqf b/addons/medical_engine/functions/fnc_applyAnimAfterRagdoll.sqf
index db522b2bf7..726a606344 100644
--- a/addons/medical_engine/functions/fnc_applyAnimAfterRagdoll.sqf
+++ b/addons/medical_engine/functions/fnc_applyAnimAfterRagdoll.sqf
@@ -23,7 +23,7 @@ if !(IS_UNCONSCIOUS(_unit) &&                   // do not run if unit is conscio
     {alive _unit &&                             // do not run if unit is dead
     {isNull objectParent _unit}}) exitWith {};  // do not run if unit in any vehicle
 
-private _animsArray = GVAR(animations) getVariable [_anim, [""]];
+private _animsArray = GVAR(animations) getOrDefault [toLowerANSI _anim, [""]];
 private _random = (toArray (hashValue _unit)) param [0, 0];
 private _index = _random % (count _animsArray);
 private _unconsciousAnimation = _animsArray select _index;
diff --git a/addons/medical_engine/functions/fnc_handleDamage.sqf b/addons/medical_engine/functions/fnc_handleDamage.sqf
index a60816222f..168203366c 100644
--- a/addons/medical_engine/functions/fnc_handleDamage.sqf
+++ b/addons/medical_engine/functions/fnc_handleDamage.sqf
@@ -1,9 +1,9 @@
 #include "..\script_component.hpp"
 /*
- * Author: commy2, kymckay
+ * Author: commy2, kymckay, LinkIsGrim
  * HandleDamage EH where wound events are raised based on incoming damage.
  * Be aware that for each source of damage, the EH can fire multiple times (once for each hitpoint).
- * We store these incoming damages and compare them on our final hitpoint: "ace_hdbracket".
+ * We store these incoming damages and compare them on last iteration of the event (_context == 2).
  *
  * Arguments:
  * Handle damage EH
@@ -13,15 +13,16 @@
  *
  * Public: No
  */
-params ["_unit", "_selection", "_damage", "_shooter", "_ammo", "_hitPointIndex", "_instigator", "_hitpoint"];
+params ["_unit", "_selection", "_damage", "_shooter", "_ammo", "_hitPointIndex", "_instigator", "_hitpoint", "_directHit", "_context"];
 
 // HD sometimes triggers for remote units - ignore.
 if !(local _unit) exitWith {nil};
 
 // Get missing meta info
 private _oldDamage = 0;
+private _structuralDamage = _context == 0;
 
-if (_hitPoint isEqualTo "") then {
+if (_structuralDamage) then {
     _hitPoint = "#structural";
     _oldDamage = damage _unit;
 } else {
@@ -33,26 +34,29 @@ if !(isDamageAllowed _unit && {_unit getVariable [QEGVAR(medical,allowDamage), t
 
 private _newDamage = _damage - _oldDamage;
 
-// Happens occasionally for vehiclehit events (see line 80 onwards)
-// Just exit early to save some frametime
-if (_newDamage == 0 && {_hitpoint isNotEqualTo "ace_hdbracket"}) exitWith {_oldDamage};
+// _newDamage == 0 happens occasionally for vehiclehit events (see line 80 onwards), just exit early to save some frametime
+// context 4 is engine "bleeding". For us, it's just a duplicate event for #structural which we can ignore without any issues
+if (_context != 2 && {_context == 4 || _newDamage == 0}) exitWith {
+    TRACE_4("Skipping engine bleeding or zero damage",_ammo,_newDamage,_directHit,_context);
+    _oldDamage
+};
 
 // Get scaled armor value of hitpoint and calculate damage before armor
 // We scale using passThrough to handle explosive-resistant armor properly (#9063)
 // We need realDamage to determine which limb was hit correctly
 [_unit, _hitpoint] call FUNC(getHitpointArmor) params ["_armor", "_armorScaled"];
 private _realDamage = _newDamage * _armor;
-if (_hitPoint isNotEqualTo "#structural") then {
+if (!_structuralDamage) then {
     private _armorCoef = _armor/_armorScaled;
     private _damageCoef = linearConversion [0, 1, GVAR(damagePassThroughEffect), 1, _armorCoef];
     _newDamage = _newDamage * _damageCoef;
 };
-TRACE_4("Received hit",_hitpoint,_ammo,_newDamage,_realDamage);
+TRACE_6("Received hit",_hitpoint,_ammo,_newDamage,_realDamage,_directHit,_context);
 
-// Drowning doesn't fire the EH for each hitpoint so the "ace_hdbracket" code never runs
+// Drowning doesn't fire the EH for each hitpoint and never triggers _context=2 (LastHitPoint)
 // Damage occurs in consistent increments
 if (
-    _hitPoint isEqualTo "#structural" &&
+    _structuralDamage &&
     {getOxygenRemaining _unit <= 0.5} &&
     {_damage isEqualTo (_oldDamage + 0.005)}
 ) exitWith {
@@ -64,14 +68,14 @@ if (
 
 // Faster than (vehicle _unit), also handles dead units
 private _vehicle = objectParent _unit;
+private _inVehicle = !isNull _vehicle;
+private _environmentDamage = _ammo == "";
 
-// Crashing a vehicle doesn't fire the EH for each hitpoint so the "ace_hdbracket" code never runs
+// Crashing a vehicle doesn't fire the EH for each hitpoint and never triggers _context=2 (LastHitPoint)
 // It does fire the EH multiple times, but this seems to scale with the intensity of the crash
 if (
     EGVAR(medical,enableVehicleCrashes) &&
-    {_hitPoint isEqualTo "#structural"} &&
-    {_ammo isEqualTo ""} &&
-    {!isNull _vehicle} &&
+    {_environmentDamage && _inVehicle && _structuralDamage} &&
     {vectorMagnitude (velocity _vehicle) > 5}
     // todo: no way to detect if stationary and another vehicle hits you
 ) exitWith {
@@ -83,11 +87,8 @@ if (
 
 // Receiving explosive damage inside a vehicle doesn't trigger for each hitpoint
 // This is the case for mines, explosives, artillery, and catasthrophic vehicle explosions
-// Triggers twice, but that doesn't matter as damage is low
 if (
-    _hitPoint isEqualTo "#structural" &&
-    {!isNull _vehicle} &&
-    {_ammo isNotEqualTo ""} &&
+    (!_environmentDamage && _inVehicle && _structuralDamage) &&
     {
         private _ammoCfg = configFile >> "CfgAmmo" >> _ammo;
         GET_NUMBER(_ammoCfg >> "explosive",0) > 0 ||
@@ -104,9 +105,13 @@ if (
     0
 };
 
-// This hitpoint is set to trigger last, evaluate all the stored damage values
-// to determine where wounds are applied
-if (_hitPoint isEqualTo "ace_hdbracket") exitWith {
+// Damages are stored for last iteration of the HandleDamage event (_context == 2)
+_unit setVariable [format [QGVAR($%1), _hitPoint], [_realDamage, _newDamage]];
+
+// Ref https://community.bistudio.com/wiki/Arma_3:_Event_Handlers#HandleDamage
+// Context 2 means this is the last iteration of HandleDamage, so figure out which hitpoint took the most real damage and send wound event
+// Don't exit, as the last iteration can be one of the hitpoints that we need to keep _oldDamage for
+if (_context == 2) then {
     _unit setVariable [QEGVAR(medical,lastDamageSource), _shooter];
     _unit setVariable [QEGVAR(medical,lastInstigator), _instigator];
 
@@ -157,7 +162,7 @@ if (_hitPoint isEqualTo "ace_hdbracket") exitWith {
 
     // Environmental damage sources all have empty ammo string
     // No explicit source given, we infer from differences between them
-    if (_ammo isEqualTo "") then {
+    if (_environmentDamage) then {
         // Any collision with terrain/vehicle/object has a shooter
         // Check this first because burning can happen at any velocity
         if !(isNull _shooter) then {
@@ -199,16 +204,9 @@ if (_hitPoint isEqualTo "ace_hdbracket") exitWith {
         QGVAR($HitLeftArm),QGVAR($HitRightArm),QGVAR($HitLeftLeg),QGVAR($HitRightLeg),
         QGVAR($#structural)
     ];
-
-    0
 };
 
-// Damages are stored for "ace_hdbracket" event triggered last
-_unit setVariable [format [QGVAR($%1), _hitPoint], [_realDamage, _newDamage]];
-
 // Engine damage to these hitpoints controls blood visuals, limping, weapon sway
 // Handled in fnc_damageBodyPart, persist here
-if (_hitPoint in ["hithead", "hitbody", "hithands", "hitlegs"]) exitWith {_oldDamage};
-
-// We store our own damage values so engine damage is unnecessary
-0
+// For all other hitpoints, we store our own damage values, so engine damage is unnecessary
+[0, _oldDamage] select (_hitPoint in ["hithead", "hitbody", "hithands", "hitlegs"])
diff --git a/addons/medical_engine/functions/fnc_lockUnconsciousSeat.sqf b/addons/medical_engine/functions/fnc_lockUnconsciousSeat.sqf
index cc29e75cc1..8441df4ad8 100644
--- a/addons/medical_engine/functions/fnc_lockUnconsciousSeat.sqf
+++ b/addons/medical_engine/functions/fnc_lockUnconsciousSeat.sqf
@@ -11,7 +11,6 @@
  *
  * Public: No
  */
-if (missionNamespace getVariable [QGVAR(disableSeatLocking), false]) exitWith {};
 params ["_unit"];
 
 private _vehicle = objectParent _unit;
@@ -20,6 +19,13 @@ TRACE_3("lockUnconsciousSeat",_unit,_vehicle,lifeState _unit);
 if (isNull _vehicle) exitWith {};
 if (alive _unit && {lifeState _unit != "INCAPACITATED"}) exitWith {};
 
+private _disable = missionNamespace getVariable [QGVAR(disableSeatLocking), false];
+if (_disable isEqualTo true || {
+    _disable isEqualType [] && {
+        (_disable findIf {_vehicle isKindOf _x}) != -1
+    }
+}) exitWith {};
+
 switch (true) do {
     case (_unit isEqualTo (driver _vehicle)): {
         _vehicle lockDriver true;
diff --git a/addons/medical_engine/script_macros_config.hpp b/addons/medical_engine/script_macros_config.hpp
index 611a8ad356..4c276d7b18 100644
--- a/addons/medical_engine/script_macros_config.hpp
+++ b/addons/medical_engine/script_macros_config.hpp
@@ -20,13 +20,6 @@
 // This used to take the armor values as parameters; it now inherits the values
 // of `armor`, `passThrough` and `explosionShielding` from the existing hitpoints
 // for vanilla consistency.
-// "ACE_HDBracket" is a special hit point. It is designed in a way where the
-// "HandleDamage" event handler will compute it at the end of every damage
-// calculation step. This way we can figure out which hit point took the most
-// damage from one projectile and should be receiving the ACE medical wound.
-// the hit point itself should not take any damage
-// It is important that the "ACE_HDBracket" hit point is the last in the config,
-// but has the same selection as the first one (always "HitHead" for soldiers).
 #define ADD_ACE_HITPOINTS\
     class HitLeftArm: HitHands {\
         material = -1;\
@@ -47,15 +40,4 @@
     };\
     class HitRightLeg: HitLeftLeg {\
         name = "leg_r";\
-    };\
-    class ACE_HDBracket {\
-        armor = 1;\
-        material = -1;\
-        name = "head";\
-        passThrough = 0;\
-        radius = 1;\
-        explosionShielding = 1;\
-        visual = "";\
-        minimalHit = 0;\
-        depends = "HitHead";\
     }
diff --git a/addons/medical_feedback/functions/fnc_playInjuredSound.sqf b/addons/medical_feedback/functions/fnc_playInjuredSound.sqf
index c278e6e08a..b33b533e25 100644
--- a/addons/medical_feedback/functions/fnc_playInjuredSound.sqf
+++ b/addons/medical_feedback/functions/fnc_playInjuredSound.sqf
@@ -6,8 +6,11 @@
  *
  * Arguments:
  * 0: Unit <OBJECT>
- * 1: Type (optional) ["hit" (default) or "moan"] <STRING>
- * 2: Severity (optional) [0 (default), 1, 2] <NUMBER>
+ * 1: Type ["hit", "moan"] <STRING> (default: "hit")
+ * 2: Severity [0, 1, 2] <NUMBER> (default: 0)
+ * 3: Hit sound distances <ARRAY> (default: [50, 60, 70])
+ * 4: Moan sound distances <ARRAY> (default: [10, 15, 20])
+ * 5: Allow unconscious units <BOOL> (default: false)
  *
  * Return Value:
  * None
@@ -20,18 +23,18 @@
 #define TIME_OUT_HIT 1
 #define TIME_OUT_MOAN [12, 7.5, 5]
 
-params [["_unit", objNull, [objNull]], ["_type", "hit", [""]], ["_severity", 0, [0]]];
+params [["_unit", objNull, [objNull]], ["_type", "hit", [""]], ["_severity", 0, [0]], ["_hitDistances", [50, 60, 70], [[]], [3]], ["_moanDistances", [10, 15, 20], [[]], [3]], ["_allowUnconscious", false, [true]]];
 // TRACE_3("",_unit,_type,_severity);
 
 if (!local _unit) exitWith { ERROR_2("playInjuredSound: Unit not local or null [%1:%2]",_unit,typeOf _unit); };
 
-if !(_unit call EFUNC(common,isAwake)) exitWith {};
+if (!_allowUnconscious && {!(_unit call EFUNC(common,isAwake))}) exitWith {};
 
 // Limit network traffic by only sending the event to players who can potentially hear it
 private _distance = if (_type == "hit") then {
-    [50, 60, 70] select _severity;
+    _hitDistances select _severity
 } else {
-    [10, 15, 20] select _severity;
+    _moanDistances select _severity
 };
 private _targets = allPlayers inAreaArray [ASLToAGL getPosASL _unit, _distance, _distance, 0, false, _distance];
 if (_targets isEqualTo []) exitWith {};
diff --git a/addons/medical_gui/XEH_postInit.sqf b/addons/medical_gui/XEH_postInit.sqf
index 5ff49d2167..2b7fb8ce52 100644
--- a/addons/medical_gui/XEH_postInit.sqf
+++ b/addons/medical_gui/XEH_postInit.sqf
@@ -21,7 +21,7 @@ GVAR(selfInteractionActions) = [];
 
 [QEGVAR(interact_menu,newControllableObject), {
     params ["_type"]; // string of the object's classname
-    if (!(_type isKindOf "CAManBase")) exitWith {};
+    if !(_type isKindOf "CAManBase") exitWith {};
     {
         _x set [0, _type];
         _x call EFUNC(interact_menu,addActionToClass);
diff --git a/addons/medical_gui/stringtable.xml b/addons/medical_gui/stringtable.xml
index b88d9cbbf1..6dfc16f9b9 100644
--- a/addons/medical_gui/stringtable.xml
+++ b/addons/medical_gui/stringtable.xml
@@ -21,7 +21,7 @@
             <English>Enable Medical Actions</English>
             <German>Aktiviere Sanitätsaktionen</German>
             <Japanese>医療インタラクションの有効化</Japanese>
-            <Russian>Разрешить Медицинские действия</Russian>
+            <Russian>Вкл. медицинские действия</Russian>
             <French>Activer les actions médicales</French>
             <Portuguese>Ativar Ações Médicas</Portuguese>
             <Chinese>啟用醫療行為</Chinese>
@@ -36,7 +36,7 @@
         <Key ID="STR_ACE_Medical_GUI_EnableActions_Description">
             <English>Enables medical actions for the Interaction Menu and selects their style.</English>
             <German>Aktiviert die Sanitätsaktionen für das Interaktionsmenü und legt das Aussehen fest</German>
-            <Japanese>インタラクションメニューから選択した表示方式で医療行為をできるようになります。</Japanese>
+            <Japanese>インタラクション メニューから選択した表示方式で医療行為をできるようになります。</Japanese>
             <Russian>Включает медицинские действия для меню взаимодействия и выбирает их стиль.</Russian>
             <French>Permet d'afficher les actions médicales dans le menu d'interaction, et de définir leur style visuel.</French>
             <Portuguese>Ativa as ações médicas para o menu de interação e seleciona seus estilos.</Portuguese>
@@ -86,7 +86,7 @@
         <Key ID="STR_ACE_Medical_GUI_EnableSelfActions_DisplayName">
             <English>Enable Medical Self Actions</English>
             <German>Medizinische Selbst-Interaktionen anzeigen</German>
-            <Japanese>医療セルフインタラクションの有効化</Japanese>
+            <Japanese>医療セルフ・インタラクションの有効化</Japanese>
             <Russian>Разрешить Медицинские действия на себе</Russian>
             <French>Activer les actions médicales sur soi-même</French>
             <Portuguese>Ativar ações médicas em si mesmo</Portuguese>
@@ -102,7 +102,7 @@
         <Key ID="STR_ACE_Medical_GUI_EnableSelfActions_Description">
             <English>Enables medical actions for the Self Interaction Menu.</English>
             <German>Medizinische Interaktionen bei Selbst-Interaktionen anzeigen</German>
-            <Japanese>セルフインタラクションメニューで医療行為をできるようになります。</Japanese>
+            <Japanese>セルフ・インタラクション メニューで医療行為をできるようになります。</Japanese>
             <Russian>Включает медицинские действия для меню взаимодействия с собой.</Russian>
             <French>Active les actions médicales du menu d'interaction personnel.</French>
             <Portuguese>Ativa as ações médicas do menu de interação pessoal.</Portuguese>
@@ -119,7 +119,7 @@
             <English>Enable Medical Menu</English>
             <German>Aktiviere das Sanitätsmenü</German>
             <Japanese>医療メニューを有効化</Japanese>
-            <Russian>Разрешить Медицинское меню</Russian>
+            <Russian>Вкл. медицинское меню</Russian>
             <French>Activer le menu médical</French>
             <Portuguese>Ativar Menu Médico</Portuguese>
             <Chinese>啟用醫療選單</Chinese>
@@ -134,7 +134,7 @@
         <Key ID="STR_ACE_Medical_GUI_EnableMedicalMenu_Description">
             <English>Enables the use of the Medical Menu through the keybind or interaction menu.</English>
             <German>Aktiviere die Nutzung des Sanitätsmenüs durch eine Tastenkombination oder durch das Interaktionsmenü</German>
-            <Japanese>割り当てられたキーかインタラクションメニューから医療メニューを使えるようになります。</Japanese>
+            <Japanese>割り当てられたキーかインタラクション メニューから医療メニューを使えるようになります。</Japanese>
             <Russian>Позволяет использовать Медицинское меню через связку клавиш или меню взаимодействия.</Russian>
             <French>Permet l'utilisation du menu médical via le menu d'interaction ou l'appui d'une touche.</French>
             <Portuguese>Ativa o uso do Menu Médico através da Tecla ou Menu de Interação.</Portuguese>
@@ -151,7 +151,7 @@
             <English>Reopen Medical Menu</English>
             <German>Sanitätsmenü wieder öffnen</German>
             <Japanese>医療メニューの再表示</Japanese>
-            <Russian>Открывать меню после лечения</Russian>
+            <Russian>Медицинское меню после лечения</Russian>
             <French>Rouvrir le menu médical</French>
             <Portuguese>Reabrir Menu Médico</Portuguese>
             <Chinese>醫療選單二度開啟</Chinese>
@@ -167,7 +167,7 @@
             <English>Reopen the Medical Menu after successful treatment.</English>
             <German>Öffne das Sanitätsmenü nach einer Behandlung</German>
             <Japanese>治療の完了後に、再度医療メニューを開きます。</Japanese>
-            <Russian>Открывает Медицинское меню после успешного лечения</Russian>
+            <Russian>Открывает медицинское меню после успешного лечения</Russian>
             <French>Réouvre le menu médical suite à l'application d'un soin.</French>
             <Portuguese>Reabrir Menu Médico após um tratamento com sucesso</Portuguese>
             <Chinese>當治療完成後二度打開醫療選單</Chinese>
@@ -217,11 +217,12 @@
             <Italian>Mostra livello di Triage nel Menù d'Interazione</Italian>
             <Japanese>インタラクションにトリアージ レベルを表示</Japanese>
             <Spanish>Mostrar nivel de triado en menú de interacción</Spanish>
-            <Russian>Показать уровень триажа в меню взаимодействия</Russian>
+            <Russian>Уровень триажа в меню взаимодействия</Russian>
             <Polish>Pokaż poziom Triażu w menu interakcji</Polish>
             <German>Zeige Triage-Einstufung im Interaktionsmenü</German>
             <Chinesesimp>在交互式菜单中显示分诊级别</Chinesesimp>
             <Korean>상호작용 메뉴에서 부상자 카드 보기</Korean>
+            <Portuguese>Mostrar Nível de Triagem no Menu de Interação</Portuguese>
         </Key>
         <Key ID="STR_ACE_Medical_GUI_InteractionMenuShowTriage_Description">
             <English>Shows the patient's triage level by changing the color of the main and medical menu actions.</English>
@@ -234,6 +235,7 @@
             <German>Zeigt die Triage-Einstufung des Patienten durch Ändern der Farbe der Aktionen des Hauptmenüs und des medizinischen Menüs an.</German>
             <Chinesesimp>通过改变主菜单和医疗菜单动作的颜色来显示伤员的分诊级别。</Chinesesimp>
             <Korean>환자의 부상자 카드를 상호작용에서 볼 수 있게 합니다.</Korean>
+            <Portuguese>Mostra o nível de triagem do paciente alterando a cor das ações do menu principal e do menu médico.</Portuguese>
         </Key>
         <Key ID="STR_ACE_Medical_GUI_Medical">
             <English>Medical</English>
@@ -294,6 +296,7 @@
             <Japanese>医療情報一時表示</Japanese>
             <Russian>Просмотр медицинской информации</Russian>
             <Spanish>Ojear Información Médica</Spanish>
+            <Portuguese>Visualização rápida das informações médicas</Portuguese>
         </Key>
         <Key ID="STR_ACE_Medical_GUI_PeekMedicalInfoReleaseDelay_DisplayName">
             <English>Medical Peek Duration</English>
@@ -305,6 +308,7 @@
             <Japanese>医療情報一時表示の表示時間</Japanese>
             <Russian>Продолжительность медицинского осмотра</Russian>
             <Spanish>Duración del Ojear Información Médica</Spanish>
+            <Portuguese>Duração da visualização geral das informações médicas</Portuguese>
         </Key>
         <Key ID="STR_ACE_Medical_GUI_PeekMedicalInfoReleaseDelay_Description">
             <English>How long the medical info peek remains open after releasing the key.</English>
@@ -316,6 +320,7 @@
             <Japanese>医療情報一時表示キーを放してからどれだけ長く情報表示するか。</Japanese>
             <Russian>Как долго окно просмотра медицинской информации остается открытым после отпускания клавиши.</Russian>
             <Spanish>Durante cuánto tiempo la información médica ojeada permanece abierta una ves se deje de apretar la tecla.</Spanish>
+            <Portuguese>Quanto tempo a visualização rápida das informações médicas permanece aberta após soltar a tecla.</Portuguese>
         </Key>
         <Key ID="STR_ACE_Medical_GUI_LoadPatient">
             <English>Load Patient</English>
@@ -570,6 +575,7 @@
             <Japanese>自分に切り替え</Japanese>
             <Russian>Переключиться на себя </Russian>
             <Spanish>Cambiar a uno mismo</Spanish>
+            <Portuguese>Trocar para si mesmo</Portuguese>
         </Key>
         <Key ID="STR_ACE_Medical_GUI_ToggleToOther">
             <English>Switch to target</English>
@@ -581,6 +587,7 @@
             <Japanese>相手に切り替え</Japanese>
             <Russian>Переключиться на цель</Russian>
             <Spanish>Cambiar al objetivo</Spanish>
+            <Portuguese>Trocar para paciente</Portuguese>
         </Key>
         <Key ID="STR_ACE_Medical_GUI_Head">
             <English>Head</English>
@@ -1008,6 +1015,7 @@
             <Japanese>出血はしていない</Japanese>
             <Russian>Кровотечения нет</Russian>
             <Spanish>Sin sangrado</Spanish>
+            <Portuguese>Sem sangramento</Portuguese>
         </Key>
         <Key ID="STR_ACE_Medical_GUI_Bleed_Rate1">
             <English>Slow bleeding</English>
@@ -1019,6 +1027,7 @@
             <Japanese>出血は穏やか</Japanese>
             <Russian>Медленное кровотечение</Russian>
             <Spanish>Sangrado lento</Spanish>
+            <Portuguese>Sangramento lento</Portuguese>
         </Key>
         <Key ID="STR_ACE_Medical_GUI_Bleed_Rate2">
             <English>Moderate bleeding</English>
@@ -1030,6 +1039,7 @@
             <Japanese>出血はそこそこ速い</Japanese>
             <Russian>Умеренное кровотечение</Russian>
             <Spanish>Sangrado moderado</Spanish>
+            <Portuguese>Sangramento moderado</Portuguese>
         </Key>
         <Key ID="STR_ACE_Medical_GUI_Bleed_Rate3">
             <English>Severe bleeding</English>
@@ -1041,6 +1051,7 @@
             <Japanese>出血は激しい</Japanese>
             <Russian>Сильное кровотечение</Russian>
             <Spanish>Sangrado severo</Spanish>
+            <Portuguese>Sangramento grave</Portuguese>
         </Key>
         <Key ID="STR_ACE_Medical_GUI_Bleed_Rate4">
             <English>Massive bleeding</English>
@@ -1052,6 +1063,7 @@
             <Japanese>出血は酷く多い</Japanese>
             <Russian>Огромное кровотечение</Russian>
             <Spanish>Sangrado masivo</Spanish>
+            <Portuguese>Sangramento massivo</Portuguese>
         </Key>
         <Key ID="STR_ACE_Medical_GUI_STATUS_PAIN">
             <English>in Pain</English>
@@ -1127,6 +1139,7 @@
             <Japanese>失血なし</Japanese>
             <Russian>Потери крови нет</Russian>
             <Spanish>Sin pérdida de sangre</Spanish>
+            <Portuguese>Sem perda de sangue</Portuguese>
         </Key>
         <!--Strings above match Blood2 but seem to differ in some languages, determine which is best to use-->
         <Key ID="STR_ACE_Medical_GUI_Lost_Blood1">
@@ -1271,6 +1284,7 @@
             <Spanish>Información de paciente</Spanish>
             <German>Patienteninformation</German>
             <Korean>환자 정보</Korean>
+            <Portuguese>Informações do paciente</Portuguese>
         </Key>
         <Key ID="STR_ACE_Medical_GUI_BloodLossColors">
             <English>Blood Loss Colors</English>
@@ -1283,6 +1297,7 @@
             <Chinesesimp>失血颜色</Chinesesimp>
             <Korean>출혈 색상</Korean>
             <Spanish>Colores de pérdida de sangre</Spanish>
+            <Portuguese>Cores de perda de sangue</Portuguese>
         </Key>
         <Key ID="STR_ACE_Medical_GUI_BloodLossColor_Description">
             <English>Defines the 10 color gradient used to indicate blood loss in Medical GUIs.</English>
@@ -1295,6 +1310,7 @@
             <Chinesesimp>失血颜色，用于医学图形用户界面。10种渐变颜色。</Chinesesimp>
             <Korean>출혈로 인한 의료 GUI의 색상을 변경합니다. 총 10가지 색상이 있습니다.</Korean>
             <Spanish>Define los 10 gradientes de color utilizados para indicar la pérdida de sangre en la interfaz gráfica del sistema Médico.</Spanish>
+            <Portuguese>Define os 10 gradientes de cores utilizados para indicar perda de sangue nas interfaces médicas.</Portuguese>
         </Key>
         <Key ID="STR_ACE_Medical_GUI_BloodLossColorX_DisplayName">
             <English>Blood Loss Color %1</English>
@@ -1307,6 +1323,7 @@
             <Chinesesimp>失血颜色 %1</Chinesesimp>
             <Korean>출혈 색상 %1</Korean>
             <Spanish>Color de pérdida de sangre %1</Spanish>
+            <Portuguese>Cor de perda de sangue %1</Portuguese>
         </Key>
         <Key ID="STR_ACE_Medical_GUI_DamageColors">
             <English>Damage Colors</English>
@@ -1319,6 +1336,7 @@
             <Chinesesimp>负伤颜色</Chinesesimp>
             <Korean>피해 색상</Korean>
             <Spanish>Colores de daño</Spanish>
+            <Portuguese>Cores de dano</Portuguese>
         </Key>
         <Key ID="STR_ACE_Medical_GUI_DamageColor_Description">
             <English>Defines the 10 color gradient used to indicate damage in Medical GUIs.</English>
@@ -1331,6 +1349,7 @@
             <Chinesesimp>负伤颜色，用于医学图形用户界面。10种渐变颜色。</Chinesesimp>
             <Korean>의료 GUI에 쓰이는 피해 색상입니다. 총 10가지 색상이 있습니다.</Korean>
             <Spanish>Define los 10 gradientes de color utilizados para indicar el daño en la interfaz gráfiica del sistema Médico.</Spanish>
+            <Portuguese>Define os 10 gradientes de cor utilizados para indicar dano nas interfaces médicas.</Portuguese>
         </Key>
         <Key ID="STR_ACE_Medical_GUI_DamageColorX_DisplayName">
             <English>Damage Color %1</English>
@@ -1343,6 +1362,7 @@
             <Chinesesimp>负伤颜色 %1</Chinesesimp>
             <Korean>피해 색상 %1</Korean>
             <Spanish>Color de daño %1</Spanish>
+            <Portuguese>Cor de dano %1</Portuguese>
         </Key>
         <Key ID="STR_ACE_Medical_GUI_ShowBloodlossEntry_DisplayName">
             <English>Show Blood Loss</English>
@@ -1355,6 +1375,7 @@
             <Russian>Показывать кровопотерю</Russian>
             <Spanish>Mostrar pérdida de sangre</Spanish>
             <French>Afficher les pertes de sang</French>
+            <Portuguese>Mostrar perda de sangue</Portuguese>
         </Key>
         <Key ID="STR_ACE_Medical_GUI_ShowBloodlossEntry_Description">
             <English>Show qualitative blood loss in the injury list.</English>
@@ -1367,6 +1388,7 @@
             <Russian>Показывать тяжесть кровопотери в списке ранений.</Russian>
             <Spanish>Mostrar la pérdida de sangre cualitativa en la lista de heridas.</Spanish>
             <French>Afficher la quantité de sang perdue</French>
+            <Portuguese>Mostrar perda de sangue qualitativa na lista de feridas.</Portuguese>
         </Key>
         <Key ID="STR_ACE_Medical_GUI_showBleeding_DisplayName">
             <English>Show Bleeding State</English>
@@ -1412,6 +1434,7 @@
             <Japanese>被弾時の医療情報一時表示</Japanese>
             <Russian>Показать медицинскую информацию о попадании</Russian>
             <Spanish>Ojear Información Médica en Impacto</Spanish>
+            <Portuguese>Visualização rápida das informações médicas durante uma lesão</Portuguese>
         </Key>
         <Key ID="STR_ACE_Medical_GUI_PeekMedicalOnHit_Description">
             <English>Temporarily show medical info when injured.</English>
@@ -1424,6 +1447,7 @@
             <Japanese>被弾時に医療情報を一時的に表示します。</Japanese>
             <Russian>Временно показывать медицинскую информацию при травме.</Russian>
             <Spanish>Temporalmente muestra la información médica cuando es herido.</Spanish>
+            <Portuguese>Mostrar informações médicas temporariamente durante uma lesão.</Portuguese>
         </Key>
         <Key ID="STR_ACE_Medical_GUI_PeekMedicalOnHitDuration_DisplayName">
             <English>Medical Peek Duration on Hit</English>
@@ -1436,6 +1460,7 @@
             <Japanese>被弾時の医療情報一時表示の表示時間</Japanese>
             <Russian>Продолжительность медицинского осмотра при попадании</Russian>
             <Spanish>Duración de Ojear la Información Médica cuando hay Impacto</Spanish>
+            <Portuguese>Duração da visualização rápida de informações médicas durante uma lesão</Portuguese>
         </Key>
         <Key ID="STR_ACE_Medical_GUI_PeekMedicalOnHitDuration_Description">
             <English>How long the medical info peek remains open after being injured.</English>
@@ -1448,6 +1473,7 @@
             <Japanese>被弾時の医療情報の一時表示をどれだけ長く表示するか。</Japanese>
             <Russian>Как долго окно просмотра медицинской информации остается открытым после получения травмы.</Russian>
             <Spanish>Durante cuánto tiempo la información médica ojeada permanece abierta una tras haber sido herido.</Spanish>
+            <Portuguese>Quanto tempo a visualização rápida de informações médicas permanece aberta após ser ferido.</Portuguese>
         </Key>
         <Key ID="STR_ACE_Medical_GUI_showDamageEntry_DisplayName">
             <English>Show Trauma Sustained</English>
@@ -1486,6 +1512,7 @@
             <Japanese>身体部位の輪郭表示の色</Japanese>
             <Russian>Цвет контура части тела</Russian>
             <Spanish>Color de Contorno de las Partes del Cuerpo</Spanish>
+            <Portuguese>Cor do contorno da parte do corpo</Portuguese>
         </Key>
         <Key ID="STR_ACE_Medical_GUI_bodyPartOutlineColor_Description">
             <English>Color of outline around selected body part.</English>
@@ -1498,6 +1525,7 @@
             <Japanese>選択した身体部位の輪郭表示の色。</Japanese>
             <Russian>Цвет контура вокруг выбранной части тела.</Russian>
             <Spanish>Color del contorno alrededor de la parte del cuerpo seleccionada.</Spanish>
+            <Portuguese>Cor do contorno em volta da parte do corpo selecionada.</Portuguese>
         </Key>
         <Key ID="STR_ACE_Medical_GUI_traumaSustained1">
             <English>Minor Trauma</English>
@@ -1562,6 +1590,7 @@
             <Japanese>左</Japanese>
             <Russian>Лево</Russian>
             <Spanish>I</Spanish>
+            <Portuguese>E</Portuguese>
         </Key>
         <Key ID="STR_ACE_Medical_GUI_BodyLabelRight">
             <English>R</English>
@@ -1574,6 +1603,7 @@
             <Japanese>右</Japanese>
             <Russian>Право</Russian>
             <Spanish>D</Spanish>
+            <Portuguese>D</Portuguese>
         </Key>
         <Key ID="STR_ACE_Medical_GUI_TreatmentItemCount_Medic">
             <English>in your inventory</English>
@@ -1586,6 +1616,7 @@
             <Japanese>個あなたが保有</Japanese>
             <Russian>в вашем инвентаре</Russian>
             <Spanish>en tu inventario</Spanish>
+            <Portuguese>em seu inventário</Portuguese>
         </Key>
         <Key ID="STR_ACE_Medical_GUI_TreatmentItemCount_Patient">
             <English>in patient's inventory</English>
@@ -1598,6 +1629,7 @@
             <Japanese>個患者が保有</Japanese>
             <Russian>в инвентаре пациента</Russian>
             <Spanish>en el inventario del paciente</Spanish>
+            <Portuguese>no inventário do paciente</Portuguese>
         </Key>
         <Key ID="STR_ACE_Medical_GUI_TreatmentItemCount_Vehicle">
             <English>in vehicle's inventory</English>
@@ -1610,6 +1642,7 @@
             <Japanese>個車両内に保有</Japanese>
             <Russian>в инвентаре транспорта</Russian>
             <Spanish>en el inventario del vehículo</Spanish>
+            <Portuguese>no inventário do veículo</Portuguese>
         </Key>
         <Key ID="STR_ACE_Medical_GUI_TourniquetWarning">
             <English>No effect until tourniquet removed</English>
@@ -1621,6 +1654,7 @@
             <Japanese>止血帯を外すまで効果を発揮しません</Japanese>
             <Russian>Никакого эффекта до тех пор, пока жгут не будет снят</Russian>
             <Spanish>Sin efecto hasta que se quita el torniquete</Spanish>
+            <Portuguese>Sem efeito até o torniquete ser removido</Portuguese>
         </Key>
         <Key ID="STR_ACE_Medical_GUI_TourniquetWarning_DisplayName">
             <English>Show Tourniquet Warning</English>
@@ -1632,6 +1666,7 @@
             <Japanese>止血帯の警告を表示</Japanese>
             <Russian>Показать предупреждение о наложении жгута</Russian>
             <Spanish>Mostrar Advertencia de Torniquete</Spanish>
+            <Portuguese>Mostrar aviso de torniquete</Portuguese>
         </Key>
         <Key ID="STR_ACE_Medical_GUI_TourniquetWarning_Description">
             <English>Show a warning tooltip when a tourniquet will interfere with a medical action.</English>
@@ -1643,6 +1678,7 @@
             <Japanese>止血帯が医療行為を妨げる場合には、警告ツールチップを表示します。</Japanese>
             <Russian>Показать всплывающую подсказку с предупреждением, когда жгут помешает медицинскому вмешательству.</Russian>
             <Spanish>Muestra un mensaje de advertencia cuando un torniquete interfiera con una acción médica.</Spanish>
+            <Portuguese>Mostra uma dica de aviso quando um torniquete interfere com uma ação médica.</Portuguese>
         </Key>
     </Package>
 </Project>
diff --git a/addons/medical_statemachine/functions/fnc_enteredStateDeath.sqf b/addons/medical_statemachine/functions/fnc_enteredStateDeath.sqf
index 537c356651..8be1d358df 100644
--- a/addons/medical_statemachine/functions/fnc_enteredStateDeath.sqf
+++ b/addons/medical_statemachine/functions/fnc_enteredStateDeath.sqf
@@ -25,6 +25,7 @@ if (isNull _unit || {!isNil {_unit getVariable QEGVAR(medical,causeOfDeath)}}) e
 TRACE_4("enteredStateDeath",_this,_thisOrigin,_thisTransition,CBA_missionTime);
 
 private _causeOfDeath = format ["%1:%2", _thisOrigin, _thisTransition];
+private _source = _unit getVariable [QEGVAR(medical,lastDamageSource), objNull];
 private _instigator = _unit getVariable [QEGVAR(medical,lastInstigator), objNull];
 
-[_unit, _causeOfDeath, _instigator] call EFUNC(medical_status,setDead);
+[_unit, _causeOfDeath, _source, _instigator] call EFUNC(medical_status,setDead);
diff --git a/addons/medical_statemachine/stringtable.xml b/addons/medical_statemachine/stringtable.xml
index 2b828d506e..9c1d807bd0 100644
--- a/addons/medical_statemachine/stringtable.xml
+++ b/addons/medical_statemachine/stringtable.xml
@@ -173,6 +173,7 @@
             <Polish>Wykrwawienie podczas zatrzymanej akcji serca</Polish>
             <Chinesesimp>心脏骤停期间失血情况</Chinesesimp>
             <Korean>심정지 중 출혈</Korean>
+            <Portuguese>Sangramento durante parada cardíaca</Portuguese>
         </Key>
         <Key ID="STR_ACE_Medical_Statemachine_CardiacArrestBleedout_Description">
             <English>Controls whether a person can die in cardiac arrest by blood loss before the cardiac arrest time runs out.</English>
@@ -185,6 +186,7 @@
             <Polish>Kontroluje czy śmierć osoby może nastąpić poprzez wykrwawienie zanim wyczerpię się Czas Zatrzymania Akcji Serca.</Polish>
             <Chinesesimp>控制单位是否会在心脏骤停时间耗完之前因失血过多而死亡。</Chinesesimp>
             <Korean>지정한 심정지 시간이 다 되기 전에 출혈로 인해 사망할 수 있는 지를 결정합니다.</Korean>
+            <Portuguese>Controla se uma pessoa pode morrer em parada cardíaca por perda de sangue antes que o tempo de parada cardíaca acabe.</Portuguese>
         </Key>
     </Package>
 </Project>
diff --git a/addons/medical_status/stringtable.xml b/addons/medical_status/stringtable.xml
index ea3f77429b..cefc85ff42 100644
--- a/addons/medical_status/stringtable.xml
+++ b/addons/medical_status/stringtable.xml
@@ -127,6 +127,7 @@
             <Japanese>武器を落とす確率</Japanese>
             <Russian>Шанс выпадения оружия</Russian>
             <Spanish>Probabilidad de Soltar Arma</Spanish>
+            <Portuguese>Probabilidade de largar a arma</Portuguese>
         </Key>
         <Key ID="STR_ACE_Medical_Status_DropWeaponUnconsciousChance_Description">
             <English>Chance for a player to drop their weapon when going unconscious.\nHas no effect on AI.</English>
@@ -138,6 +139,7 @@
             <Japanese>プレーヤーが意識を失ったときに武器を落とす可能性。\nAI には影響しません。</Japanese>
             <Russian>Шанс для игрока выронить свое оружие, когда он теряет сознание.\nНе влияет на ИИ</Russian>
             <Spanish>Probabilidad del jugador de soltar su arma cuando quedan inconscientes.\nNo tiene efecto sobre la IA.</Spanish>
+            <Portuguese>Chance de um jogador largar sua arma quando ficar inconsciente.\nNão tem efeito sobre a IA.</Portuguese>
         </Key>
     </Package>
 </Project>
diff --git a/addons/medical_treatment/XEH_preInit.sqf b/addons/medical_treatment/XEH_preInit.sqf
index bc01e267c1..e6210a7372 100644
--- a/addons/medical_treatment/XEH_preInit.sqf
+++ b/addons/medical_treatment/XEH_preInit.sqf
@@ -14,27 +14,23 @@ PREP_RECOMPILE_END;
 // adjusting these is trail and error
 // if the animation is cut of ingame, increase these values
 // if the unit idles too much, decrease them
-GVAR(animDurations) = [] call CBA_fnc_createNamespace;
-
-{
-    GVAR(animDurations) setVariable _x;
-} forEach [
-    ["AinvPknlMstpSlayWnonDnon_medic", 7.5],
-    ["AinvPpneMstpSlayWnonDnon_medic", 7],
-    ["AinvPknlMstpSlayWrflDnon_medic", 7],
-    ["AinvPpneMstpSlayWrflDnon_medic", 9.5],
-    ["AinvPknlMstpSlayWlnrDnon_medic", 9],
-    ["AinvPknlMstpSlayWpstDnon_medic", 9.5],
-    ["AinvPpneMstpSlayWpstDnon_medic", 10],
-    ["AinvPknlMstpSlayWnonDnon_medicOther", 8.5],
-    ["AinvPpneMstpSlayWnonDnon_medicOther", 8.5],
-    ["AinvPknlMstpSlayWrflDnon_medicOther", 7],
-    ["AinvPpneMstpSlayWrflDnon_medicOther", 9],
-    ["AinvPknlMstpSlayWlnrDnon_medicOther", 9],
-    ["AinvPknlMstpSlayWpstDnon_medicOther", 10],
-    ["AinvPpneMstpSlayWpstDnon_medicOther", 8.5],
-    ["AinvPknlMstpSnonWnonDnon_medic1", 10],
-    ["AinvPknlMstpSnonWnonDr_medic0", 12]
+GVAR(animDurations) = createHashMapFromArray [
+    ["ainvpknlmstpslaywnondnon_medic", 7.5],
+    ["ainvppnemstpslaywnondnon_medic", 7],
+    ["ainvpknlmstpslaywrfldnon_medic", 7],
+    ["ainvppnemstpslaywrfldnon_medic", 9.5],
+    ["ainvpknlmstpslaywlnrdnon_medic", 9],
+    ["ainvpknlmstpslaywpstdnon_medic", 9.5],
+    ["ainvppnemstpslaywpstdnon_medic", 10],
+    ["ainvpknlmstpslaywnondnon_medicother", 8.5],
+    ["ainvppnemstpslaywnondnon_medicother", 8.5],
+    ["ainvpknlmstpslaywrfldnon_medicother", 7],
+    ["ainvppnemstpslaywrfldnon_medicother", 9],
+    ["ainvpknlmstpslaywlnrdnon_medicother", 9],
+    ["ainvpknlmstpslaywpstdnon_medicother", 10],
+    ["ainvppnemstpslaywpstdnon_medicother", 8.5],
+    ["ainvpknlmstpsnonwnondnon_medic1", 10],
+    ["ainvpknlmstpsnonwnondr_medic0", 12]
 ];
 
 // class names of medical facilities (config case)
diff --git a/addons/medical_treatment/functions/fnc_checkPulseLocal.sqf b/addons/medical_treatment/functions/fnc_checkPulseLocal.sqf
index 3798e64eb4..bb3efedc22 100644
--- a/addons/medical_treatment/functions/fnc_checkPulseLocal.sqf
+++ b/addons/medical_treatment/functions/fnc_checkPulseLocal.sqf
@@ -21,7 +21,7 @@ params ["_medic", "_patient", "_bodyPart"];
 
 private _heartRate = 0;
 
-if (!([_patient, _bodyPart] call FUNC(hasTourniquetAppliedTo))) then {
+if !([_patient, _bodyPart] call FUNC(hasTourniquetAppliedTo)) then {
     _heartRate = switch (true) do {
         case (alive _patient): {
             GET_HEART_RATE(_patient)
diff --git a/addons/medical_treatment/functions/fnc_fullHealLocal.sqf b/addons/medical_treatment/functions/fnc_fullHealLocal.sqf
index dc95c44185..42c5866a9a 100644
--- a/addons/medical_treatment/functions/fnc_fullHealLocal.sqf
+++ b/addons/medical_treatment/functions/fnc_fullHealLocal.sqf
@@ -77,12 +77,12 @@ _patient setVariable [QEGVAR(medical,bodyPartDamage), [0,0,0,0,0,0], true];
 
 // wakeup needs to be done after achieving stable vitals, but before manually reseting unconc var
 if IS_UNCONSCIOUS(_patient) then {
-    if (!([_patient] call EFUNC(medical_status,hasStableVitals))) then { ERROR_2("fullheal [unit %1][state %2] did not restore stable vitals",_patient,_state); };
+    if !([_patient] call EFUNC(medical_status,hasStableVitals)) then {ERROR_2("fullheal [unit %1][state %2] did not restore stable vitals",_patient,_state);};
     TRACE_1("Waking up",_patient);
     [QEGVAR(medical,WakeUp), _patient] call CBA_fnc_localEvent;
     _state = GET_SM_STATE(_patient);
     TRACE_1("after WakeUp",_state);
-    if IS_UNCONSCIOUS(_patient) then { ERROR_2("fullheal [unit %1][state %2] failed to wake up patient",_patient,_state); };
+    if IS_UNCONSCIOUS(_patient) then {ERROR_2("fullheal [unit %1][state %2] failed to wake up patient",_patient,_state);};
 };
 
 // Generic medical admin
diff --git a/addons/medical_treatment/functions/fnc_tourniquetRemove.sqf b/addons/medical_treatment/functions/fnc_tourniquetRemove.sqf
index 8a6be10bb4..97680353e4 100644
--- a/addons/medical_treatment/functions/fnc_tourniquetRemove.sqf
+++ b/addons/medical_treatment/functions/fnc_tourniquetRemove.sqf
@@ -26,7 +26,9 @@ private _partIndex = ALL_BODY_PARTS find tolowerANSI _bodyPart;
 private _tourniquets = GET_TOURNIQUETS(_patient);
 
 if (_tourniquets select _partIndex == 0) exitWith {
-    [LSTRING(noTourniquetOnBodyPart), 1.5] call EFUNC(common,displayTextStructured);
+    if (_medic == ACE_player) then {
+        [LSTRING(noTourniquetOnBodyPart), 1.5] call EFUNC(common,displayTextStructured);
+    };
 };
 
 _tourniquets set [_partIndex, 0];
@@ -39,8 +41,15 @@ TRACE_1("clearConditionCaches: tourniquetRemove",_nearPlayers);
 [QEGVAR(interact_menu,clearConditionCaches), [], _nearPlayers] call CBA_fnc_targetEvent;
 
 // Add tourniquet item to medic or patient
-private _receiver = [_patient, _medic, _medic] select GVAR(allowSharedEquipment);
-[_receiver, "ACE_tourniquet"] call EFUNC(common,addToInventory);
+if (_medic call EFUNC(common,isPlayer)) then {
+    private _receiver = [_patient, _medic, _medic] select GVAR(allowSharedEquipment);
+    [_receiver, "ACE_tourniquet"] call EFUNC(common,addToInventory);
+} else {
+    // If the medic is AI, only return tourniquet if enabled
+    if (missionNamespace getVariable [QEGVAR(medical_ai,requireItems), 0] > 0) then {
+        [_medic, "ACE_tourniquet"] call EFUNC(common,addToInventory);
+    };
+};
 
 // Handle occluded medications that were blocked due to tourniquet
 private _occludedMedications = _patient getVariable [QEGVAR(medical,occludedMedications), []];
diff --git a/addons/medical_treatment/functions/fnc_treatment.sqf b/addons/medical_treatment/functions/fnc_treatment.sqf
index c524fd7ebb..5f6df40e31 100644
--- a/addons/medical_treatment/functions/fnc_treatment.sqf
+++ b/addons/medical_treatment/functions/fnc_treatment.sqf
@@ -76,7 +76,7 @@ if (_medic isNotEqualTo player || {!_isInZeus}) then {
     };
 
     // Determine the animation length
-    private _animDuration = GVAR(animDurations) getVariable _medicAnim;
+    private _animDuration = GVAR(animDurations) get toLowerANSI _medicAnim;
     if (isNil "_animDuration") then {
         WARNING_2("animation [%1] for [%2] has no duration defined",_medicAnim,_classname);
         _animDuration = 10;
diff --git a/addons/medical_treatment/stringtable.xml b/addons/medical_treatment/stringtable.xml
index 477c18d019..2be4541677 100644
--- a/addons/medical_treatment/stringtable.xml
+++ b/addons/medical_treatment/stringtable.xml
@@ -73,12 +73,18 @@
             <Russian>Включено и может диагностировать смерть/остановку сердца</Russian>
             <German>Aktiviert &amp; kann Tod/Herzstillstand diagnostizieren</German>
             <Chinesesimp>已启用 &amp; 可以诊断死亡/心搏骤停</Chinesesimp>
-            <Korean>활성화 및 사망/심정지 진찰가능</Korean>
+            <Korean>활성화 및 사망/심정지 진찰 가능</Korean>
             <Spanish>Habilitado y poder diagnosticar Muerte/Parada cardíaca</Spanish>
+            <Portuguese>Habilitado e permite diagnosticar morte/parada cardíaca</Portuguese>
             <Italian>Abilitato e può diagnosticare Morte/Arresto Cardiaco</Italian>
         </Key>
         <Key ID="STR_ACE_Medical_Treatment_AdvancedDiagnose_DiagnoseCardiacArrestDirect">
             <English>Enabled &amp; Can Diagnose Death/Cardiac Arrest [Directly]</English>
+            <Japanese>有効 &amp; 死亡/心停止状態を診断可能 [直接的に]</Japanese>
+            <Russian>Включено и может диагностировать смерть/остановку сердца [Напрямую]</Russian>
+            <Korean>활성화 및 사망/심정지 진찰 가능 [직접]</Korean>
+            <German>Aktiviert &amp; kann Tod/Herzstillstand diagnostizieren [Direkt]</German>
+            <Italian>Abilitato e può diagnosticare Morte/Arresto Cardiaco [Esplicito]</Italian>
         </Key>
         <Key ID="STR_ACE_Medical_Treatment_AdvancedMedication_DisplayName">
             <English>Advanced Medication</English>
@@ -156,6 +162,7 @@
             <Italian>Attivi e possono riaprirsi</Italian>
             <Chinesesimp>已启用 &amp; 可以伤口开裂</Chinesesimp>
             <Korean>활성화 및 붕대 풀림 구현</Korean>
+            <Portuguese>Habilitado e pode reabrir</Portuguese>
         </Key>
         <Key ID="STR_ACE_Medical_Treatment_WoundReopenChance_DisplayName">
             <English>Wound Reopening Coefficient</English>
@@ -170,6 +177,7 @@
             <Spanish>Coeficiente de reapertura de heridas</Spanish>
             <Chinesesimp>伤口开裂系数</Chinesesimp>
             <Korean>붕대 풀림 계수</Korean>
+            <Portuguese>Coeficiente de reabertura de feridas</Portuguese>
         </Key>
         <Key ID="STR_ACE_Medical_Treatment_WoundReopenChance_Description">
             <English>Coefficient for controlling the wound reopening chance. The final reopening chance is determined by multiplying this value with the specific reopening chance for the wound type and bandage used.</English>
@@ -184,6 +192,7 @@
             <Spanish>Coeficiente que controla la probabilidad de reapertura de heridas. La probabilidad final de reapertura de heridas queda determinada multiplicando este valor por la probabilidad específica del tipo de herida y venda usada.</Spanish>
             <Chinesesimp>用于控制伤口开裂概率的系数。最终的重开放概率=该值x伤口类型x所使用的绷带的具体开裂概率。</Chinesesimp>
             <Korean>붕대가 풀리는 확률 계수를 정합니다. 최종 붕대 풀림 계수는 상처의 종류와 쓰인 붕대의 합의 결과에 계수를 곱한 결과입니다.</Korean>
+            <Portuguese>Coeficiente para controlar a chance de reabertura da ferida. A chance final de reabertura é determinada multiplicando este valor com a chance específica de reabertura para o tipo de ferida e bandagem usada.</Portuguese>
         </Key>
         <Key ID="STR_ACE_Medical_Treatment_ClearTrauma_DisplayName">
             <English>Clear Trauma</English>
@@ -196,6 +205,7 @@
             <Chinesesimp>清理创伤</Chinesesimp>
             <Korean>상처 제거</Korean>
             <Spanish>Despejar trauma</Spanish>
+            <Portuguese>Remover trauma</Portuguese>
         </Key>
         <Key ID="STR_ACE_Medical_Treatment_ClearTrauma_Description">
             <English>Controls when hitpoint damage from wounds is healed.</English>
@@ -208,6 +218,7 @@
             <Chinesesimp>控制伤口治疗后确定受伤部位的受伤情况。</Chinesesimp>
             <Korean>상처가 언제 제거되는 지를 결정합니다.</Korean>
             <Spanish>Controla cuando los puntos de daño de las heridas son curados.</Spanish>
+            <Portuguese>Controla quando o dano de pontos de vida de feridas é curado.</Portuguese>
         </Key>
         <Key ID="STR_ACE_Medical_Treatment_ClearTrauma_AfterBandage">
             <English>After Bandage</English>
@@ -220,6 +231,7 @@
             <Chinesesimp>包扎后</Chinesesimp>
             <Korean>붕대 묶은 후</Korean>
             <Spanish>Después de vendado</Spanish>
+            <Portuguese>Após fechamento com bandagens</Portuguese>
         </Key>
         <Key ID="STR_ACE_Medical_Treatment_ClearTrauma_AfterStitch">
             <English>After Stitch</English>
@@ -232,6 +244,7 @@
             <Chinesesimp>缝合后</Chinesesimp>
             <Korean>상처 봉합 후</Korean>
             <Spanish>Después de sutura</Spanish>
+            <Portuguese>Após sutura</Portuguese>
         </Key>
         <Key ID="STR_ACE_Medical_Treatment_LocationsBoostTraining_Description">
             <English>Boost medical training when in medical vehicles or facilities. Untrained becomes medic, medic becomes doctor.</English>
@@ -324,6 +337,7 @@
             <Italian>Tempo di utilizzo dell'autoiniettore</Italian>
             <Chinesesimp>自动注射器治疗时间</Chinesesimp>
             <Korean>주사기 사용 시간</Korean>
+            <Portuguese>Tempo de tratamento de auto-injetores</Portuguese>
         </Key>
         <Key ID="STR_ACE_Medical_Treatment_TreatmentTimeAutoinjector_Description">
             <English>Time, in seconds, required to administer medication using an autoinjector.</English>
@@ -336,6 +350,7 @@
             <Italian>Tempo in secondi richiesto per ricevere medicina da un autoiniettore.</Italian>
             <Chinesesimp>使用自动注射器给药所需的时间（秒）</Chinesesimp>
             <Korean>초 단위로 주사기를 사용하는데 걸리는 시간을 정합니다.</Korean>
+            <Portuguese>Tempo, em segundos, necessário para administrar medicações usando o auto-injetor.</Portuguese>
         </Key>
         <Key ID="STR_ACE_Medical_Treatment_TreatmentTimeTourniquet_DisplayName">
             <English>Tourniquet Treatment Time</English>
@@ -348,6 +363,7 @@
             <Polish>Czas aplikacji stazy</Polish>
             <Chinesesimp>止血带治疗时间</Chinesesimp>
             <Korean>지혈대 사용 시간</Korean>
+            <Portuguese>Tempo de tratamento de torniquetes</Portuguese>
         </Key>
         <Key ID="STR_ACE_Medical_Treatment_TreatmentTimeTourniquet_Description">
             <English>Time, in seconds, required to apply/remove a tourniquet.</English>
@@ -360,6 +376,7 @@
             <Polish>Czas w sekundach potrzebny do założenia/zdjęcia stazy.</Polish>
             <Chinesesimp>使用/移除止血带所需的时间（秒）</Chinesesimp>
             <Korean>초 단위로 지혈대를 사용/제거하는 데 걸리는 시간을 정합니다.</Korean>
+            <Portuguese>Tempo, em segundos, necessário para aplicar/remover um torniquete.</Portuguese>
         </Key>
         <Key ID="STR_ACE_Medical_Treatment_TreatmentTimeIV_DisplayName">
             <English>IV Bag Treatment Time</English>
@@ -368,10 +385,11 @@
             <Italian>Tempo di inserimento EV</Italian>
             <Japanese>点滴の所要時間</Japanese>
             <Spanish>Tiempo de tratamiento de bolsa de IV</Spanish>
-            <Russian>Время применения пакета внутривенного переливания</Russian>
+            <Russian>Время внутривенного переливания</Russian>
             <Polish>Czas aplikacji IV</Polish>
             <Chinesesimp>静脉输液袋治疗时间</Chinesesimp>
             <Korean>수액용기 사용 시간</Korean>
+            <Portuguese>Tempo de tratamento de bolsas de IV</Portuguese>
         </Key>
         <Key ID="STR_ACE_Medical_Treatment_TreatmentTimeIV_Description">
             <English>Time, in seconds, required to administer an IV bag.</English>
@@ -384,6 +402,7 @@
             <Polish>Czas w sekundach potrzebny na aplikację transfuzji IV.</Polish>
             <Chinesesimp>使用静脉输液所需的时间（秒）</Chinesesimp>
             <Korean>초 단위로 수액용기를 사용하는 데 걸리는 시간을 정합니다.</Korean>
+            <Portuguese>Tempo, em segundos, necessário para administrar uma bolsa de IV.</Portuguese>
         </Key>
         <Key ID="STR_ACE_Medical_Treatment_TreatmentTimeSplint_DisplayName">
             <English>Splint Treatment Time</English>
@@ -396,6 +415,7 @@
             <Polish>Czas aplikacji szyny</Polish>
             <Chinesesimp>夹板治疗时间</Chinesesimp>
             <Korean>부목 사용 시간</Korean>
+            <Portuguese>Tempo de tratamento de talas</Portuguese>
         </Key>
         <Key ID="STR_ACE_Medical_Treatment_TreatmentTimeSplint_Description">
             <English>Time, in seconds, required to apply a splint.</English>
@@ -408,6 +428,7 @@
             <Polish>Czas w sekundach potrzebny na aplikację szyny.</Polish>
             <Chinesesimp>使用夹板所需的时间（秒）</Chinesesimp>
             <Korean>초 단위로 부목을 사용하는데 걸리는 시간을 정합니다.</Korean>
+            <Portuguese>Tempo, em segundos, necessário para aplicar uma talas.</Portuguese>
         </Key>
         <Key ID="STR_ACE_Medical_Treatment_TreatmentTimeBodyBag_DisplayName">
             <English>Body Bag Use Time</English>
@@ -420,6 +441,7 @@
             <Polish>Czas użycia worka na ciało</Polish>
             <Chinesesimp>尸袋使用时间</Chinesesimp>
             <Korean>시체 운반용 부대 사용 시간</Korean>
+            <Portuguese>Tempo de uso de sacos de cadáver</Portuguese>
         </Key>
         <Key ID="STR_ACE_Medical_Treatment_TreatmentTimeBodyBag_Description">
             <English>Time, in seconds, required to put a patient in a body bag.</English>
@@ -432,6 +454,7 @@
             <Polish>Czas w sekundach potrzebny na spakowanie ciała do worka na ciało.</Polish>
             <Chinesesimp>装入裹尸袋时间</Chinesesimp>
             <Korean>초 단위로 시체 운반용 부대를 사용하는데 걸리는 시간을 정합니다.</Korean>
+            <Portuguese>Tempo, em segundos, necessário para colocar um paciente em um saco de cadáver.</Portuguese>
         </Key>
         <Key ID="STR_ACE_Medical_Treatment_TreatmentTimeGrave_DisplayName">
             <English>Grave Digging Time</English>
@@ -443,6 +466,7 @@
             <Japanese>墓掘りの所要時間</Japanese>
             <Russian>Время рытья могилы</Russian>
             <Spanish>Tiempo de Cavado de Tumba</Spanish>
+            <Portuguese>Tempo de escavação de cova</Portuguese>
         </Key>
         <Key ID="STR_ACE_Medical_Treatment_TreatmentTimeGrave_Description">
             <English>Time, in seconds, required to dig a grave for a body.</English>
@@ -454,6 +478,7 @@
             <Japanese>遺体の墓を掘るのに掛かる時間。 (秒単位)</Japanese>
             <Russian>Время в секундах, необходимое для того, чтобы выкопать могилу для тела.</Russian>
             <Spanish>Tiempo, en segundos, requerido para cavar una tumba para un cuerpo.</Spanish>
+            <Portuguese>Tempo, em segundos, necessário para cavar uma cova para um corpo.</Portuguese>
         </Key>
         <Key ID="STR_ACE_Medical_Treatment_MedicEpinephrine_DisplayName">
             <English>Allow Epinephrine</English>
@@ -464,7 +489,7 @@
             <Italian>Permetti Epinefrina</Italian>
             <Czech>Povolit epinefrin</Czech>
             <Portuguese>Permitir Epinefrina</Portuguese>
-            <Russian>Разрешить Адреналин</Russian>
+            <Russian>Доступ к Адреналину</Russian>
             <Japanese>アドレナリンの許可</Japanese>
             <Korean>에피네프린 사용 허가</Korean>
             <Chinesesimp>允许使用肾上腺素</Chinesesimp>
@@ -521,7 +546,7 @@
         </Key>
         <Key ID="STR_ACE_Medical_Treatment_MedicPAK_DisplayName">
             <English>Allow PAK</English>
-            <Russian>Использование Аптечки</Russian>
+            <Russian>Доступ к Аптечке</Russian>
             <Polish>Ograniczenia użycia apteczek osobistych</Polish>
             <Spanish>Permitir EPA</Spanish>
             <German>Erlaube Erste-Hilfe-Set</German>
@@ -631,6 +656,7 @@
             <Turkish>Kendi PAK Kullanımı</Turkish>
             <Spanish>Usar EPA sobre uno mismo</Spanish>
             <Korean>개인응급키트 자가 사용</Korean>
+            <Portuguese>Auto-tratamento com KPS</Portuguese>
         </Key>
         <Key ID="STR_ACE_Medical_Treatment_AllowSelfPAK_Description">
             <English>Enables the use of PAKs to heal oneself.</English>
@@ -646,6 +672,7 @@
             <Turkish>Kendini iyileştirmek için PAK'ların kullanılmasını sağlar.</Turkish>
             <Spanish>Habilita el uso de EPA para curarse a uno mismo.</Spanish>
             <Korean>개인응급키트를 사용자 본인에게 쓸 수 있는 지를 정합니다.</Korean>
+            <Portuguese>Permite o uso de KPS para se tratar.</Portuguese>
         </Key>
         <Key ID="STR_ACE_Medical_Treatment_TimeCoefficientPAK_DisplayName">
             <English>Time Coefficient PAK</English>
@@ -683,7 +710,7 @@
             <English>Allow Surgical Kit</English>
             <Japanese>手術キットを許可</Japanese>
             <French>Trousse chirurgicale autorisée pour</French>
-            <Russian>Разрешить Хирургический набор</Russian>
+            <Russian>Доступ к Хирургическому набору</Russian>
             <Portuguese>Permitir Kit Cirúrgico</Portuguese>
             <Chinese>允許使用手術包</Chinese>
             <Chinesesimp>允许使用手术包</Chinesesimp>
@@ -767,7 +794,7 @@
             <Polish>Co powinno zostać zużyte po zastosowaniu.</Polish>
             <Korean>봉합키트를 1회성 소모품으로 설정할 지 여부를 결정합니다.</Korean>
             <French>Ce qui doit être consommé après l'utilisation.</French>
-            <Russian>Решите, следует ли использовать набор для наложения швов в качестве одноразового расходного материала.</Russian>
+            <Russian>Контролирует, следует ли израсходовать Хирургический набор или нить после использования</Russian>
         </Key>
         <Key ID="STR_ACE_Medical_Treatment_AllowSelfStitch_DisplayName">
             <English>Self Stitching</English>
@@ -810,6 +837,7 @@
             <Italian>Tempo di suturazione ferita.</Italian>
             <Chinesesimp>伤口缝合时间</Chinesesimp>
             <Korean>상처 봉합 시간</Korean>
+            <Portuguese>Tempo de sutura de feridas</Portuguese>
         </Key>
         <Key ID="STR_ACE_Medical_Treatment_WoundStitchTime_Description">
             <English>Time, in seconds, required to stitch a single wound.</English>
@@ -822,6 +850,7 @@
             <Italian>Tempo in secondi richiesto per suturare una singola ferita.</Italian>
             <Chinesesimp>缝合一个伤口所需的时间（秒）</Chinesesimp>
             <Korean>초 단위로, 한 상처를 봉합하는데 걸리는 시간을 설정합니다.</Korean>
+            <Portuguese>Tempo, em segundos, necessário para suturar uma única ferida.</Portuguese>
         </Key>
         <Key ID="STR_ACE_Medical_Treatment_AllowSelfIV_DisplayName">
             <English>Self IV Transfusion</English>
@@ -858,12 +887,13 @@
             <French>Housse mortuaire - Autoriser patients inconscients</French>
             <Japanese>無意識者の遺体袋への収容許可</Japanese>
             <Spanish>Permitir bolsa para cuerpos inconsciente</Spanish>
-            <Russian>Разрешить упаковывать пациентов без сознания в мешки для трупов</Russian>
+            <Russian>Упаковка без сознания в мешки для трупов</Russian>
             <Polish>Nieprzytomni w worku na ciało</Polish>
             <German>Erlaube Benutzung des Leichensackes mit bewusstlosen Personen</German>
             <Italian>Permetti di insaccare un paziente svenuto</Italian>
             <Chinesesimp>允许昏迷者装入尸袋</Chinesesimp>
             <Korean>기절 인원 시체 운반용 부대에 옮기기</Korean>
+            <Portuguese>Permitir inconscientes em sacos de cadáver</Portuguese>
         </Key>
         <Key ID="STR_ACE_Medical_Treatment_AllowBodyBagUnconscious_Description">
             <English>Enables placing an unconscious patient in a body bag.</English>
@@ -876,6 +906,7 @@
             <Italian>Permette l'uso della sacca per morti anche su pazienti che sono solo svenuti (causa la morte del paziente)</Italian>
             <Chinesesimp>能够将昏迷的伤员装入尸袋中。</Chinesesimp>
             <Korean>기절 상태의 인원을 시체 운반용 부대에 옮겨 담을 수 있는 지를 정합니다.</Korean>
+            <Portuguese>Permite colocar um paciente inconsciente em um saco de cadáver.</Portuguese>
         </Key>
         <Key ID="STR_ACE_Medical_Treatment_AllowGraveDigging_DisplayName">
             <English>Allow Grave Digging</English>
@@ -886,7 +917,8 @@
             <Spanish>Permitir cavar tumbas</Spanish>
             <French>Autoriser le creusement de tombes</French>
             <Japanese>墓掘りを許可</Japanese>
-            <Russian>Разрешить рытье могил</Russian>
+            <Russian>Рытье могил</Russian>
+            <Portuguese>Permitir escavamento de cova</Portuguese>
         </Key>
         <Key ID="STR_ACE_Medical_Treatment_AllowGraveDigging_Description">
             <English>Enables digging graves to dispose of corpses.</English>
@@ -898,6 +930,7 @@
             <French>Active la possibilité de creuser des tombes pour enterrer les cadavres.</French>
             <Japanese>墓を掘って死体を処理できるようになります。</Japanese>
             <Russian>Позволяет рыть могилы для захоронения трупов.</Russian>
+            <Portuguese>Permite escavar covas para se livrar de cadáveres.</Portuguese>
         </Key>
         <Key ID="STR_ACE_Medical_Treatment_AllowGraveDigging_graveOnlyDead">
             <English>Only if dead</English>
@@ -909,6 +942,7 @@
             <French>Uniquement s'il est mort</French>
             <Japanese>死体のみ</Japanese>
             <Russian>Только если мертв</Russian>
+            <Portuguese>Apenas se estiver morto</Portuguese>
         </Key>
         <Key ID="STR_ACE_Medical_Treatment_GraveDiggingMarker_DisplayName">
             <English>Create Grave Markers</English>
@@ -919,7 +953,8 @@
             <Korean>무덤 마커 생성</Korean>
             <French>Créer des pierres tombales</French>
             <Japanese>墓標を作成</Japanese>
-            <Russian>Создайте надгробные знаки</Russian>
+            <Russian>Надгробные знаки</Russian>
+            <Portuguese>Criar marcadores de covas</Portuguese>
         </Key>
         <Key ID="STR_ACE_Medical_Treatment_GraveDiggingMarker_Description">
             <English>Enables the creation of grave markers when digging graves.</English>
@@ -931,6 +966,7 @@
             <French>Active la création de pierres tombales lors de l'enterrement de cadavres.</French>
             <Japanese>墓を掘った際、墓標を作成できるようにします。</Japanese>
             <Russian>Позволяет создавать надгробные знаки при рытье могил.</Russian>
+            <Portuguese>Permite a criação de marcadores de covas ao escavá-las.</Portuguese>
         </Key>
         <Key ID="STR_ACE_Medical_Treatment_MedicIV_DisplayName">
             <English>Allow IV Transfusion</English>
@@ -942,9 +978,10 @@
             <Chinesesimp>允许静脉输液</Chinesesimp>
             <Japanese>IV 輸液の制限</Japanese>
             <Czech>Povolit IV transfuzi</Czech>
-            <Russian>Разрешить внутривенное переливание</Russian>
+            <Russian>Доступ к внутривенному переливанию</Russian>
             <Spanish>Permitir transfusión de IV</Spanish>
             <Korean>수액용기 사용 허가</Korean>
+            <Portuguese>Permitir transfusão IV</Portuguese>
         </Key>
         <Key ID="STR_ACE_Medical_Treatment_MedicIV_Description">
             <English>Training level required to transfuse IVs.</English>
@@ -959,30 +996,33 @@
             <Russian>Уровень навыка, требуемый для осуществления внутривенного переливания.</Russian>
             <Spanish>Nivel de capacitación requerido para transfusiones de IV.</Spanish>
             <Korean>수액용기를 사용하는데 필요한 등급을 정합니다.</Korean>
+            <Portuguese>Nível de treinamento necessário para transfusões IV.</Portuguese>
         </Key>
         <Key ID="STR_ACE_Medical_Treatment_LocationIV_DisplayName">
             <English>Locations IV Transfusion</English>
             <Japanese>IV輸液の可能な場所</Japanese>
             <Spanish>Ubicación para transfusiones IV</Spanish>
             <French>Lieux perfusions IV</French>
-            <Russian>Места введения пакетов внутривенного переливания</Russian>
+            <Russian>Места внутривенного переливания</Russian>
             <Polish>Miejsca do transfuzji IV</Polish>
             <German>Orte an denen IV-Transfusionen angelegt werden können</German>
             <Italian>Luoghi Fleboclisi EV</Italian>
             <Chinesesimp>静脉输液地点</Chinesesimp>
             <Korean>수액용기 사용 장소</Korean>
+            <Portuguese>Locais para transfusão IV</Portuguese>
         </Key>
         <Key ID="STR_ACE_Medical_Treatment_LocationIV_Description">
             <English>Controls where IV transfusions can be performed.</English>
             <Japanese>IV 輸液を行える場所を制御します。</Japanese>
             <Spanish>Controla dónde pueden ser realizadas las transfusiones IV.</Spanish>
             <French>Définit les lieux où la pose de perfusions est autorisée.</French>
-            <Russian>Определяет к каким частям тела разрешено применять пакеты внутренного переливания.</Russian>
+            <Russian>Контролирует, где можно использовать внутревенное переливание.</Russian>
             <Polish>Kontroluje w jakich miejscach można robić transfuzje IV.</Polish>
             <German>Kontrolliert, wo IV-Transfusionen durchgeführt werden können.</German>
             <Italian>Luoghi in cui è possibile applicare Fleboclisi Endovenose.</Italian>
             <Chinesesimp>控制何地可以静脉输液</Chinesesimp>
             <Korean>수액용기를 사용할 수 있는 장소를 정합니다.</Korean>
+            <Portuguese>Controla onde as transfusões IV podem ser realizadas.</Portuguese>
         </Key>
         <Key ID="STR_ACE_Medical_Treatment_ConvertItems_DisplayName">
             <English>Convert Vanilla Items</English>
@@ -1215,6 +1255,7 @@
             <Chinesesimp>心肺复苏的最低成功率</Chinesesimp>
             <Korean>최소 심폐소생술 성공 가능성</Korean>
             <Spanish>RCP posibilidad mínima de resultado satisfactorio</Spanish>
+            <Portuguese>Probabilidade mínima de sucesso de RCP</Portuguese>
         </Key>
         <Key ID="STR_ACE_Medical_Treatment_CPRSuccessChanceMax_DisplayName">
             <English>CPR Success Chance Maximum</English>
@@ -1227,6 +1268,7 @@
             <Chinesesimp>心肺复苏的最高成功率</Chinesesimp>
             <Korean>최대 심폐소생술 성공 가능성</Korean>
             <Spanish>RCP posibilidad máxima de resultado satisfactorio</Spanish>
+            <Portuguese>Probabilidade máxima de sucesso de RCP</Portuguese>
         </Key>
         <Key ID="STR_ACE_Medical_Treatment_CPRSuccessChanceMin_Description">
             <English>Minimum probability that performing CPR will restore heart rhythm.\nThis minimum value is used when the patient has at least "Lost a fatal amount of blood".\nAn interpolated probability is used when the patient's blood volume is between the minimum and maximum thresholds.</English>
@@ -1239,6 +1281,7 @@
             <Chinesesimp>实施心肺复苏恢复心律的最小可能性。\n当伤员至少有"致命失血量"时，就取该最小值。\n当伤员的血量介于最小和最大阈值之间时，将使用插值概率。</Chinesesimp>
             <Korean>심폐소생술 시 제일 낮은 성공 가능성을 결정합니다.\n이 가능성은 환자가 최소 "심각한 양의 혈액을 잃음"일 때 사용됩니다.</Korean>
             <Spanish>Probabilidad mínima de que realizar RCP restaure el ritmo cardíaco.\n Este valor mínimo es utilizado cuando el paciente tiene al menos "Pérdida fatal de sangre".\n Una probabilidad interpolada es usada cuando el volumen de sangre del paciente está entre el umbral mínimo y máximo.</Spanish>
+            <Portuguese>Probabilidade mínima do RCP restaurar a frequência cardíaca.\nEste valor é usado em pacientes que "perderam uma quantidade fatal de sangue".\nValores entre quantidades extremas de sangue resultam em uma probabilidade interpolada entre a mínima e a máxima.</Portuguese>
         </Key>
         <Key ID="STR_ACE_Medical_Treatment_CPRSuccessChanceMax_Description">
             <English>Maximum probability that performing CPR will restore heart rhythm.\nThis maximum value is used when the patient has at most "Lost some blood".\nAn interpolated probability is used when the patient's blood volume is between the minimum and maximum thresholds.</English>
@@ -1251,6 +1294,7 @@
             <Chinesesimp>实施心肺复苏恢复心律的最大可能性。\n当伤员最多“失血一些”时，就取该最大值。\n当伤员的血量介于最小和最大阈值之间时，将使用插值概率。</Chinesesimp>
             <Korean>심폐소생술 시 제일 높은 성공 가능성을 결정합니다.\n이 가능성은 환자가 최소 "혈액을 조금 잃음"일 때 사용됩니다.</Korean>
             <Spanish>Probabilidad máxima de que realizar RCP restaure el ritmo cardíaco.\n Este valor máximo es utilizado cuando el paciente tiene como mucho "Pérdida de un poco de sangre".\n Una probabilidad interpolada es usada cuando el volumen de sangre del paciente está entre el umbral mínimo y máximo.</Spanish>
+            <Portuguese>Probabilidade máxima do RCP restaurar a frequência cardíaca.\nEste valor é usado em pacientes que "perderam pouco sangue".\nValores entre quantidades extremas de sangue resultam em uma probabilidade interpolada entre a mínima e a máxima.</Portuguese>
         </Key>
         <Key ID="STR_ACE_Medical_Treatment_TreatmentTimeCPR_DisplayName">
             <English>CPR Treatment Time</English>
@@ -1263,6 +1307,7 @@
             <German>HLW Behandlungsdauer</German>
             <Chinesesimp>心肺复苏时间</Chinesesimp>
             <Korean>심폐소생술 시행 시간</Korean>
+            <Portuguese>Duração do RCP</Portuguese>
         </Key>
         <Key ID="STR_ACE_Medical_Treatment_TreatmentTimeCPR_Description">
             <English>Time, in seconds, required to perform CPR on a patient.</English>
@@ -1275,6 +1320,7 @@
             <German>Zeit in Sekunden, die benötigt wird, um eine HLW durzuführen.</German>
             <Chinesesimp>对伤员实施心肺复苏所需的时间（秒）</Chinesesimp>
             <Korean>초 단위로, 심폐소생술을 진행하는 시간을 결정합니다.</Korean>
+            <Portuguese>Tempo, em segundos, necessário para realizar RCP em um paciente.</Portuguese>
         </Key>
         <Key ID="STR_ACE_Medical_Treatment_HolsterRequired_DisplayName">
             <English>Holster Required</English>
@@ -1289,6 +1335,7 @@
             <Russian>Необходимость убирать оружие</Russian>
             <Spanish>Requiere enfundar</Spanish>
             <Korean>무장여부</Korean>
+            <Portuguese>Necessário guardar armas</Portuguese>
         </Key>
         <Key ID="STR_ACE_Medical_Treatment_HolsterRequired_Description">
             <English>Controls whether weapons must be holstered / lowered in order to perform medical actions.\nExcept Exam options allow examination actions (checking pulse, blood pressure, response) at all times regardless of this setting.</English>
@@ -1303,6 +1350,7 @@
             <Russian>Нужно ли убирать оружие для проведения медицинских действий.\nОпция «Проверка разрешена» разрешает проверять пульс, кровяное давление или реакцию независимо от этого параметра.</Russian>
             <Spanish>Controla si las armas deben estar enfundadas / bajadas para realizar acciones médicas. \n Excepto Las opciones de examen permiten acciones de examen (control del pulso, presión arterial, respuesta) en todo momento, independientemente de esta configuración.</Spanish>
             <Korean>치료하기에 앞서 손에서 무기를 집어넣을 지/내릴지를 결정합니다.\n검사제외 옵션의 경우 맥박 확인, 혈압 확인, 반응 확인은 앞선 옵션에 구애받지 않고 사용할 수 있습니다.</Korean>
+            <Portuguese>Controla se as armas devem ser guardadas/abaixadas para realizar ações médicas.\n"Exceto exame" faz com que ações de verificação de pulso, pressão arterial e resposta sejam permitidas a qualquer momento.</Portuguese>
         </Key>
         <Key ID="STR_ACE_Medical_Treatment_HolsterRequired_Lowered">
             <English>Lowered or Holstered</English>
@@ -1317,6 +1365,7 @@
             <Russian>Опущено или убрано</Russian>
             <Spanish>Bajada o enfundada</Spanish>
             <Korean>내리거나 집어넣기</Korean>
+            <Portuguese>Abaixada ou guardada</Portuguese>
         </Key>
         <Key ID="STR_ACE_Medical_Treatment_HolsterRequired_LoweredExam">
             <English>Lowered or Holstered (Except Exam)</English>
@@ -1331,6 +1380,7 @@
             <Russian>Опущено или убрано (Проверка разрешена)</Russian>
             <Spanish>Bajada o enfundada (excepto examen)</Spanish>
             <Korean>내리거나 집어넣기(검사 제외)</Korean>
+            <Portuguese>Abaixada ou guardada (exceto exame)</Portuguese>
         </Key>
         <Key ID="STR_ACE_Medical_Treatment_HolsterRequired_Holstered">
             <English>Holstered Only</English>
@@ -1345,6 +1395,7 @@
             <Russian>Только убрано</Russian>
             <Spanish>Solo enfundada</Spanish>
             <Korean>집어넣기</Korean>
+            <Portuguese>Guardada apenas</Portuguese>
         </Key>
         <Key ID="STR_ACE_Medical_Treatment_HolsterRequired_HolsteredExam">
             <English>Holstered Only (Except Exam)</English>
@@ -1359,6 +1410,7 @@
             <Russian>Только убрано (Проверка разрешена)</Russian>
             <Spanish>Solo enfundada (excepto examen)</Spanish>
             <Korean>집어넣기(검사 제외)</Korean>
+            <Portuguese>Guardada apenas (exceto exame)</Portuguese>
         </Key>
         <Key ID="STR_ACE_Medical_Treatment_medicalSupplyCrate">
             <English>[ACE] Medical Supply Crate (Basic)</English>
@@ -2449,6 +2501,7 @@
             <Korean>봉합술</Korean>
             <French>Suture</French>
             <Russian>Нить</Russian>
+            <Portuguese>Sutura</Portuguese>
         </Key>
         <Key ID="STR_ACE_Medical_Treatment_Suture_Desc_Short">
             <English>Surgical Suture for stitching injuries.</English>
@@ -2460,6 +2513,7 @@
             <Korean>상처를 꿰메는 수술용 봉합술.</Korean>
             <French>Suture chirurgicale pour suturer les blessures.</French>
             <Russian>Хирургическая нить для зашивания травм.</Russian>
+            <Portuguese>Sutura cirúrgica para fechar feridas.</Portuguese>
         </Key>
         <Key ID="STR_ACE_Medical_Treatment_Suture_Desc_Use">
             <English>Surgical Suture for stitching injuries.</English>
@@ -2471,6 +2525,7 @@
             <Korean>상처를 꿰메는 수술용 봉합술.</Korean>
             <French>Suture chirurgicale pour suturer les blessures.</French>
             <Russian>Хирургическая нить для зашивания травм.</Russian>
+            <Portuguese>Sutura cirúrgica para fechar feridas.</Portuguese>
         </Key>
         <Key ID="STR_ACE_Medical_Treatment_Bodybag_Display">
             <English>Bodybag</English>
@@ -3681,7 +3736,7 @@
             <Czech>%1 zkontroloval krevní tlak: %2</Czech>
             <Portuguese>%1 verificou pressão arterial: %2</Portuguese>
             <Japanese>%1 が血圧を確認: %2</Japanese>
-            <Korean>%1 (이)가 혈압을 측정했습니다: %2</Korean>
+            <Korean>%1(이)가 혈압을 측정했습니다: %2</Korean>
             <Chinesesimp>%1 测得血压为 %2</Chinesesimp>
             <Chinese>已由%1確認血壓: %2</Chinese>
         </Key>
@@ -3934,7 +3989,7 @@
             <Czech>%1 zkontroloval srdeční tep: %2</Czech>
             <Portuguese>%1 verificou a frequência cardíaca: %2</Portuguese>
             <Japanese>%1 が心拍を確認: %2</Japanese>
-            <Korean>%1 (이)가 맥박을 측정했습니다: %2</Korean>
+            <Korean>%1(이)가 맥박을 측정했습니다: %2</Korean>
             <Chinesesimp>%1 测得心率为 %2</Chinesesimp>
             <Chinese>已由%1確認心跳: %2</Chinese>
         </Key>
@@ -4018,7 +4073,7 @@
             <Portuguese>A Frequência Cardíaca é de %2</Portuguese>
             <Czech>Nahmatal jsi srdeční tep u %2</Czech>
             <Japanese>計測した心拍数は %2 でした</Japanese>
-            <Korean>맥박이 %2 입니다</Korean>
+            <Korean>맥박은 %2 입니다</Korean>
             <Chinesesimp>心率为 %2</Chinesesimp>
             <Chinese>心跳為%2</Chinese>
         </Key>
@@ -4134,7 +4189,7 @@
             <Portuguese>%1 está respondendo</Portuguese>
             <Czech>%1 odpovídá</Czech>
             <Japanese>%1 は反応している</Japanese>
-            <Korean>%1 은 반응이 있습니다</Korean>
+            <Korean>%1은(는) 반응이 있습니다</Korean>
             <Chinesesimp>%1 有反应</Chinesesimp>
             <Chinese>%1 有反應</Chinese>
             <Turkish>%1 tepki veriyor</Turkish>
@@ -4151,13 +4206,18 @@
             <Portuguese>%1 não está respondendo</Portuguese>
             <Czech>%1 neodpovídá</Czech>
             <Japanese>%1 は反応していない</Japanese>
-            <Korean>%1 은 반응이 없습니다</Korean>
+            <Korean>%1은(는) 반응이 없습니다</Korean>
             <Chinesesimp>%1 没有反应</Chinesesimp>
             <Chinese>%1 沒有反應</Chinese>
             <Turkish>%1 tepki vermiyor</Turkish>
         </Key>
         <Key ID="STR_ACE_Medical_Treatment_Check_Response_UnresponsiveDirect">
             <English>%1 is unconscious</English>
+            <Japanese>%1 は意識がない</Japanese>
+            <Russian>%1 находится без сознания</Russian>
+            <Korean>%1은(는) 의식불명입니다</Korean>
+            <German>%1 ist bewusstlos</German>
+            <Italian>%1 è privo di sensi</Italian>
         </Key>
         <Key ID="STR_ACE_Medical_Treatment_Check_Response_CardiacArrest">
             <English>%1 is not responsive, taking shallow gasps and convulsing</English>
@@ -4170,9 +4230,15 @@
             <Korean>%1 은 반응이 없고, 얕은 헐떡임과 경련증세를 보입니다</Korean>
             <Russian>%1 не реагирует на раздражители, поверхностно дышит, в конвульсиях</Russian>
             <Spanish>%1 no responde, dando pequeñas bocanadas y convulsionando</Spanish>
+            <Portuguese>%1 está inconsciente, com respiração curta e convulsionando</Portuguese>
         </Key>
         <Key ID="STR_ACE_Medical_Treatment_Check_Response_CardiacArrestDirect">
             <English>%1 is in cardiac arrest</English>
+            <Japanese>%1 は心停止している</Japanese>
+            <Russian>У %1 произошла остановка сердца</Russian>
+            <Korean>%1은(는) 심정지 상태입니다</Korean>
+            <German>%1 ist im Herzstillstand</German>
+            <Italian>%1 è in arresto cardiaco</Italian>
         </Key>
         <Key ID="STR_ACE_Medical_Treatment_Check_Response_Dead">
             <English>%1 is not responsive, motionless and cold</English>
@@ -4185,9 +4251,15 @@
             <Korean>%1 은 반응이 없고, 움직임이 없으며 차갑습니다</Korean>
             <Russian>%1 не реагирует на раздражители, не шевелится и холодный</Russian>
             <Spanish>%1 no responde, sin movimiento y frío</Spanish>
+            <Portuguese>%1 está inconsciente, sem movimento e frio</Portuguese>
         </Key>
         <Key ID="STR_ACE_Medical_Treatment_Check_Response_DeadDirect">
             <English>%1 is dead</English>
+            <Japanese>%1 は死亡している</Japanese>
+            <Russian>%1 мертв</Russian>
+            <Korean>%1은(는) 사망했습니다</Korean>
+            <German>%1 ist tod</German>
+            <Italian>%1 è morto</Italian>
         </Key>
         <Key ID="STR_ACE_Medical_Treatment_Check_Response_You_Checked">
             <English>You checked %1</English>
@@ -4674,6 +4746,7 @@
             <Japanese>墓を掘る</Japanese>
             <Russian>Выкопать могилу для тела</Russian>
             <Spanish>Cavar tumba para cuerpo</Spanish>
+            <Portuguese>Escavar cova para cadáver</Portuguese>
         </Key>
         <Key ID="STR_ACE_Medical_Treatment_DiggingGrave">
             <English>Digging grave for body...</English>
@@ -4685,6 +4758,7 @@
             <Japanese>墓を掘っています</Japanese>
             <Russian>Рытьё могилы для тела...</Russian>
             <Spanish>Cavando tumba para cuerpo...</Spanish>
+            <Portuguese>Escavando cova para cadáver...</Portuguese>
         </Key>
         <Key ID="STR_ACE_Medical_Treatment_Activity_bandagedPatient">
             <English>%1 has bandaged patient</English>
@@ -4927,6 +5001,7 @@
             <German>Der Körper zuckte und kann nicht tot sein!</German>
             <Chinesesimp>身体抽搐了一下，可能还没死！</Chinesesimp>
             <Korean>꿈틀대는걸 보니 죽은 것 같지는 않습니다!</Korean>
+            <Portuguese>O corpo se retorceu e pode não estar morto!</Portuguese>
         </Key>
         <Key ID="STR_ACE_Medical_Treatment_checkHeadstoneName">
             <English>Check name on headstone</English>
@@ -4938,6 +5013,7 @@
             <Japanese>墓石の名前を確認</Japanese>
             <Russian>Проверьте имя на надгробии</Russian>
             <Spanish>Comprobar nombre en la lápida</Spanish>
+            <Portuguese>Checar nome na lápide</Portuguese>
         </Key>
         <Key ID="STR_ACE_Medical_Treatment_bandageRollover_DisplayName">
             <English>Bandage Rollover</English>
@@ -4949,6 +5025,7 @@
             <Japanese>包帯の繰り越し</Japanese>
             <Russian>Перевязка множественных ран</Russian>
             <Spanish>Vendaje múltiple</Spanish>
+            <Portuguese>Bandagem de Múltiplas Feridas</Portuguese>
         </Key>
         <Key ID="STR_ACE_Medical_Treatment_bandageRollover_Description">
             <English>If enabled, bandages can close different types of wounds on the same body part.\nBandaging multiple injuries will scale bandaging time accordingly.</English>
@@ -4960,6 +5037,7 @@
             <Japanese>有効にすると、体の同じ部分にある別の種類の傷を一つの包帯で閉じることができます。\n複数の傷に包帯を巻くと、それに応じて包帯時間が変動します。</Japanese>
             <Russian>Если эта функция включена, бинты могут закрывать различные типы ран на одной и той же части тела.\nПри перевязке нескольких повреждений время перевязки будет увеличено соответствующим образом.</Russian>
             <Spanish>Si se habilita, las vendas pueden cerrar diferentes tipos de heridas en la misma parte del cuerpo.n\Vendar múltiples heridas escala el tiempo de vendado acorde.</Spanish>
+            <Portuguese>Se habilitado, bandagens podem fechar diferentes tipos de ferimento na mesma parte do corpo.\nO fechamento de múltiplas feridas modificará o tempo de aplicação proporcionalmente.</Portuguese>
         </Key>
         <Key ID="STR_ACE_Medical_Treatment_bandageEffectiveness_DisplayName">
             <English>Bandage Effectiveness Coefficient</English>
@@ -4969,8 +5047,9 @@
             <French>Coefficient d'efficacité des bandages</French>
             <Italian>Coefficiente di efficacia bendaggi</Italian>
             <Japanese>包帯有効性係数</Japanese>
-            <Russian>Коэффициент эффективности повязки</Russian>
+            <Russian>Коэф. эффективности повязки</Russian>
             <Spanish>Coeficiente de Efectividad de Vendado</Spanish>
+            <Portuguese>Coeficiente de Eficácia da Bandagem</Portuguese>
         </Key>
         <Key ID="STR_ACE_Medical_Treatment_bandageEffectiveness_Description">
             <English>Determines how effective bandages are at closing wounds.</English>
@@ -4982,6 +5061,7 @@
             <Japanese>包帯が傷をふさぐのにどれだけ効果的かを定義します。</Japanese>
             <Russian>Определяет, насколько эффективны бинты при закрытии ран.</Russian>
             <Spanish>Determina como de efectivos son los vendajes cerrando heridas.</Spanish>
+            <Portuguese>Determina o quão efetivas as bandagens são em fechar ferimentos.</Portuguese>
         </Key>
         <Key ID="STR_ACE_Medical_Treatment_medicalTab">
             <English>Medical Items</English>
@@ -4996,6 +5076,7 @@
             <German>Medizinisches Material</German>
             <Japanese>医療品</Japanese>
             <Spanish>Objetos médicos</Spanish>
+            <Portuguese>Objetos médicos</Portuguese>
         </Key>
         <Key ID="STR_ACE_Medical_Treatment_TreatmentTimeCoeffZeus_DisplayName">
             <English>Zeus Treatment Time Coefficient</English>
@@ -5003,7 +5084,7 @@
             <German>Zeit-Koeffizient für Zeus Behandlungen</German>
             <Japanese>Zeus治療時間係数</Japanese>
             <Korean>제우스 치료 시간 계수</Korean>
-            <Russian>Коэффициент времени обработки Zeus</Russian>
+            <Russian>Коэф. времени обработки Zeus</Russian>
             <French>Coeff. de temps</French>
             <Spanish>Coeficiente de Tiempo del Tratamiento de Zeus</Spanish>
         </Key>
@@ -5036,10 +5117,11 @@
         <Key ID="STR_ACE_Medical_Treatment_Administer_Painkillers">
             <English>Administer Painkillers</English>
             <Italian>Somministra Antidolorifici</Italian>
-            <Russian>Испол-ть обезболивающие</Russian>
+            <Russian>Ввести обезболивающие</Russian>
             <Japanese>鎮痛剤を投与</Japanese>
             <Korean>진통제 투여</Korean>
             <French>Administrer des analgésiques</French>
+            <German>Verabreiche Schmerztabletten</German>
             <Spanish>Administrar Analgésicos</Spanish>
         </Key>
         <Key ID="STR_ACE_Medical_Treatment_Administering_Painkillers">
@@ -5049,6 +5131,7 @@
             <Japanese>鎮痛剤を投与しています・・・</Japanese>
             <Korean>진통제 투여 중...</Korean>
             <French>Administration d'analgésiques...</French>
+            <German>Verabreiche Schmerztablette...</German>
             <Spanish>Administrando Analgésicos...</Spanish>
         </Key>
         <Key ID="STR_ACE_Medical_Treatment_painkillers_Desc_Short">
@@ -5058,6 +5141,7 @@
             <Japanese>軽度から中程度の痛みに対処するために使用される市販の鎮痛薬。</Japanese>
             <Korean>가벼운 통증부터 중간 정도의 통증을 퇴치하는 데 사용되는 일반의약품 진통제입니다.</Korean>
             <French>Analgésique sans ordonnance utilisé pour lutter contre les douleurs légères à modérées.</French>
+            <German>Rezeptfreies Analgetikum zur Bekämpfung leichter bis mittelschwerer Schmerzen.</German>
             <Spanish>Analgésico sin receta médica  usado para aplacar dolores de ligeros a moderados.</Spanish>
         </Key>
         <Key ID="STR_ACE_Medical_Treatment_painkillers_Desc_Use">
@@ -5067,6 +5151,7 @@
             <Japanese>軽度から中程度の痛みに対処するために使用される市販の鎮痛薬。</Japanese>
             <Korean>가벼운 통증부터 중간 정도의 통증을 퇴치하는 데 사용되는 일반의약품 진통제입니다.</Korean>
             <French>Analgésique sans ordonnance utilisé pour lutter contre les douleurs légères à modérées.</French>
+            <German>Rezeptfreies Analgetikum zur Bekämpfung leichter bis mittelschwerer Schmerzen.</German>
             <Spanish>Analgésico sin receta médica  usado para aplacar dolores de ligeros a moderados.</Spanish>
         </Key>
     </Package>
diff --git a/addons/medical_vitals/functions/fnc_updateHeartRate.sqf b/addons/medical_vitals/functions/fnc_updateHeartRate.sqf
index 187a8ffe58..0390a9ad07 100644
--- a/addons/medical_vitals/functions/fnc_updateHeartRate.sqf
+++ b/addons/medical_vitals/functions/fnc_updateHeartRate.sqf
@@ -40,13 +40,9 @@ if IN_CRDC_ARRST(_unit) then {
         private _spo2 = GET_SPO2(_unit);
         private _painLevel = GET_PAIN_PERCEIVED(_unit);
 
-        private _targetBP = 107;
-        if (_bloodVolume < BLOOD_VOLUME_CLASS_2_HEMORRHAGE) then {
-            _targetBP = _targetBP * (_bloodVolume / DEFAULT_BLOOD_VOLUME);
-        };
-
         _targetHR = DEFAULT_HEART_RATE;
         if (_bloodVolume < BLOOD_VOLUME_CLASS_3_HEMORRHAGE) then {
+            private _targetBP = 107 * (_bloodVolume / DEFAULT_BLOOD_VOLUME);
             _targetHR = _heartRate * (_targetBP / (45 max _meanBP));
         };
         if (_painLevel > 0.2) then {
diff --git a/addons/medical_vitals/stringtable.xml b/addons/medical_vitals/stringtable.xml
index 54c19f53fa..25b278732e 100644
--- a/addons/medical_vitals/stringtable.xml
+++ b/addons/medical_vitals/stringtable.xml
@@ -9,6 +9,7 @@
             <Japanese>バイタル</Japanese>
             <Korean>생명</Korean>
             <French>Paramètres vitaux</French>
+            <German>Vitalwerte</German>
             <Spanish>Vitales</Spanish>
         </Key>
         <Key ID="STR_ACE_Medical_Vitals_simulateSpO2_DisplayName">
@@ -18,7 +19,9 @@
             <Japanese>SpO2シミュレーションを有効化</Japanese>
             <Korean>산소포화도 시뮬레이션 활성화</Korean>
             <French>Activer la simulation de la SpO2</French>
+            <German>SpO2-Simulation aktivieren</German>
             <Spanish>Habilitar Simulación SpO2</Spanish>
+            <Portuguese>Habilitar simulação de SpO2</Portuguese>
         </Key>
         <Key ID="STR_ACE_Medical_Vitals_simulateSpO2_Description">
             <English>Enables oxygen saturation simulation, providing variable heart rate and oxygen demand based on physical activity and altitude. Required for Airway Management.</English>
@@ -27,7 +30,9 @@
             <Japanese>酸素飽和度シミュレーションを有効にし、身体活動や標高に基づいて変動する心拍数と酸素要求量の機能を提供します。 気道管理に必要です。</Japanese>
             <Korean>산소포화도 시뮬레이션을 활성화하여 신체 활동과 고도에 따라 다양한 심박수와 산소 요구량을 제공합니다. 기도 관리에 필요합니다.</Korean>
             <French>Permet de simuler la saturation en oxygène, de modifier la fréquence cardiaque et la consommation d'oxygène en fonction de l'activité physique et de l'altitude. Nécessaire pour la gestion des voies respiratoires.</French>
+            <German>Aktiviert die Simulation der Sauerstoffsättigung und bietet variable Herzfrequenz und Sauerstoffbedarf basierend auf körperlicher Aktivität und Geländehöhe. Erforderlich für das Atemwegsmanagement.</German>
             <Spanish>Habilita la saturación de oxígeno, utilizando la demanda de oxígeno y ritmo cardíaco basado en la actividad física y la altitud. Requerido para el Manejo de las Vías Aéreas.</Spanish>
+            <Portuguese>Habilita a saturação de oxigênio, tornando variáveis o batimento cardíaco e demanda de oxigênio baseados em atividade física e altitude. Necessário para o gerenciamento de vias aéreas.</Portuguese>
         </Key>
     </Package>
 </Project>
diff --git a/addons/microdagr/stringtable.xml b/addons/microdagr/stringtable.xml
index 786cb15b95..0aa0dafacf 100644
--- a/addons/microdagr/stringtable.xml
+++ b/addons/microdagr/stringtable.xml
@@ -357,7 +357,7 @@
             <Chinese>切換微型軍用GPS接收器顯示模式</Chinese>
         </Key>
         <Key ID="STR_ACE_MicroDAGR_show">
-            <English>Show MicoDAGR</English>
+            <English>Show MicroDAGR</English>
             <German>Zeige MicroDAGR</German>
             <Spanish>Mostrar MicroDAGR</Spanish>
             <Russian>Показать MicroDAGR</Russian>
@@ -605,6 +605,7 @@
             <Polish>MicroDAGR - Poprzedni Tryb</Polish>
             <Chinesesimp>微型 GPS 接收器—上一个模式</Chinesesimp>
             <Korean>마이크로DAGR - 이전 모드</Korean>
+            <Portuguese>MicroDAGR - Modo Anterior</Portuguese>
         </Key>
         <Key ID="STR_ACE_MicroDAGR_nextMode">
             <English>MicroDAGR - Next Mode</English>
@@ -617,6 +618,7 @@
             <Polish>MicroDAGR - Kolejny Tryb</Polish>
             <Chinesesimp>微型 GPS 接收器—下一个模式</Chinesesimp>
             <Korean>마이크로DAGR - 다음 모드</Korean>
+            <Portuguese>MicroDAGR - Modo Seguinte</Portuguese>
         </Key>
     </Package>
 </Project>
diff --git a/addons/minedetector/XEH_postInit.sqf b/addons/minedetector/XEH_postInit.sqf
index 77f2f6761c..f5f5de0ca8 100644
--- a/addons/minedetector/XEH_postInit.sqf
+++ b/addons/minedetector/XEH_postInit.sqf
@@ -1,16 +1,7 @@
 #include "script_component.hpp"
 
 // Create a dictionary to store detector configs
-GVAR(detectorConfigs) = call CBA_fnc_createNamespace;
-
-// Create a dictionary of detectable classnames
-GVAR(detectableClasses) = call CBA_fnc_createNamespace;
-
-private _detectableClasses = call (uiNamespace getVariable [QGVAR(detectableClasses), {[]}]); //See XEH_preStart.sqf
-{
-    GVAR(detectableClasses) setVariable [_x, true];
-} forEach _detectableClasses;
-TRACE_1("built cache",count allVariables GVAR(detectableClasses));
+GVAR(detectorConfigs) = createHashMap;
 
 [QGVAR(enableDetector), LINKFUNC(enableDetector)] call CBA_fnc_addEventHandler;
 [QGVAR(disableDetector), LINKFUNC(disableDetector)] call CBA_fnc_addEventHandler;
diff --git a/addons/minedetector/XEH_preStart.sqf b/addons/minedetector/XEH_preStart.sqf
index 48f003d08e..046c037364 100644
--- a/addons/minedetector/XEH_preStart.sqf
+++ b/addons/minedetector/XEH_preStart.sqf
@@ -15,5 +15,5 @@ private _detectableClasses = [];
     };
 } forEach (configProperties [configFile >> "CfgAmmo", "isClass _x", true]);
 
-TRACE_1("compiled",count _detectableClasses);
-uiNamespace setVariable [QGVAR(detectableClasses), compileFinal str _detectableClasses];
+TRACE_1("built cache",count _detectableClasses);
+uiNamespace setVariable [QGVAR(detectableClasses), compileFinal (_detectableClasses createHashMapFromArray [])];
diff --git a/addons/minedetector/functions/fnc_getDetectedObject.sqf b/addons/minedetector/functions/fnc_getDetectedObject.sqf
index 810e4d4ff4..7811b3eaaa 100644
--- a/addons/minedetector/functions/fnc_getDetectedObject.sqf
+++ b/addons/minedetector/functions/fnc_getDetectedObject.sqf
@@ -38,15 +38,13 @@ private _mine = objNull;
 private _distance = -1;
 
 {
-    private _objectType = typeOf _x;
-
-    _isDetectable = GVAR(detectableClasses) getVariable _objectType;
-    if (isNil "_isDetectable" || {(getModelInfo _x) select 0 == "empty.p3d"}) then {
-        _isDetectable = false;
+    if ((getModelInfo _x) select 0 == "empty.p3d") then {
+        continue;
     };
 
-    // If a nun-null object was detected exit the search
-    if (_isDetectable && {!isNull _x}) exitWith {
+    // If an object was detected, exit the search
+    if ((typeOf _x) in (uiNamespace getVariable QGVAR(detectableClasses))) exitWith {
+        _isDetectable = true;
         _distance = _detectorPointAGL distance _x;
         _mine = _x;
         TRACE_3("return",_isDetectable,_mine,_distance);
diff --git a/addons/minedetector/functions/fnc_getDetectorConfig.sqf b/addons/minedetector/functions/fnc_getDetectorConfig.sqf
index fe7a888ebf..a5566cbfbf 100644
--- a/addons/minedetector/functions/fnc_getDetectorConfig.sqf
+++ b/addons/minedetector/functions/fnc_getDetectorConfig.sqf
@@ -19,18 +19,15 @@ params ["_detectorType"];
 
 if (_detectorType isEqualTo "") exitWith {[]};
 
-private _detectorConfig = GVAR(detectorConfigs) getVariable _detectorType;
-if (isNil "_detectorConfig") then {
+GVAR(detectorConfigs) getOrDefaultCall [_detectorType, {
     private _cfgEntry = (configFile >> "ACE_detector" >> "detectors" >> _detectorType);
     if (isClass _cfgEntry) then {
-        _detectorConfig = [
+        [
             _detectorType,
             getNumber (_cfgEntry >> "radius"),
             getArray (_cfgEntry >> "sounds")
         ];
     } else {
-        _detectorConfig = [];
+        []
     };
-    GVAR(detectorConfigs) setVariable [_detectorType, _detectorConfig];
-};
-_detectorConfig
+}, true]
diff --git a/addons/missileguidance/functions/fnc_cycleAttackProfileKeyDown.sqf b/addons/missileguidance/functions/fnc_cycleAttackProfileKeyDown.sqf
index d25d2bc2b7..2263716724 100644
--- a/addons/missileguidance/functions/fnc_cycleAttackProfileKeyDown.sqf
+++ b/addons/missileguidance/functions/fnc_cycleAttackProfileKeyDown.sqf
@@ -18,7 +18,7 @@
 TRACE_1("cycle fire mode",_this);
 
 if (!alive ACE_player) exitWith {};
-if (!([ACE_player, objNull, ["isNotInside"]] call EFUNC(common,canInteractWith))) exitWith {};
+if !([ACE_player, objNull, ["isNotInside"]] call EFUNC(common,canInteractWith)) exitWith {};
 
 
 private _currentShooter = objNull;
diff --git a/addons/missileguidance/functions/fnc_onFired.sqf b/addons/missileguidance/functions/fnc_onFired.sqf
index 18eaf2a7c7..1d63d120a9 100644
--- a/addons/missileguidance/functions/fnc_onFired.sqf
+++ b/addons/missileguidance/functions/fnc_onFired.sqf
@@ -20,7 +20,7 @@
 params ["_shooter","_weapon","","_mode","_ammo","","_projectile"];
 
 // Bail on not missile
-if (!(_ammo isKindOf "MissileBase")) exitWith {};
+if !(_ammo isKindOf "MissileBase") exitWith {};
 
 // Bail if guidance is disabled for this ammo
 if ((getNumber (configFile >> "CfgAmmo" >> _ammo >> QUOTE(ADDON) >> "enabled")) != 1) exitWith {};
diff --git a/addons/mk6mortar/functions/fnc_handleFired.sqf b/addons/mk6mortar/functions/fnc_handleFired.sqf
index f2979d0e4e..8ea2984b79 100644
--- a/addons/mk6mortar/functions/fnc_handleFired.sqf
+++ b/addons/mk6mortar/functions/fnc_handleFired.sqf
@@ -28,7 +28,7 @@ if (_vehicle distance ACE_player > 8000) exitWith {};
 
 //AI will have no clue how to use:
 private _shooterMan = gunner _vehicle;
-if (!([_shooterMan] call EFUNC(common,isPlayer))) exitWith {};
+if !([_shooterMan] call EFUNC(common,isPlayer)) exitWith {};
 
 //Calculate air density:
 private _altitude = (getPosASL _vehicle) select 2;
diff --git a/addons/mk6mortar/functions/fnc_handlePlayerVehicleChanged.sqf b/addons/mk6mortar/functions/fnc_handlePlayerVehicleChanged.sqf
index 216bab43bc..c3dcc2cfe4 100644
--- a/addons/mk6mortar/functions/fnc_handlePlayerVehicleChanged.sqf
+++ b/addons/mk6mortar/functions/fnc_handlePlayerVehicleChanged.sqf
@@ -1,7 +1,7 @@
 #include "..\script_component.hpp"
 /*
  * Author: PabstMirror
- * Handles player getting into new vehicle.  Loads PFEG for mortar display if it is a mortar.
+ * Handles player getting into new vehicle. Loads PFEG for mortar display if it is a mortar.
  *
  * Arguments:
  * 0: Player <OBJECT>
@@ -11,7 +11,7 @@
  * None
  *
  * Example:
- * [bob, mortar] call ace_mk6mortar_fnc_handlePlayerVehicleChanged;
+ * [player, cursorObject] call ace_mk6mortar_fnc_handlePlayerVehicleChanged
  *
  * Public: No
  */
@@ -19,88 +19,83 @@
 params ["_player", "_newVehicle"];
 
 if (isNull _newVehicle) exitWith {};
-if (!(_newVehicle isKindOf "Mortar_01_base_F")) exitWith {};
+if !(_newVehicle isKindOf "Mortar_01_base_F") exitWith {};
 
 private _tubeWeaponName = (weapons _newVehicle) select 0;
 private _fireModes = getArray (configFile >> "CfgWeapons" >> _tubeWeaponName >> "modes");
 
-//Restore last firemode:
-private _lastFireMode = _newVehicle getVariable [QGVAR(lastFireMode), -1];
-if (_lastFireMode != -1) then {
-    _player action ["SwitchWeapon", _newVehicle, _player, _lastFireMode];
+// Restore last firemode
+private _lastSavedWeaponsInfo = _newVehicle getVariable QGVAR(lastFireMode);
+
+if (!isNil "_lastSavedWeaponsInfo") then {
+    _newVehicle selectWeaponTurret [_lastSavedWeaponsInfo select 0, [0], _lastSavedWeaponsInfo select 1, _lastSavedWeaponsInfo select 2];
 };
 
 [{
-    params ["_args", "_pfID"];
-    _args params ["_mortarVeh", "_fireModes"];
+    params ["_mortarVeh", "_pfhID"];
 
-    if ((vehicle ACE_player) != _mortarVeh) then {
-        [_pfID] call CBA_fnc_removePerFrameHandler;
+    if ((vehicle ACE_player) != _mortarVeh) exitWith {
+        _pfhID call CBA_fnc_removePerFrameHandler;
+    };
+
+    // Save firemode ('charge' from weaponstate) on vehicle
+    _mortarVeh setVariable [QGVAR(lastFireMode), (weaponState [_mortarVeh, [0]]) select [0, 3]];
+
+    if (shownArtilleryComputer && {!GVAR(allowComputerRangefinder)}) then {
+        // Don't like this solution, but it works
+        closeDialog 0;
+        [parseText "Computer Disabled"] call EFUNC(common,displayTextStructured);
+    };
+
+    private _display = uiNamespace getVariable ["ACE_Mk6_RscWeaponRangeArtillery", displayNull];
+
+    if (isNull _display) exitWith {}; // It may be null for the first frame
+
+    // Hud should hidden in 3rd person
+    private _notGunnerView = cameraView != "GUNNER";
+    private _useMils = _mortarVeh getVariable [QGVAR(useMils), true];
+
+    // Get aiming values from ace_artillerytables
+    // Note: it also handles displaying the "charge" level
+    private _realAzimuth = missionNamespace getVariable [QEGVAR(artillerytables,predictedAzimuth), -1];
+    private _realElevation = missionNamespace getVariable [QEGVAR(artillerytables,predictedElevation), -1];
+
+    // Update Heading Display
+    if (_notGunnerView || !GVAR(allowCompass)) then {
+        (_display displayCtrl 80156) ctrlSetText "";
     } else {
-
-        private _useMils = _mortarVeh getVariable [QGVAR(useMils), true];
-
-        //Compute: 'charge' from weaponstate
-        private _currentFireMode = (weaponState [_mortarVeh, [0]]) select 2;
-        private _currentChargeMode = _fireModes find _currentFireMode;
-
-        //Save firemode on vehicle:
-        _mortarVeh setVariable [QGVAR(lastFireMode), _currentChargeMode];
-
-        if (shownArtilleryComputer && {!GVAR(allowComputerRangefinder)}) then {
-            //Don't like this solution, but it works
-            closeDialog 0;
-            [parseText "Computer Disabled"] call EFUNC(common,displayTextStructured);
-        };
-
-        private _display = uiNamespace getVariable ["ACE_Mk6_RscWeaponRangeArtillery", displayNull];
-        if (isNull _display) exitWith {}; //It may be null for the first frame
-
-        //Hud should hidden in 3rd person
-        private _notGunnerView = cameraView != "GUNNER";
-
-        // Get aiming values from ace_artillerytables
-        // Note: it also handles displaying the "charge" level
-        private _realAzimuth = missionNamespace getVariable [QEGVAR(artillerytables,predictedAzimuth), -1];
-        private _realElevation = missionNamespace getVariable [QEGVAR(artillerytables,predictedElevation), -1];
-
-        //Update Heading Display:
-        if (_notGunnerView || (!GVAR(allowCompass))) then {
-            (_display displayCtrl 80156) ctrlSetText "";
+        if (_useMils) then {
+            (_display displayCtrl 80156) ctrlSetText str (((round (_realAzimuth * 6400 / 360)) + 6400) % 6400);
         } else {
+            (_display displayCtrl 80156) ctrlSetText str ((round (_realAzimuth + 360)) % 360);
+        };
+    };
+
+    // Update CurrentElevation Display
+    if (_notGunnerView) then {
+        (_display displayCtrl 80175) ctrlSetText "";
+    } else {
+        if (_useMils) then {
+            (_display displayCtrl 80175) ctrlSetText str ((round (_realElevation * 6400 / 360)) % 6400);
+        } else {
+            (_display displayCtrl 80175) ctrlSetText str (((round (_realElevation * 100)) / 100) % 360);
+        };
+    };
+
+    // Update ElevationNeeded Display
+    if (_notGunnerView || !GVAR(allowComputerRangefinder)) then {
+        (_display displayCtrl 80176) ctrlSetText "";
+    } else {
+        private _elevDeg = parseNumber ctrlText (_display displayCtrl 176);
+        if (_elevDeg <= 0) then { // Bad data means "----" out of range
+            (_display displayCtrl 80176) ctrlSetText (ctrlText (_display displayCtrl 176));
+        } else {
+            _elevDeg = _elevDeg + (_realElevation - (parseNumber ctrlText (_display displayCtrl 175)));
             if (_useMils) then {
-                (_display displayCtrl 80156) ctrlSetText str (((round (_realAzimuth * 6400 / 360)) + 6400) % 6400);
+                (_display displayCtrl 80176) ctrlSetText str round ((round (_elevDeg * 6400 / 360)) % 6400);
             } else {
-                (_display displayCtrl 80156) ctrlSetText str ((round (_realAzimuth + 360)) % 360);
-            };
-        };
-
-        //Update CurrentElevation Display
-        if (_notGunnerView) then {
-            (_display displayCtrl 80175) ctrlSetText "";
-        } else {
-            if (_useMils) then {
-                (_display displayCtrl 80175) ctrlSetText str ((round (_realElevation * 6400 / 360)) % 6400);
-            } else {
-                (_display displayCtrl 80175) ctrlSetText str (((round (_realElevation * 100)) / 100) % 360);
-            };
-        };
-
-        //Update ElevationNeeded Display:
-        if (_notGunnerView || (!GVAR(allowComputerRangefinder))) then {
-            (_display displayCtrl 80176) ctrlSetText "";
-        } else {
-            private _elevDeg = parseNumber ctrlText (_display displayCtrl 176);
-            if (_elevDeg <= 0) then { //Bad data means "----" out of range
-                (_display displayCtrl 80176) ctrlSetText (ctrlText (_display displayCtrl 176));
-            } else {
-                _elevDeg = _elevDeg + (_realElevation - (parseNumber ctrlText (_display displayCtrl 175)));
-                if (_useMils) then {
-                    (_display displayCtrl 80176) ctrlSetText str round ((round (_elevDeg * 6400 / 360)) % 6400);
-                } else {
-                    (_display displayCtrl 80176) ctrlSetText str (((round (_elevDeg * 100)) / 100) % 360);
-                };
+                (_display displayCtrl 80176) ctrlSetText str (((round (_elevDeg * 100)) / 100) % 360);
             };
         };
     };
-}, 0, [_newVehicle, _fireModes]] call CBA_fnc_addPerFrameHandler;
+}, 0, _newVehicle] call CBA_fnc_addPerFrameHandler;
diff --git a/addons/mk6mortar/stringtable.xml b/addons/mk6mortar/stringtable.xml
index a0d8612aa5..c6f29a037d 100644
--- a/addons/mk6mortar/stringtable.xml
+++ b/addons/mk6mortar/stringtable.xml
@@ -46,7 +46,7 @@
             <Portuguese>Abrir tabela de distâncias para 82mm</Portuguese>
             <Czech>Otevřít 82mm Rangetable</Czech>
             <Italian>Apri la tavola di tiro 82mm</Italian>
-            <Japanese>82mm用射表を開く</Japanese>
+            <Japanese>82mm用 射表 を開く</Japanese>
             <Korean>82mm 사거리표 열기</Korean>
             <Chinesesimp>开启82 mm 迫击炮射表</Chinesesimp>
             <Chinese>開啟82毫米迫擊炮射表</Chinese>
@@ -163,7 +163,7 @@
             <Hungarian>A távmérő és számítógép megjelenítése (ezeket el KELL távolítani ha a légellenállás engedélyezve van)</Hungarian>
             <Russian>Показывает компьютер и дальномер (это НУЖНО отключить, если вы включаете сопротивление воздуха)</Russian>
             <Italian>Consenti l'utilizzo del Computer Balistico e del Telemetro (questi DEVONO essere disabilitati se vuoi abilitare la resistenza dell'aria)</Italian>
-            <Japanese>砲撃コンピュータと距離計を表示します (空気抵抗を仕様する場合は必ず無効化する必要があります)</Japanese>
+            <Japanese>砲撃コンピュータと距離計を表示します (空気抵抗を有効化する場合はこれらを取り除く必要があります)</Japanese>
             <Korean>탄도계산컴퓨터와 거리측정기를 보여줍니다(공기저항을 활성화했을 경우 이 항목은 비활성화 되어야 합니다)</Korean>
             <Chinesesimp>显示弹道计算机和测距仪（如果有启用空气阻力功能时，须停用此项功能）</Chinesesimp>
             <Chinese>顯示射控電腦和測距儀 (如果有啟用空氣阻力功能時，須停用此項功能)</Chinese>
@@ -241,7 +241,7 @@
             <Italian>Rimuove i caricatori di colpi dal mortaio. Un operatore dovrà caricare proiettili singoli prima di poter fare fuoco. Non viene applicato su operatori IA.</Italian>
             <Portuguese>Elimina os carregadores do morteiro, requerendo que o atirador ou carregador utilize de forma individual a munição. Não afeta os morteiros controlados pela IA.</Portuguese>
             <Russian>Удаляет артиллерийские магазины, требует загрузку отдельных снарядов стрелком или заряжающим. Не влияет на артиллерию ИИ.</Russian>
-            <Japanese>迫撃砲から弾薬を除去します。射手か装填手により予め装填されている必要があります。AI迫撃砲へ影響を与えません。</Japanese>
+            <Japanese>迫撃砲から弾倉を除去します。一発ずつ射手か装填手によって装填される必要があります。AIの迫撃砲には影響を与えません。</Japanese>
             <Korean>박격포 탄창을 제거합니다, 사수나 장전수가 개별적으로 탄환을 넣어줘야 합니다. 인공지능은 영향을 받지 않습니다.</Korean>
             <Chinesesimp>开启此功能时。迫击炮的弹药需由炮手与装填手共同合作来进行装填。此功能并不影响由 AI 射击的迫击炮</Chinesesimp>
             <Chinese>開啟此功能時。迫擊砲的彈藥需由砲手與裝填手共同合作來進行裝填。此功能並不影響由AI射擊的迫擊砲</Chinese>
@@ -257,7 +257,7 @@
             <Czech>Odstranit náboj</Czech>
             <Portuguese>Remover munição</Portuguese>
             <Russian>Извлечь снаряд</Russian>
-            <Japanese>弾薬を除去</Japanese>
+            <Japanese>砲弾を取り除く</Japanese>
             <Korean>탄약 제거</Korean>
             <Chinesesimp>卸除弹头</Chinesesimp>
             <Chinese>卸除彈頭</Chinese>
@@ -273,7 +273,7 @@
             <Czech>Nabít minomet</Czech>
             <Portuguese>Carregar morteiro</Portuguese>
             <Russian>Зарядить миномет</Russian>
-            <Japanese>弾薬を装填</Japanese>
+            <Japanese>砲弾を装填</Japanese>
             <Korean>탄약 장전</Korean>
             <Chinesesimp>装载弹头</Chinesesimp>
             <Chinese>裝載彈頭</Chinese>
@@ -288,7 +288,7 @@
             <Italian>Togliendo Proiettile</Italian>
             <Portuguese>Descarregar munição</Portuguese>
             <Russian>Извлечение снаряда</Russian>
-            <Japanese>弾薬を除去しています</Japanese>
+            <Japanese>砲弾を取り除いています</Japanese>
             <Korean>탄약 제거 중</Korean>
             <Chinesesimp>正在卸除弹头</Chinesesimp>
             <Chinese>卸除彈頭中</Chinese>
@@ -305,7 +305,7 @@
             <Czech>Připavuji náboj</Czech>
             <Portuguese>Preparar munição</Portuguese>
             <Russian>Подготовка снаряда</Russian>
-            <Japanese>砲弾を事前装填</Japanese>
+            <Japanese>砲弾を準備</Japanese>
             <Korean>탄약 준비 중</Korean>
             <Chinesesimp>正在准备弹头</Chinesesimp>
             <Chinese>準備彈頭中</Chinese>
@@ -544,7 +544,7 @@
             <Czech>[ACE] Bedna se standardní 82mm municí</Czech>
             <Portuguese>[ACE] Caixa de Munição 82mm Padrão</Portuguese>
             <Russian>[ACE] Ящик снарядов 82мм (стандартный)</Russian>
-            <Japanese>[ACE] 82mm 保管箱</Japanese>
+            <Japanese>[ACE] 82mm 標準砲弾セット入り弾薬箱</Japanese>
             <Korean>[ACE] 82mm 기본 장비 상자</Korean>
             <Chinesesimp>[ACE] 82 mm 预设弹药箱</Chinesesimp>
             <Chinese>[ACE] 82毫米預設彈藥箱</Chinese>
diff --git a/addons/nametags/XEH_postInit.sqf b/addons/nametags/XEH_postInit.sqf
index 85115690b4..a3fb7307f2 100644
--- a/addons/nametags/XEH_postInit.sqf
+++ b/addons/nametags/XEH_postInit.sqf
@@ -50,7 +50,7 @@ if (missionNamespace getVariable [QGVAR(useFactionIcons), true]) then {
     {
         if (isArray (_x >> QGVAR(rankIcons))) then {
             private _faction = configName _x;
-            if (!isNil {GVAR(factionRanks) getVariable _faction}) exitWith {}; // don't overwrite if already set
+            if (_faction in GVAR(factionRanks)) exitWith {}; // don't overwrite if already set
             private _icons = getArray (_x >> QGVAR(rankIcons));
             [_faction, _icons] call FUNC(setFactionRankIcons);
         };
diff --git a/addons/nametags/functions/fnc_drawNameTagIcon.sqf b/addons/nametags/functions/fnc_drawNameTagIcon.sqf
index 428cf037d5..efe0c6bf15 100644
--- a/addons/nametags/functions/fnc_drawNameTagIcon.sqf
+++ b/addons/nametags/functions/fnc_drawNameTagIcon.sqf
@@ -42,7 +42,7 @@ _fnc_parameters = {
 
         default {
             private _targetFaction = _target getVariable [QGVAR(faction), faction _target];
-            private _customRankIcons = GVAR(factionRanks) getVariable _targetFaction;
+            private _customRankIcons = GVAR(factionRanks) get _targetFaction;
 
             if (!isNil "_customRankIcons") then {
                 _customRankIcons param [ALL_RANKS find rank _target, ""] // return
diff --git a/addons/nametags/functions/fnc_initIsSpeaking.sqf b/addons/nametags/functions/fnc_initIsSpeaking.sqf
index 5bae931e60..db2bf30ac3 100644
--- a/addons/nametags/functions/fnc_initIsSpeaking.sqf
+++ b/addons/nametags/functions/fnc_initIsSpeaking.sqf
@@ -41,14 +41,14 @@ switch (true) do {
         INFO("ACRE Detected.");
         DFUNC(isSpeaking) = {
             params ["_unit"];
-            ([_unit] call acre_api_fnc_isSpeaking) && {!(_unit getVariable ["ACE_isUnconscious", false])}
+            ([_unit] call acre_api_fnc_isSpeaking) && {_unit call EFUNC(common,isAwake)}
         };
     };
     case (["task_force_radio"] call EFUNC(common,isModLoaded)): {
         INFO("TFAR Detected.");
         DFUNC(isSpeaking) =     {
             params ["_unit"];
-            (_unit getVariable ["tf_isSpeaking", false]) && {!(_unit getVariable ["ACE_isUnconscious", false])}
+            (_unit getVariable ["tf_isSpeaking", false]) && {_unit call EFUNC(common,isAwake)}
         };
     };
     default {
@@ -65,7 +65,7 @@ switch (true) do {
 
         DFUNC(isSpeaking) = {
             params ["_unit"];
-            (_unit getVariable [QGVAR(isSpeakingInGame), false]) && {!(_unit getVariable ["ACE_isUnconscious", false])}
+            (_unit getVariable [QGVAR(isSpeakingInGame), false]) && {_unit call EFUNC(common,isAwake)}
         };
     };
 };
diff --git a/addons/nametags/functions/fnc_setFactionRankIcons.sqf b/addons/nametags/functions/fnc_setFactionRankIcons.sqf
index 88fd880833..42d3ed40cb 100644
--- a/addons/nametags/functions/fnc_setFactionRankIcons.sqf
+++ b/addons/nametags/functions/fnc_setFactionRankIcons.sqf
@@ -25,7 +25,7 @@
  */
 
 if (isNil QGVAR(factionRanks)) then {
-    GVAR(factionRanks) = [] call CBA_fnc_createNamespace;
+    GVAR(factionRanks) = createHashMap;
 };
 
 params [["_faction", "", [""]], ["_icons", [], [[]], [7]]];
@@ -33,6 +33,11 @@ TRACE_2("setFactionRankIcons",_faction,_icons);
 
 if !(_faction != "" && {_icons isEqualTypeAll ""}) exitWith {false};
 
-GVAR(factionRanks) setVariable [_faction, _icons];
+_faction = configName (configFile >> "CfgFactionClasses" >> _faction);
+
+// Faction doesn't exist
+if (_faction == "") exitWith {false};
+
+GVAR(factionRanks) set [_faction, _icons];
 
 true
diff --git a/addons/nightvision/XEH_postInit.sqf b/addons/nightvision/XEH_postInit.sqf
index 9bfee4d166..2933877771 100644
--- a/addons/nightvision/XEH_postInit.sqf
+++ b/addons/nightvision/XEH_postInit.sqf
@@ -21,6 +21,9 @@ GVAR(ppeffectRadialBlur) = -1;
 GVAR(ppeffectColorCorrect) = -1;
 GVAR(ppeffectBlur) = -1;
 
+if (isNil QGVAR(const_MaxBrightness)) then { GVAR(const_MaxBrightness) = 0; };
+if (isNil QGVAR(const_MinBrightness)) then { GVAR(const_MinBrightness) = -6; };
+
 GVAR(isUsingMagnification) = false;
 
 ["CBA_settingsInitialized", {
@@ -61,7 +64,7 @@ if (!isNil QGVAR(serverPriorFog)) then {[] call FUNC(nonDedicatedFix);}; // If v
     if !([ACE_player, objNull, ["isNotEscorting", "isNotInside", "isNotSitting", "isNotRefueling"]] call EFUNC(common,canInteractWith)) exitWith {false};
     // Conditions: specific
     if ((currentVisionMode ACE_player != 1)) exitWith {false};
-    if (!(missionNamespace getVariable [QGVAR(allowBrightnessControl), true])) exitWith {false}; // just a mission setVar (not ace_setting)
+    if !(missionNamespace getVariable [QGVAR(allowBrightnessControl), true]) exitWith {false}; // just a mission setVar (not ace_setting)
 
     // Statement
     [ACE_player, 1] call FUNC(changeNVGBrightness);
@@ -73,7 +76,7 @@ if (!isNil QGVAR(serverPriorFog)) then {[] call FUNC(nonDedicatedFix);}; // If v
     if !([ACE_player, objNull, ["isNotEscorting", "isNotInside", "isNotSitting", "isNotRefueling"]] call EFUNC(common,canInteractWith)) exitWith {false};
     // Conditions: specific
     if ((currentVisionMode ACE_player != 1)) exitWith {false};
-    if (!(missionNamespace getVariable [QGVAR(allowBrightnessControl), true])) exitWith {false}; // just a mission setVar (not ace_setting)
+    if !(missionNamespace getVariable [QGVAR(allowBrightnessControl), true]) exitWith {false}; // just a mission setVar (not ace_setting)
 
     // Statement
     [ACE_player, -1] call FUNC(changeNVGBrightness);
diff --git a/addons/nightvision/functions/fnc_changeNVGBrightness.sqf b/addons/nightvision/functions/fnc_changeNVGBrightness.sqf
index 1697fa907e..d0b210fe29 100644
--- a/addons/nightvision/functions/fnc_changeNVGBrightness.sqf
+++ b/addons/nightvision/functions/fnc_changeNVGBrightness.sqf
@@ -23,7 +23,7 @@ private _effectsEnabled    = GVAR(effectScaling) != 0;
 private _defaultBrightness = [-3, 0] select _effectsEnabled;
 
 private _brightness = _player getVariable [QGVAR(NVGBrightness), _defaultBrightness];
-_brightness = ((_brightness + _changeInBrightness) min 0) max -6;
+_brightness = ((_brightness + _changeInBrightness) min GVAR(const_MaxBrightness)) max GVAR(const_MinBrightness);
 _player setVariable [QGVAR(NVGBrightness), _brightness, false];
 
 // Display default setting as 0
diff --git a/addons/nightvision/stringtable.xml b/addons/nightvision/stringtable.xml
index 1c1cd61ba7..1911681dd6 100644
--- a/addons/nightvision/stringtable.xml
+++ b/addons/nightvision/stringtable.xml
@@ -28,6 +28,7 @@
             <Chinesesimp>夜视仪（一代，棕色）</Chinesesimp>
             <Korean>아투경 (1세대, 갈색)</Korean>
             <Spanish>Gafas de visión nocturna (Gen1, Marrón)</Spanish>
+            <Portuguese>Óculos de Visão Noturna (Gen1, Marrom)</Portuguese>
         </Key>
         <Key ID="STR_ACE_NightVision_NVG_Gen1_black">
             <English>NV Goggles (Gen1, Black)</English>
@@ -40,6 +41,7 @@
             <Chinesesimp>夜视仪（一代，黑色）</Chinesesimp>
             <Korean>아투경 (1세대, 검정)</Korean>
             <Spanish>Gafas de visión nocturna (Gen1, Negro)</Spanish>
+            <Portuguese>Óculos de Visão Noturna (Gen1, Preto)</Portuguese>
         </Key>
         <Key ID="STR_ACE_NightVision_NVG_Gen1_green">
             <English>NV Goggles (Gen1, Green)</English>
@@ -52,6 +54,7 @@
             <Chinesesimp>夜视仪（一代，绿色）</Chinesesimp>
             <Korean>아투경 (1세대, 녹색)</Korean>
             <Spanish>Gafas de visión nocturna (Gen1, Verde)</Spanish>
+            <Portuguese>Óculos de Visão Noturna (Gen1, Verde)</Portuguese>
         </Key>
         <Key ID="STR_ACE_NightVision_NVG_Gen2_brown">
             <English>NV Goggles (Gen2, Brown)</English>
@@ -64,6 +67,7 @@
             <Chinesesimp>夜视仪（二代，棕色）</Chinesesimp>
             <Korean>아투경 (2세대, 갈색)</Korean>
             <Spanish>Gafas de visión nocturna (Gen2, Marrón)</Spanish>
+            <Portuguese>Óculos de Visão Noturna (Gen2, Marrom)</Portuguese>
         </Key>
         <Key ID="STR_ACE_NightVision_NVG_Gen2_black">
             <English>NV Goggles (Gen2, Black)</English>
@@ -76,6 +80,7 @@
             <Chinesesimp>夜视仪（二代，黑色）</Chinesesimp>
             <Korean>아투경 (2세대, 검정)</Korean>
             <Spanish>Gafas de visión nocturna (Gen2, Negro)</Spanish>
+            <Portuguese>Óculos de Visão Noturna (Gen2, Preto)</Portuguese>
         </Key>
         <Key ID="STR_ACE_NightVision_NVG_Gen2_green">
             <English>NV Goggles (Gen2, Green)</English>
@@ -88,6 +93,7 @@
             <Chinesesimp>夜视仪（二代，绿色）</Chinesesimp>
             <Korean>아투경 (2세대, 녹색)</Korean>
             <Spanish>Gafas de visión nocturna (Gen2, Verde)</Spanish>
+            <Portuguese>Óculos de Visão Noturna (Gen2, Verde)</Portuguese>
         </Key>
         <Key ID="STR_ACE_NightVision_NVG_Gen3">
             <English>NV Goggles (Gen3)</English>
@@ -96,7 +102,7 @@
             <German>NS-Brille (3. Gen.)</German>
             <Italian>Visore Notturno (Gen3)</Italian>
             <Polish>Gogle noktowizyjne (Gen3)</Polish>
-            <Portuguese>Óculos de visão noturna (Gen3)</Portuguese>
+            <Portuguese>Óculos de Visão Noturna (Gen3)</Portuguese>
             <Russian>ПНВ (Gen3)</Russian>
             <Spanish>Gafas de visión nocturna (Gen3)</Spanish>
             <Hungarian>Éjjellátó szemüveg (3. Gen.)</Hungarian>
@@ -113,7 +119,7 @@
             <German>NS-Brille (3. Gen., braun)</German>
             <Italian>Visore Notturno (Gen3, Marrone)</Italian>
             <Polish>Gogle noktowizyjne (Gen3, Brązowe)</Polish>
-            <Portuguese>Óculos de visão noturna (Gen3, marrons)</Portuguese>
+            <Portuguese>Óculos de Visão Noturna (Gen3, Marrom)</Portuguese>
             <Russian>ПНВ (Gen3, Коричневый)</Russian>
             <Spanish>Gafas de visión nocturna (Gen3, Marrón)</Spanish>
             <Hungarian>Éjjellátó szemüveg (3. Gen., barna)</Hungarian>
@@ -133,6 +139,7 @@
             <French>JVN (Gen3, marron, WP)</French>
             <Russian>ПНВ (Gen3, Коричневый, БФ)</Russian>
             <Spanish>Gafas de visión nocturna (Gen3, Marrón, FB)</Spanish>
+            <Portuguese>Óculos de Visão Noturna (Gen3, Marrom, FB)</Portuguese>
         </Key>
         <Key ID="STR_ACE_NightVision_NVG_WP_desc">
             <English>Night Vision Goggles, White Phosphor</English>
@@ -144,6 +151,7 @@
             <French>Jumelles Vision Nocturne, Phosphore blanc</French>
             <Russian>Очки ночного видения, белый фосфор</Russian>
             <Spanish>Gafas de Visión Nocturna, Fósforo Blanco</Spanish>
+            <Portuguese>Óculos de Visão Nortuna, Fósforo Branco</Portuguese>
         </Key>
         <Key ID="STR_ACE_NightVision_NVG_Gen3_green">
             <English>NV Goggles (Gen3, Green)</English>
@@ -152,7 +160,7 @@
             <German>NS-Brille (3. Gen., grün)</German>
             <Italian>Visore Notturno (Gen3, Verde)</Italian>
             <Polish>Gogle noktowizyjne (Gen3, Zielone)</Polish>
-            <Portuguese>Óculos de visão noturna (Gen3, verdes)</Portuguese>
+            <Portuguese>Óculos de Visão Noturna (Gen3, verdes)</Portuguese>
             <Russian>ПНВ (Gen3, Зелёный)</Russian>
             <Spanish>Gafas de visión nocturna (Gen3, Verde)</Spanish>
             <Hungarian>Éjjellátó szemüveg (3. Gen., zöld)</Hungarian>
@@ -172,6 +180,7 @@
             <French>JVN (Gen3, vertes, WP)</French>
             <Russian>ПНВ (Gen3, Зелёный, БФ)</Russian>
             <Spanish>Gafas de visión nocturna (Gen3, Verde, FB)</Spanish>
+            <Portuguese>Óculos de Visão Noturna (Gen3, Verde, FB)</Portuguese>
         </Key>
         <Key ID="STR_ACE_NightVision_NVG_Gen3_black">
             <English>NV Goggles (Gen3, Black)</English>
@@ -180,7 +189,7 @@
             <German>NS-Brille (3. Gen., schwarz)</German>
             <Italian>Visore Notturno (Gen3, Nero)</Italian>
             <Polish>Gogle noktowizyjne (Gen3, Czarne)</Polish>
-            <Portuguese>Óculos de visão noturna (Gen3, pretos)</Portuguese>
+            <Portuguese>Óculos de Visão Noturna (Gen3, Preto)</Portuguese>
             <Russian>ПНВ (Gen3, Чёрный)</Russian>
             <Spanish>Gafas de visión nocturna (Gen3, Negro)</Spanish>
             <Hungarian>Éjjellátó szemüveg (3. Gen., fekete)</Hungarian>
@@ -200,6 +209,7 @@
             <French>JVN (Gen3, noires, WP)</French>
             <Russian>ПНВ (Gen3, Чёрный, БФ)</Russian>
             <Spanish>Gafas de visión nocturna (Gen3, Negro, FB)</Spanish>
+            <Portuguese>Óculos de Visão Noturna (Gen3, Preto, FB)</Portuguese>
         </Key>
         <Key ID="STR_ACE_NightVision_NVG_Gen4_brown">
             <English>NV Goggles (Gen4, Brown)</English>
@@ -212,6 +222,7 @@
             <Chinesesimp>夜视仪（四代，棕色）</Chinesesimp>
             <Korean>야투경 (4세대, 갈색)</Korean>
             <Spanish>Gafas de visión nocturna (Gen4, Marrón)</Spanish>
+            <Portuguese>Óculos de Visão Noturna (Gen4, Marrom)</Portuguese>
         </Key>
         <Key ID="STR_ACE_NightVision_NVG_Gen4_brown_WP">
             <English>NV Goggles (Gen4, Brown, WP)</English>
@@ -223,6 +234,7 @@
             <French>JVN (Gen4, marron, WP)</French>
             <Russian>ПНВ (Gen4, Коричневый, БФ)</Russian>
             <Spanish>Gafas de visión nocturna (Gen4, Marrón, FB)</Spanish>
+            <Portuguese>Óculos de Visão Noturna (Gen4, Marrom, FB)</Portuguese>
         </Key>
         <Key ID="STR_ACE_NightVision_NVG_Gen4_black">
             <English>NV Goggles (Gen4, Black)</English>
@@ -235,6 +247,7 @@
             <Chinesesimp>夜视仪（四代，黑色）</Chinesesimp>
             <Korean>야투경 (4세대, 검정)</Korean>
             <Spanish>Gafas de visión nocturna (Gen4, Negro)</Spanish>
+            <Portuguese>Óculos de Visão Noturna (Gen4, Preto)</Portuguese>
         </Key>
         <Key ID="STR_ACE_NightVision_NVG_Gen4_black_WP">
             <English>NV Goggles (Gen4, Black, WP)</English>
@@ -246,6 +259,7 @@
             <French>JVN (Gen4, noires, WP)</French>
             <Russian>ПНВ (Gen4, Чёрный, БФ)</Russian>
             <Spanish>Gafas de visión nocturna (Gen4, Negro, FB)</Spanish>
+            <Portuguese>Óculos de Visão Noturna (Gen4, Preto, FB)</Portuguese>
         </Key>
         <Key ID="STR_ACE_NightVision_NVG_Gen4_green">
             <English>NV Goggles (Gen4, Green)</English>
@@ -258,6 +272,7 @@
             <Chinesesimp>夜视仪（四代，绿色）</Chinesesimp>
             <Korean>야투경 (4세대, 녹색)</Korean>
             <Spanish>Gafas de visión nocturna (Gen4, Verde)</Spanish>
+            <Portuguese>Óculos de Visão Noturna (Gen4, Verde)</Portuguese>
         </Key>
         <Key ID="STR_ACE_NightVision_NVG_Gen4_green_WP">
             <English>NV Goggles (Gen4, Green, WP)</English>
@@ -269,6 +284,7 @@
             <French>JVN (Gen4, vertes, WP)</French>
             <Russian>ПНВ (Gen4, Зелёный, БФ)</Russian>
             <Spanish>Gafas de visión nocturna (Gen4, Verde, FB)</Spanish>
+            <Portuguese>Óculos de Visão Noturna (Gen4, Verde, FB)</Portuguese>
         </Key>
         <Key ID="STR_ACE_NightVision_NVG_Wide_brown">
             <English>NV Goggles (Wide, Brown)</English>
@@ -281,6 +297,7 @@
             <Chinesesimp>夜视仪（宽，棕色）</Chinesesimp>
             <Korean>야투경 (넓음, 갈색)</Korean>
             <Spanish>Gafas de visión nocturna (Panorámicas, Marrón)</Spanish>
+            <Portuguese>Óculos de Visão Noturna (Panorâmico, Marrom)</Portuguese>
         </Key>
         <Key ID="STR_ACE_NightVision_NVG_Wide_brown_WP">
             <English>NV Goggles (Wide, Brown, WP)</English>
@@ -292,6 +309,7 @@
             <French>JVN (Large, marron, WP)</French>
             <Russian>ПНВ (Широкий, Коричневый, БФ)</Russian>
             <Spanish>Gafas de visión nocturna (Panorámicas, Marrón, FB)</Spanish>
+            <Portuguese>Óculos de Visão Noturna (Panorâmico, Marrom, FB)</Portuguese>
         </Key>
         <Key ID="STR_ACE_NightVision_NVG_Wide_black">
             <English>NV Goggles (Wide, Black)</English>
@@ -304,6 +322,7 @@
             <Chinesesimp>夜视仪（宽，黑色）</Chinesesimp>
             <Korean>야투경 (넓음, 검정)</Korean>
             <Spanish>Gafas de visión nocturna (Panorámicas, Negro)</Spanish>
+            <Portuguese>Óculos de Visão Noturna (Panorâmico, Preto)</Portuguese>
         </Key>
         <Key ID="STR_ACE_NightVision_NVG_Wide_black_WP">
             <English>NV Goggles (Wide, Black, WP)</English>
@@ -315,6 +334,7 @@
             <French>JVN (Large, noires, WP)</French>
             <Russian>ПНВ (Широкий, Чёрный, БФ)</Russian>
             <Spanish>Gafas de visión nocturna (Panorámicas, Negro, FB)</Spanish>
+            <Portuguese>Óculos de Visão Noturna (Panorâmico, Preto, FB)</Portuguese>
         </Key>
         <Key ID="STR_ACE_NightVision_NVG_Wide_green">
             <English>NV Goggles (Wide, Green)</English>
@@ -327,6 +347,7 @@
             <Chinesesimp>夜视仪（宽，绿色）</Chinesesimp>
             <Korean>야투경 (넓음, 녹색)</Korean>
             <Spanish>Gafas de visión nocturna (Panorámicas, Verde)</Spanish>
+            <Portuguese>Óculos de Visão Noturna (Panorâmico, Verde)</Portuguese>
         </Key>
         <Key ID="STR_ACE_NightVision_NVG_Wide_green_WP">
             <English>NV Goggles (Wide, Green, WP)</English>
@@ -338,6 +359,7 @@
             <French>JVN (Large, vertes, WP)</French>
             <Russian>ПНВ (Широкий, Зелёный, БФ)</Russian>
             <Spanish>Gafas de visión nocturna (Panorámicas, Verde, FB)</Spanish>
+            <Portuguese>Óculos de Visão Noturna (Panorâmico, Verde, FB)</Portuguese>
         </Key>
         <Key ID="STR_ACE_NightVision_NVGBrightness">
             <English>Brightness: %1</English>
@@ -365,7 +387,7 @@
             <French>Augmenter la luminosité des JVN</French>
             <Russian>Увеличить яркость ПНВ</Russian>
             <Hungarian>Éjjellátó fényerejének növelése</Hungarian>
-            <Portuguese>Aumentar Luminosidade do EVN</Portuguese>
+            <Portuguese>Aumentar Luminosidade do OVN</Portuguese>
             <Italian>Aumenta la luminosità dell'NVG</Italian>
             <Japanese>暗視装置の明度を上げる</Japanese>
             <Korean>야투경 밝기 높이기</Korean>
@@ -382,7 +404,7 @@
             <French>Abaisser la luminosité des JVN</French>
             <Russian>Уменьшить яркость ПНВ</Russian>
             <Hungarian>Éjjellátó fényerejének csökkentése</Hungarian>
-            <Portuguese>Diminuir Luminosidade do EVN</Portuguese>
+            <Portuguese>Diminuir Luminosidade do OVN</Portuguese>
             <Italian>Riduci la luminosità dell'NVG</Italian>
             <Japanese>暗視装置の明度を下げる</Japanese>
             <Korean>야투경 밝기 줄이기</Korean>
@@ -598,6 +620,7 @@
             <French>Génération de jumelles de vision nocturne</French>
             <Russian>Генерация ночного видения</Russian>
             <Spanish>Generación de Visión Nocturna</Spanish>
+            <Portuguese>Geração de Visão Noturna</Portuguese>
         </Key>
         <Key ID="STR_ACE_NightVision_statGen">
             <English>Gen %1</English>
@@ -609,6 +632,7 @@
             <French>Gen %1</French>
             <Russian>Генерация %1</Russian>
             <Spanish>Gen %1</Spanish>
+            <Portuguese>Gen %1</Portuguese>
         </Key>
     </Package>
 </Project>
diff --git a/addons/nlaw/functions/fnc_keyDown.sqf b/addons/nlaw/functions/fnc_keyDown.sqf
index 60ac4bf3d8..5b75c72140 100644
--- a/addons/nlaw/functions/fnc_keyDown.sqf
+++ b/addons/nlaw/functions/fnc_keyDown.sqf
@@ -19,8 +19,8 @@
 TRACE_1("lock key down",GVAR(isLockKeyDown));
 
 if (!alive ACE_player) exitWith {};
-if (!([ACE_player, objNull, ["isNotInside"]] call EFUNC(common,canInteractWith))) exitWith {};
-if (!(ACE_player call CBA_fnc_canUseWeapon)) exitWith {};
+if !([ACE_player, objNull, ["isNotInside"]] call EFUNC(common,canInteractWith)) exitWith {};
+if !(ACE_player call CBA_fnc_canUseWeapon) exitWith {};
 if ((getNumber (configFile >> "CfgWeapons" >> (currentWeapon ACE_player) >> QGVAR(enabled))) == 0) exitWith {};
 if (GVAR(isLockKeyDown)) exitWith {ERROR("already running?");};
 
diff --git a/addons/noradio/stringtable.xml b/addons/noradio/stringtable.xml
index d1cf51f0e6..d41827ebfa 100644
--- a/addons/noradio/stringtable.xml
+++ b/addons/noradio/stringtable.xml
@@ -12,6 +12,7 @@
             <Russian>Нет рации</Russian>
             <Spanish>No Radio</Spanish>
             <French>Pas de radio</French>
+            <Portuguese>Sem Rádio</Portuguese>
         </Key>
         <Key ID="STR_ACE_NoRadio_setting">
             <English>Mute Player</English>
diff --git a/addons/novehicleclanlogo/stringtable.xml b/addons/novehicleclanlogo/stringtable.xml
index 96d463f582..1e07c85ce8 100644
--- a/addons/novehicleclanlogo/stringtable.xml
+++ b/addons/novehicleclanlogo/stringtable.xml
@@ -11,6 +11,7 @@
             <German>Clan-Logo von Fahrzeugen entfernen</German>
             <Italian>Rimuovi Icone Clan dai veicoli</Italian>
             <French>Retirer les logos de clan des véhicules</French>
+            <Portuguese>Remover logo do clã de veículos</Portuguese>
         </Key>
         <Key ID="STR_ACE_Novehicleclanlogo_Enabled_Tooltip">
             <English>Prevents clan logo from being displayed on vehicles controlled by players.</English>
@@ -22,6 +23,7 @@
             <German>Verhindert, dass das Clan-Logo auf von Spielern kontrollierten Fahrzeugen angezeigt wird.</German>
             <Italian>Impedisce la visualizzazione di icone clan sui veicoli controllati da giocatori.</Italian>
             <French>Empêche les logos de clan d'être affichés sur les véhicules contrôlés par des joueurs.</French>
+            <Portuguese>Previne o logo do clã de ser mostrado em veículos controlados por jogadores.</Portuguese>
         </Key>
     </Package>
 </Project>
diff --git a/addons/optionsmenu/stringtable.xml b/addons/optionsmenu/stringtable.xml
index 4cd7f7d2f7..674ea3eb49 100644
--- a/addons/optionsmenu/stringtable.xml
+++ b/addons/optionsmenu/stringtable.xml
@@ -12,7 +12,7 @@
             <Hungarian>Debug a vágólapra</Hungarian>
             <Russian>Отладка в буфер обмена</Russian>
             <Italian>Debug negli Appunti</Italian>
-            <Japanese>ｸﾘｯﾌﾟﾎﾞｰﾄﾞにﾃﾞﾊﾞｯｸﾞ</Japanese>
+            <Japanese>デバッグ情報をコピー</Japanese>
             <Korean>클립보드를 디버그하기</Korean>
             <Chinesesimp>复制调试信息至剪贴板</Chinesesimp>
             <Chinese>複製除錯訊息至剪貼簿</Chinese>
diff --git a/addons/overheating/functions/fnc_jamWeapon.sqf b/addons/overheating/functions/fnc_jamWeapon.sqf
index 9a5b8b1049..afe6d15e97 100644
--- a/addons/overheating/functions/fnc_jamWeapon.sqf
+++ b/addons/overheating/functions/fnc_jamWeapon.sqf
@@ -80,9 +80,11 @@ if (_unit getVariable [QGVAR(JammingActionID), -1] == -1) then {
 
     private _condition = {
         private _unit = _this select 1;
-        [_unit] call CBA_fnc_canUseWeapon
-        && {currentMuzzle _unit in (_unit getVariable [QGVAR(jammedWeapons), []])}
-        && {!(currentMuzzle _unit in (_unit getVariable [QEGVAR(safemode,safedWeapons), []]))}
+        (weaponState _unit) params ["_currentWeapon", "_currentMuzzle"];
+
+        _unit call CBA_fnc_canUseWeapon
+        && {_currentMuzzle in (_unit getVariable [QGVAR(jammedWeapons), []])}
+        && {!(["ace_safemode"] call EFUNC(common,isModLoaded)) || {!([_unit, _currentWeapon, _currentMuzzle] call EFUNC(safemode,getWeaponSafety))}}
     };
 
     private _statement = {
diff --git a/addons/overheating/stringtable.xml b/addons/overheating/stringtable.xml
index 8676ff67bb..0d3f0dd96e 100644
--- a/addons/overheating/stringtable.xml
+++ b/addons/overheating/stringtable.xml
@@ -58,6 +58,7 @@
             <Chinesesimp>过热系数</Chinesesimp>
             <Korean>과열 계수</Korean>
             <Spanish>Coeficiente de calentamiento</Spanish>
+            <Portuguese>Coeficiente de aquecimento</Portuguese>
         </Key>
         <Key ID="STR_ACE_Overheating_heatCoef_description">
             <English>Coefficient for the amount of heat a weapon generates per shot.\nHigher value increases heat.</English>
@@ -70,6 +71,7 @@
             <Chinesesimp>武器每次射击产生的热量系数。\n数值越高，热量越高。</Chinesesimp>
             <Korean>매 발사마다 만들어지는 열에 계수를 적용합니다.\n높은 계수는 더 많은 열을 발생시킵니다.</Korean>
             <Spanish>Coeficiente para la cantidad de calor que genera un arma por disparo.\nValores más altos incrementan el calor</Spanish>
+            <Portuguese>Coeficiente da quantidade de calor que um armamento gera por disparo.\nValores mais altos potencializam o aquecimento.</Portuguese>
         </Key>
         <Key ID="STR_ACE_Overheating_coolingCoef_displayName">
             <English>Cooling Coefficient</English>
@@ -82,6 +84,7 @@
             <Russian>Коэф. остывания</Russian>
             <Spanish>Coeficiente de enfriado</Spanish>
             <French>Coefficient de refroidissement</French>
+            <Portuguese>Coeficiente de resfriamento</Portuguese>
         </Key>
         <Key ID="STR_ACE_Overheating_coolingCoef_description">
             <English>Coefficient for how quickly a weapon cools down.\nHigher value increases cooling speed.</English>
@@ -94,6 +97,7 @@
             <Russian>Коэффициент скорости остывания орудия.\nЧем больше значение, тем быстрее остывает.</Russian>
             <Spanish>Coeficiente para cómo de rápido se enfría un arma.\nValores más altos incrementan la velocidad de enfriamiento.</Spanish>
             <French>Coefficient de rapidité de refroidissement de l'arme.\nUne valeur élevée augmente la vitesse de refroidissement.</French>
+            <Portuguese>Coeficiente que determina o quão rápido a arma resfria.\nValores mais altos potencializam o resfriamento.</Portuguese>
         </Key>
         <Key ID="STR_ACE_Overheating_suppressorCoef_displayName">
             <English>Suppressor Coefficient</English>
@@ -106,6 +110,7 @@
             <Russian>Коэф. глушителя</Russian>
             <Spanish>Coeficiente del silenciador</Spanish>
             <French>Coefficient de suppresion</French>
+            <Portuguese>Coeficiente de supressão</Portuguese>
         </Key>
         <Key ID="STR_ACE_Overheating_suppressorCoef_description">
             <English>Coefficient for how much additional heat is added from having a suppressor attached.\nHigher value increases heat, 0 means no additional heat from the suppressor.</English>
@@ -714,7 +719,7 @@
         </Key>
         <Key ID="STR_ACE_Overheating_CoolWeaponWithItem">
             <English>Cool weapon with...</English>
-            <Japanese>武器を・・・で冷却</Japanese>
+            <Japanese>武器をアイテムで冷却</Japanese>
             <French>Refroidir l'arme avec...</French>
             <Russian>Охладить оружие с...</Russian>
             <German>Waffe mit... kühlen</German>
@@ -882,6 +887,7 @@
             <Korean>노리쇠 방식</Korean>
             <Russian>Тип болта</Russian>
             <French>Type d'obturateur</French>
+            <German>Art des Verschlusses</German>
             <Spanish>Tipo de Cerrojo</Spanish>
         </Key>
         <Key ID="STR_ACE_Overheating_statBoltType_openBolt">
@@ -891,6 +897,7 @@
             <Korean>오픈 볼트</Korean>
             <Russian>Открыть болт</Russian>
             <French>Obturateur ouvert</French>
+            <German>Offener Verschluss</German>
             <Spanish>Cerrojo Abierto</Spanish>
         </Key>
         <Key ID="STR_ACE_Overheating_statBoltType_closedBolt">
@@ -900,6 +907,7 @@
             <Korean>클로즈드 볼트</Korean>
             <Russian>Закрыть болт</Russian>
             <French>Obturateur fermé</French>
+            <German>Geschlossener Verschluss</German>
             <Spanish>Cerrojo Cerrado</Spanish>
         </Key>
         <Key ID="STR_ACE_Overheating_statBarrelType">
@@ -909,6 +917,7 @@
             <Korean>총열 방식</Korean>
             <Russian>Тип ствола</Russian>
             <French>Type de canon</French>
+            <German>Lauftyp</German>
             <Spanish>Tipo de Cañón</Spanish>
         </Key>
         <Key ID="STR_ACE_Overheating_statBarrelType_nonRemoveable">
@@ -918,6 +927,7 @@
             <Korean>제거 불가</Korean>
             <Russian>Несъемный</Russian>
             <French>Inamovible</French>
+            <German>Nicht entfernbar</German>
             <Spanish>No-Desmontable</Spanish>
         </Key>
         <Key ID="STR_ACE_Overheating_statBarrelType_removeable">
@@ -927,6 +937,7 @@
             <Korean>신속 교체</Korean>
             <Russian>Быстросъемный</Russian>
             <French>Changement rapide</French>
+            <German>Schnellwechsel</German>
             <Spanish>Cambiado Rápido</Spanish>
         </Key>
     </Package>
diff --git a/addons/overpressure/ACE_Settings.hpp b/addons/overpressure/ACE_Settings.hpp
deleted file mode 100644
index d46cae7498..0000000000
--- a/addons/overpressure/ACE_Settings.hpp
+++ /dev/null
@@ -1,5 +0,0 @@
-class ACE_Settings {
-    class GVAR(distanceCoefficient) {
-        movedToSQF = 1;
-    };
-};
diff --git a/addons/overpressure/XEH_postInit.sqf b/addons/overpressure/XEH_postInit.sqf
index 46fe460268..4b014e89e2 100644
--- a/addons/overpressure/XEH_postInit.sqf
+++ b/addons/overpressure/XEH_postInit.sqf
@@ -1,14 +1,17 @@
 #include "script_component.hpp"
 
 ["CBA_settingsInitialized", {
-    TRACE_1("settingsInit eh",GVAR(distanceCoefficient));
-    if (GVAR(distanceCoefficient) <= 0) exitWith {};
+    TRACE_2("settingsInit eh",GVAR(backblastDistanceCoefficient),GVAR(overpressureDistanceCoefficient));
 
     ["ace_overpressure", LINKFUNC(overpressureDamage)] call CBA_fnc_addEventHandler;
 
-    // Register fire event handler
-    ["ace_firedPlayer", LINKFUNC(firedEHBB)] call CBA_fnc_addEventHandler;
-    ["ace_firedPlayerVehicle", LINKFUNC(firedEHOP)] call CBA_fnc_addEventHandler;
+    // Register fire event handlers
+    if (GVAR(backblastDistanceCoefficient) > 0) then {
+        ["ace_firedPlayer", LINKFUNC(firedEHBB)] call CBA_fnc_addEventHandler;
+    };
+    if (GVAR(overpressureDistanceCoefficient) > 0) then {
+        ["ace_firedPlayerVehicle", LINKFUNC(firedEHOP)] call CBA_fnc_addEventHandler;
+    };
 
     GVAR(cacheHash) = createHashMap;
 }] call CBA_fnc_addEventHandler;
diff --git a/addons/overpressure/config.cpp b/addons/overpressure/config.cpp
index 3815cc831f..7274cd5059 100644
--- a/addons/overpressure/config.cpp
+++ b/addons/overpressure/config.cpp
@@ -14,7 +14,6 @@ class CfgPatches {
     };
 };
 
-#include "ACE_Settings.hpp"
 #include "CfgEventHandlers.hpp"
 #include "CfgWeapons.hpp"
 #include "ACE_Arsenal_Stats.hpp"
diff --git a/addons/overpressure/functions/fnc_firedEHBB.sqf b/addons/overpressure/functions/fnc_firedEHBB.sqf
index 2ef48bf4d9..05a761bf06 100644
--- a/addons/overpressure/functions/fnc_firedEHBB.sqf
+++ b/addons/overpressure/functions/fnc_firedEHBB.sqf
@@ -22,6 +22,8 @@ TRACE_10("firedEH:",_unit,_weapon,_muzzle,_mode,_ammo,_magazine,_projectile,_veh
 private _bbValues = [_weapon, _ammo, _magazine] call FUNC(getOverPressureValues);
 
 _bbValues params ["_backblastAngle", "_backblastRange", "_backblastDamage", "_offset"];
+_backblastRange = _backblastRange * GVAR(backblastDistanceCoefficient);
+
 TRACE_4("cache",_backblastAngle,_backblastRange,_backblastDamage,_offset);
 
 if (_backblastDamage <= 0) exitWith {};
@@ -53,7 +55,7 @@ if (_distance < _backblastRange) then {
 
         [_damage * 100] call BIS_fnc_bloodEffect;
 
-        if (["ace_medical"] call EFUNC(common,isModLoaded)) then {
+        if (GETEGVAR(medical,enabled,false)) then {
             [_unit, _damage, "body", "backblast", _unit] call EFUNC(medical,addDamageToUnit);
         } else {
             _unit setDamage (damage _unit + _damage);
diff --git a/addons/overpressure/functions/fnc_firedEHOP.sqf b/addons/overpressure/functions/fnc_firedEHOP.sqf
index 2345d09327..e011098b59 100644
--- a/addons/overpressure/functions/fnc_firedEHOP.sqf
+++ b/addons/overpressure/functions/fnc_firedEHOP.sqf
@@ -22,6 +22,8 @@ TRACE_10("firedEH:",_unit,_weapon,_muzzle,_mode,_ammo,_magazine,_projectile,_veh
 private _opValues = [_weapon, _ammo, _magazine] call FUNC(getOverPressureValues);
 
 _opValues params ["_dangerZoneAngle", "_dangerZoneRange", "_dangerZoneDamage"];
+_dangerZoneRange = _dangerZoneRange * GVAR(overpressureDistanceCoefficient);
+
 TRACE_3("cache",_dangerZoneAngle,_dangerZoneRange,_dangerZoneDamage);
 
 if (_dangerZoneDamage <= 0) exitWith {};
diff --git a/addons/overpressure/functions/fnc_getOverPressureValues.sqf b/addons/overpressure/functions/fnc_getOverPressureValues.sqf
index 4372d4c8e6..374e9de9d6 100644
--- a/addons/overpressure/functions/fnc_getOverPressureValues.sqf
+++ b/addons/overpressure/functions/fnc_getOverPressureValues.sqf
@@ -54,7 +54,7 @@ TRACE_1("ConfigPath",_config);
 // get the Variables out of the Configs and populate return array with them
 _return = [
     (getNumber (_config >> QGVAR(angle))),
-    (getNumber (_config >> QGVAR(range))) * GVAR(distanceCoefficient),
+    (getNumber (_config >> QGVAR(range))),
     (getNumber (_config >> QGVAR(damage))),
     (getNumber (_config >> QGVAR(offset)))
 ];
diff --git a/addons/overpressure/functions/fnc_overpressureDamage.sqf b/addons/overpressure/functions/fnc_overpressureDamage.sqf
index 812a2ab7ea..12b7a820ca 100644
--- a/addons/overpressure/functions/fnc_overpressureDamage.sqf
+++ b/addons/overpressure/functions/fnc_overpressureDamage.sqf
@@ -57,7 +57,7 @@ TRACE_3("cache",_overpressureAngle,_overpressureRange,_overpressureDamage);
                     [_damage * 100] call BIS_fnc_bloodEffect;
                 };
 
-                if (["ace_medical"] call EFUNC(common,isModLoaded)) then {
+                if (GETEGVAR(medical,enabled,false)) then {
                     [_x, _damage, "body", "backblast", _firer] call EFUNC(medical,addDamageToUnit);
                 } else {
                     _x setDamage (damage _x + _damage);
diff --git a/addons/overpressure/initSettings.inc.sqf b/addons/overpressure/initSettings.inc.sqf
index 7fe6401131..ece1230dcc 100644
--- a/addons/overpressure/initSettings.inc.sqf
+++ b/addons/overpressure/initSettings.inc.sqf
@@ -1,9 +1,23 @@
 private _category = [LELSTRING(common,categoryUncategorized), LLSTRING(DisplayName)];
 
 [
-    QGVAR(distanceCoefficient), "SLIDER",
+    QGVAR(overpressureDistanceCoefficient),
+    "SLIDER",
     [LSTRING(distanceCoefficient_displayName), LSTRING(distanceCoefficient_toolTip)],
     _category,
-    [-1, 10, 1, 1],
-    1
+    [0, 10, 1, 1],
+    1,
+    {[QGVAR(overpressureDistanceCoefficient), _this] call EFUNC(common,cbaSettings_settingChanged)},
+    true // Needs mission restart
+] call CBA_fnc_addSetting;
+
+[
+    QGVAR(backblastDistanceCoefficient),
+    "SLIDER",
+    [LSTRING(backblastDistanceCoefficient_displayName), LSTRING(backblastDistanceCoefficient_toolTip)],
+    _category,
+    [0, 10, 1, 1],
+    1,
+    {[QGVAR(backblastDistanceCoefficient), _this] call EFUNC(common,cbaSettings_settingChanged)},
+    true // Needs mission restart
 ] call CBA_fnc_addSetting;
diff --git a/addons/overpressure/stringtable.xml b/addons/overpressure/stringtable.xml
index caade38c3d..2ce7615ad4 100644
--- a/addons/overpressure/stringtable.xml
+++ b/addons/overpressure/stringtable.xml
@@ -8,7 +8,7 @@
             <Italian>Sovrapressione</Italian>
             <Korean>과중압력</Korean>
             <Polish>Nadciśnienie</Polish>
-            <Japanese>過圧</Japanese>
+            <Japanese>超過圧力</Japanese>
             <Russian>Перегрузка</Russian>
             <Spanish>Sobrepresiòn</Spanish>
             <French>Surpression</French>
@@ -16,11 +16,11 @@
         <Key ID="STR_ACE_Overpressure_distanceCoefficient_displayName">
             <English>Overpressure Distance Coefficient</English>
             <German>Überdruckentfernungskoeffizient</German>
-            <Japanese>過圧の距離係数</Japanese>
+            <Japanese>超過圧力の距離係数</Japanese>
             <Korean>과중압력 거리 계수</Korean>
             <Polish>Mnożnik dystansu nadciśnienia</Polish>
             <French>Coefficient de distance pour la surpression</French>
-            <Italian>Coefficente Distanza Sovrapressione</Italian>
+            <Italian>Coefficiente Distanza Sovrapressione</Italian>
             <Chinesesimp>超压影响距离系数</Chinesesimp>
             <Chinese>高壓影響距離係數</Chinese>
             <Russian>Коэф. избыточного давления</Russian>
@@ -30,25 +30,41 @@
             <Spanish>Coeficiente de distancia de sobrepresión</Spanish>
         </Key>
         <Key ID="STR_ACE_Overpressure_distanceCoefficient_toolTip">
-            <English>Scales the overpressure effect [Default: 1]</English>
-            <German>Stellt den Koeffizient für die Überdruckentfernung ein [Standard: 1]</German>
-            <Japanese>過圧効果の範囲 [デフォルト: 1]</Japanese>
-            <Korean>과중압력의 효과 크기 [기본설정: 1]</Korean>
-            <Polish>Skaluje efekt nadciśnienia [Domyślne: 1]</Polish>
-            <French>Ajuste l'effet de surpression. Valeur par défaut : 1.</French>
-            <Italian>Scala l'effetto di sovrapressione [Predefinito: 1]</Italian>
-            <Chinesesimp>超压影响的范围 [预设：1]</Chinesesimp>
-            <Chinese>高壓影響的範圍 [預設: 1]</Chinese>
-            <Russian>Степень зависимости избыточного давления от расстояния [По умолчанию: 1]</Russian>
-            <Portuguese>Escala o efeito de sobrepressão [Padrão: 1]</Portuguese>
-            <Hungarian>Állítja a túlnyomás hatását [Alapértelmezett: 1]</Hungarian>
-            <Czech>Nastavuje jak velký je efekt přetlaku [Standard: 1]</Czech>
-            <Spanish>Escala el efecto de sobrepresión [Predeterminado: 1]</Spanish>
+            <English>Scales the overpressure effect</English>
+            <German>Stellt den Koeffizient für die Überdruckentfernung ein</German>
+            <Japanese>火砲による超過圧力の影響範囲の大きさ</Japanese>
+            <Korean>과중압력의 효과 크기</Korean>
+            <Polish>Skaluje efekt nadciśnienia</Polish>
+            <French>Ajuste l'effet de surpression</French>
+            <Italian>Scala l'effetto di sovrapressione</Italian>
+            <Chinesesimp>超压影响的范围</Chinesesimp>
+            <Chinese>高壓影響的範圍</Chinese>
+            <Russian>Степень зависимости избыточного давления от расстояния</Russian>
+            <Portuguese>Escala o efeito de sobrepressão</Portuguese>
+            <Hungarian>Állítja a túlnyomás hatását</Hungarian>
+            <Czech>Nastavuje jak velký je efekt přetlaku</Czech>
+            <Spanish>Escala el efecto de sobrepresión</Spanish>
+        </Key>
+        <Key ID="STR_ACE_Overpressure_backblastDistanceCoefficient_displayName">
+            <English>Backblast Distance Coefficient</English>
+            <Russian>Коэффициент расстояния рекативной струи</Russian>
+            <German>Rückstrahl-Entfernung Multiplikator</German>
+            <Italian>Coefficiente distanza di svampata</Italian>
+            <Japanese>後方噴射の距離係数</Japanese>
+            <Korean>후폭풍 거리 계수</Korean>
+        </Key>
+        <Key ID="STR_ACE_Overpressure_backblastDistanceCoefficient_toolTip">
+            <English>Scales the backblast effect</English>
+            <Russian>Масштабирует эффект реактивной струи</Russian>
+            <German>Skaliert den Rückstrahl-Effekt</German>
+            <Italian>Scala l'effetto delle svampate dei lanciarazzi</Italian>
+            <Japanese>無反動砲による後方噴射の影響範囲の大きさ</Japanese>
+            <Korean>후폭풍 효과의 스케일을 조정합니다</Korean>
         </Key>
         <Key ID="STR_ACE_Overpressure_statBackblastRange">
             <English>Backblast range</English>
             <German>Rückstrahlzone</German>
-            <Japanese>後方噴射の範囲</Japanese>
+            <Japanese>後方噴射範囲</Japanese>
             <Chinesesimp>向后喷射的范围</Chinesesimp>
             <Chinese>後方尾焰的範圍</Chinese>
             <Italian>Raggio della fiammata [lanciarazzi]</Italian>
@@ -64,7 +80,7 @@
         <Key ID="STR_ACE_Overpressure_statBackblastAngle">
             <English>Backblast angle</English>
             <German>Rückstrahlwinkel</German>
-            <Japanese>後方噴射の角度</Japanese>
+            <Japanese>後方噴射角度</Japanese>
             <Chinesesimp>向后喷射的角度</Chinesesimp>
             <Chinese>後方尾焰的角度</Chinese>
             <Italian>Angolo della fiammata [lanciarazzi]</Italian>
diff --git a/addons/parachute/stringtable.xml b/addons/parachute/stringtable.xml
index db48a6109c..b13483dca5 100644
--- a/addons/parachute/stringtable.xml
+++ b/addons/parachute/stringtable.xml
@@ -146,6 +146,7 @@
             <Chinesesimp>开伞失败率</Chinesesimp>
             <Korean>낙하산 펼치기 실패 확률</Korean>
             <Spanish>Probabilidad de fallo de paracaidas</Spanish>
+            <Portuguese>Probabilidade de falha do paraquedas</Portuguese>
         </Key>
     </Package>
 </Project>
diff --git a/addons/pylons/functions/fnc_showDialog.sqf b/addons/pylons/functions/fnc_showDialog.sqf
index a06cb6f114..9c0faab52d 100644
--- a/addons/pylons/functions/fnc_showDialog.sqf
+++ b/addons/pylons/functions/fnc_showDialog.sqf
@@ -107,7 +107,7 @@ GVAR(comboBoxes) = [];
     private _mirroredIndex = getNumber (_x >> "mirroredMissilePos");
 
     private _button = controlNull;
-    if (count allTurrets [_aircraft, false] > 0) then {
+    if ((allTurrets [_aircraft, false]) isNotEqualTo []) then {
         _button = _display ctrlCreate ["ctrlButtonPictureKeepAspect", -1];
         private _turret = [_aircraft, _forEachIndex] call EFUNC(common,getPylonTurret);
         [_button, false, _turret] call FUNC(onButtonTurret);
diff --git a/addons/quickmount/XEH_postInitClient.sqf b/addons/quickmount/XEH_postInitClient.sqf
index 23c225f583..30f655edd8 100644
--- a/addons/quickmount/XEH_postInitClient.sqf
+++ b/addons/quickmount/XEH_postInitClient.sqf
@@ -2,9 +2,8 @@
 
 if (!hasInterface) exitWith {};
 
-["ACE3 Movement", QGVAR(mount), [localize LSTRING(KeybindName), localize LSTRING(KeybindDescription)], "", {
+["ACE3 Movement", QGVAR(mount), [LLSTRING(KeybindName), LLSTRING(KeybindDescription)], "", {
     if (!dialog) then {
         [] call FUNC(getInNearest);
     };
-    false
 }] call CBA_fnc_addKeybind;
diff --git a/addons/quickmount/functions/fnc_getInNearest.sqf b/addons/quickmount/functions/fnc_getInNearest.sqf
index 5e6c21eb36..52bc8cd220 100644
--- a/addons/quickmount/functions/fnc_getInNearest.sqf
+++ b/addons/quickmount/functions/fnc_getInNearest.sqf
@@ -1,131 +1,125 @@
 #include "..\script_component.hpp"
 /*
  * Author: Kingsley
- * Mount the player in the vehicle they are directly looking at based on their distance.
+ * Mounts the player in the vehicle they are directly looking at based on their distance.
  *
  * Arguments:
- * 0: Target <OBJECT>(Optional)
+ * 0: Target <OBJECT> (default: objNull)
  *
  * Return Value:
  * None
  *
  * Example:
- * [] call ace_quickmount_fnc_getInNearest;
+ * call ace_quickmount_fnc_getInNearest
  *
  * Public: No
  */
 
-if (!GVAR(enabled) ||
+if (
+    !GVAR(enabled) ||
     {isNull ACE_player} ||
-    {vehicle ACE_player != ACE_player} ||
-    {!alive ACE_player} ||
-    {ACE_player getVariable ["ace_unconscious", false]}
+    {!isNull objectParent ACE_player} ||
+    {!(ACE_player call EFUNC(common,isAwake))}
 ) exitWith {};
 
-params [["_interactionTarget", objNull, [objNull]]];
-TRACE_1("getInNearest",_interactionTarget);
+params [["_target", objNull, [objNull]]];
+TRACE_1("getInNearest",_target);
 
-private _start = ACE_player modelToWorldVisualWorld (ACE_player selectionPosition "pilot");
-private _end = (_start vectorAdd (getCameraViewDirection ACE_player vectorMultiply GVAR(distance)));
-private _objects = lineIntersectsSurfaces [_start, _end, ACE_player];
-private _target = (_objects param [0, []]) param [2, objNull];
-
-if ((isNull _target) && {alive _interactionTarget}) then {
-    _end = _start vectorAdd ((_start vectorFromTo (aimPos _interactionTarget)) vectorMultiply GVAR(distance));
-    _objects = lineIntersectsSurfaces [_start, _end, ACE_player];
-    TRACE_1("2nd ray attempt at interaction target aim pos",_objects);
+// If target is not defined (e.g. keybind was used), search for valid target
+if (isNull _target) then {
+    private _start = ACE_player modelToWorldVisualWorld (ACE_player selectionPosition "pilot");
+    private _end = (_start vectorAdd (getCameraViewDirection ACE_player vectorMultiply GVAR(distance)));
+    private _objects = lineIntersectsSurfaces [_start, _end, ACE_player];
     _target = (_objects param [0, []]) param [2, objNull];
 };
 
-if (locked _target in [2,3] || {!simulationEnabled _target}) exitWith {
-    [localize LSTRING(VehicleLocked)] call EFUNC(common,displayTextStructured);
-    true
+if (!alive _target) exitWith {};
+
+if (locked _target >= 2 || {!simulationEnabled _target}) exitWith {
+    [LLSTRING(VehicleLocked)] call EFUNC(common,displayTextStructured);
 };
 
 TRACE_2("",_target,typeOf _target);
 
-if (!isNull _target &&
-        {alive _target} &&
-        {{_target isKindOf _x} count ["Air","LandVehicle","Ship","StaticMortar"] > 0} &&
-        {([ACE_player, _target, ["isNotSwimming"]] call EFUNC(common,canInteractWith))} &&
-        {speed _target <= GVAR(speed)}
-        ) then {
+if (
+    (speed _target > GVAR(speed)) ||
+    {["Air", "LandVehicle", "Ship", "StaticMortar"] findIf {_target isKindOf _x} == -1} ||
+    {!([ACE_player, _target, ["isNotSwimming"]] call EFUNC(common,canInteractWith))}
+) exitWith {};
 
+private _seats = ["driver", "gunner", "commander", "cargo"];
+private _sortedSeats = [_seats select GVAR(priority)];
+_seats deleteAt GVAR(priority);
+_sortedSeats append _seats;
 
-    if (GVAR(priority) > 3 || GVAR(priority) < 0) then {
-        GVAR(priority) = 0;
-    };
+private _fullCrew = fullCrew [_target, "", true];
 
-    private _seats = ["Driver", "Gunner", "Commander", "Cargo"];
-    private _sortedSeats = [_seats select GVAR(priority)];
-    _seats deleteAt GVAR(priority);
-    _sortedSeats append _seats;
+private _hasAction = false;
+scopeName "SearchForSeat";
 
+{
+    private _desiredRole = _x;
 
-    private _hasAction = false;
-    scopeName "SearchForSeat";
     {
-        private _desiredRole = _x;
-        {
-            _x params ["_unit", "_role", "_cargoIndex", "_turretPath"];
-            if ((isNull _unit) || {!alive _unit}) then {
-                private _effectiveRole = toLowerANSI _role;
+        _x params ["_unit", "_role", "_cargoIndex", "_turretPath"];
 
-                if ((_effectiveRole in ["driver", "gunner"]) && {unitIsUAV _target}) exitWith {}; // Ignoring UAV Driver/Gunner
-                if ((_effectiveRole == "driver") && {(getNumber (configOf _target >> "hasDriver")) == 0}) exitWith {}; // Ignoring Non Driver (static weapons)
+        if (!alive _unit) then {
+            private _effectiveRole = _role;
 
-                // Seats can be locked independently of the main vehicle
-                if ((_role == "driver") && {lockedDriver _target}) exitWith {TRACE_1("lockedDriver",_x);};
-                if ((_cargoIndex >= 0) && {_target lockedCargo _cargoIndex}) exitWith {TRACE_1("lockedCargo",_x);};
-                if ((_turretPath isNotEqualTo []) && {_target lockedTurret _turretPath}) exitWith {TRACE_1("lockedTurret",_x);};
+            if ((_effectiveRole in ["driver", "gunner"]) && {unitIsUAV _target}) exitWith {}; // Ignoring UAV Driver/Gunner
+            if ((_effectiveRole == "driver") && {(getNumber (configOf _target >> "hasDriver")) == 0}) exitWith {}; // Ignoring Non Driver (static weapons)
 
-                if (_effectiveRole == "turret") then {
-                    private _turretConfig = [_target, _turretPath] call CBA_fnc_getTurret;
-                    if (getNumber (_turretConfig >> "isCopilot") == 1) exitWith {
-                        _effectiveRole = "driver";
-                    };
-                    if (
-                        _cargoIndex >= 0 // FFV
-                        || {"" isEqualTo getText (_turretConfig >> "gun")} // turret without weapon
-                    ) exitWith {
-                        _effectiveRole = "cargo";
-                    };
-                    _effectiveRole = "gunner"; // door gunners / 2nd turret
-                };
-                TRACE_2("",_effectiveRole,_x);
-                if (_effectiveRole != _desiredRole) exitWith {};
+            // Seats can be locked independently of the main vehicle
+            if ((_effectiveRole == "driver") && {lockedDriver _target}) exitWith {TRACE_1("lockedDriver",_x);};
+            if ((_cargoIndex >= 0) && {_target lockedCargo _cargoIndex}) exitWith {TRACE_1("lockedCargo",_x);};
+            if ((_turretPath isNotEqualTo []) && {_target lockedTurret _turretPath}) exitWith {TRACE_1("lockedTurret",_x);};
 
-                if (_turretPath isNotEqualTo []) then {
-                     // Using GetInTurret seems to solve problems with incorrect GetInEH params when gunner/commander
-                    ACE_player action ["GetInTurret", _target, _turretPath];
-                    TRACE_3("Geting In Turret",_x,_role,_turretPath);
-                } else {
-                    if (_cargoIndex > -1) then {
-                        // GetInCargo expects the index of the seat in the "cargo" array from fullCrew
-                        // See description: https://community.bistudio.com/wiki/fullCrew
-                        private _cargoActionIndex = -1;
-                        {
-                            if ((_x select 2) == _cargoIndex) exitWith {_cargoActionIndex = _forEachIndex};
-                        } forEach (fullCrew [_target, "cargo", true]);
+            if (_effectiveRole == "turret") then {
+                private _turretConfig = [_target, _turretPath] call CBA_fnc_getTurret;
 
-                        ACE_player action ["GetInCargo", _target, _cargoActionIndex];
-                        TRACE_4("Geting In Cargo",_x,_role,_cargoActionIndex,_cargoIndex);
-                    } else {
-                        ACE_player action ["GetIn" + _role, _target];
-                        TRACE_2("Geting In",_x,_role);
-                    };
+                if (getNumber (_turretConfig >> "isCopilot") == 1) exitWith {
+                    _effectiveRole = "driver";
                 };
 
-                _hasAction = true;
-                breakTo "SearchForSeat";
+                if (
+                    _cargoIndex >= 0 || // FFV
+                    {getText (_turretConfig >> "gun") == ""} // Turret without weapon
+                ) exitWith {
+                    _effectiveRole = "cargo";
+                };
+
+                _effectiveRole = "gunner"; // Door gunners / 2nd turret
             };
-        } forEach (fullCrew [_target, "", true]);
-    } forEach _sortedSeats;
 
-    if (!_hasAction) then {
-        TRACE_1("no empty seats",_hasAction);
-        [localize LSTRING(VehicleFull)] call EFUNC(common,displayTextStructured);
-    };
+            TRACE_2("",_effectiveRole,_x);
+
+            if (_effectiveRole != _desiredRole) exitWith {};
+
+            if (_turretPath isNotEqualTo []) then {
+                 // Using GetInTurret seems to solve problems with incorrect GetInEH params when gunner/commander
+                ACE_player action ["GetInTurret", _target, _turretPath];
+                TRACE_3("Getting In Turret",_x,_role,_turretPath);
+            } else {
+                if (_cargoIndex > -1) then {
+                    // GetInCargo expects the index of the seat in the "cargo" array from fullCrew
+                    // See description: https://community.bistudio.com/wiki/fullCrew
+                    private _cargoActionIndex = (fullCrew [_target, "cargo", true]) findIf {(_x select 2) == _cargoIndex};
+
+                    ACE_player action ["GetInCargo", _target, _cargoActionIndex];
+                    TRACE_4("Getting In Cargo",_x,_role,_cargoActionIndex,_cargoIndex);
+                } else {
+                    ACE_player action ["GetIn" + _role, _target];
+                    TRACE_2("Getting In",_x,_role);
+                };
+            };
+
+            _hasAction = true;
+            breakTo "SearchForSeat";
+        };
+    } forEach _fullCrew;
+} forEach _sortedSeats;
+
+if (!_hasAction) then {
+    TRACE_1("no empty seats",_hasAction);
+    [LLSTRING(VehicleFull)] call EFUNC(common,displayTextStructured);
 };
-
-true
diff --git a/addons/rangecard/stringtable.xml b/addons/rangecard/stringtable.xml
index 859bb2e048..3e79eac985 100644
--- a/addons/rangecard/stringtable.xml
+++ b/addons/rangecard/stringtable.xml
@@ -12,7 +12,7 @@
             <Hungarian>Távolsági kártya</Hungarian>
             <Russian>Таблица поправок</Russian>
             <Italian>Tavola Balistica</Italian>
-            <Japanese>レンジカード (射表)</Japanese>
+            <Japanese>レンジカード (弾道射表)</Japanese>
             <Korean>사거리표</Korean>
             <Chinesesimp>射表</Chinesesimp>
             <Chinese>彈道射表</Chinese>
diff --git a/addons/realisticnames/stringtable.xml b/addons/realisticnames/stringtable.xml
index 47c5f27c68..89c4775d1b 100644
--- a/addons/realisticnames/stringtable.xml
+++ b/addons/realisticnames/stringtable.xml
@@ -13,7 +13,7 @@
             <Hungarian>XM312</Hungarian>
             <Italian>XM312</Italian>
             <Japanese>XM312</Japanese>
-            <Korean>XM312</Korean>
+            <Korean>XM312 중기관총</Korean>
             <Chinese>XM312重機槍</Chinese>
             <Chinesesimp>XM312</Chinesesimp>
             <Turkish>XM312</Turkish>
@@ -30,7 +30,7 @@
             <Hungarian>XM312A</Hungarian>
             <Italian>XM312A</Italian>
             <Japanese>XM312A</Japanese>
-            <Korean>XM312A</Korean>
+            <Korean>XM312A 무인중기관총</Korean>
             <Chinese>XM312A重機槍</Chinese>
             <Chinesesimp>XM312A</Chinesesimp>
             <Turkish>XM312A</Turkish>
@@ -46,8 +46,8 @@
             <Portuguese>XM312 (Alta)</Portuguese>
             <Hungarian>XM312 (Magasított)</Hungarian>
             <Italian>XM312 (Alto)</Italian>
-            <Japanese>XM312 (高)</Japanese>
-            <Korean>XM312 (높음)</Korean>
+            <Japanese>XM312 (ハイマウント)</Japanese>
+            <Korean>XM312 중기관총 (높음)</Korean>
             <Chinese>XM312重機槍 (高射腳架)</Chinese>
             <Chinesesimp>XM312（高）</Chinesesimp>
             <Turkish>XM312 (Yüksek)</Turkish>
@@ -64,7 +64,7 @@
             <Hungarian>XM307</Hungarian>
             <Italian>XM307</Italian>
             <Japanese>XM307</Japanese>
-            <Korean>XM307</Korean>
+            <Korean>XM307 유탄기관총</Korean>
             <Chinese>XM307榴彈機槍</Chinese>
             <Chinesesimp>XM307</Chinesesimp>
             <Turkish>XM307</Turkish>
@@ -81,7 +81,7 @@
             <Hungarian>XM307A</Hungarian>
             <Italian>XM307A</Italian>
             <Japanese>XM307A</Japanese>
-            <Korean>XM307A</Korean>
+            <Korean>XM307A 무인유탄기관총</Korean>
             <Chinese>XM307A榴彈機槍</Chinese>
             <Chinesesimp>XM307A</Chinesesimp>
             <Turkish>XM307A</Turkish>
@@ -97,8 +97,8 @@
             <Portuguese>XM307 (Alta)</Portuguese>
             <Hungarian>XM307 (Magasított)</Hungarian>
             <Italian>XM307 (Alto)</Italian>
-            <Japanese>XM307 (高)</Japanese>
-            <Korean>XM307 (높음)</Korean>
+            <Japanese>XM307 (ハイマウント)</Japanese>
+            <Korean>XM307 유탄기관총 (높음)</Korean>
             <Chinese>XM307榴彈機槍 (高射腳架)</Chinese>
             <Chinesesimp>XM307（高）</Chinesesimp>
             <Turkish>XM307 (Yüksek)</Turkish>
@@ -149,7 +149,7 @@
             <Hungarian>YABHON-R3</Hungarian>
             <Italian>YABHON-R3</Italian>
             <Japanese>YABHON-R3</Japanese>
-            <Korean>YABHON-R3</Korean>
+            <Korean>YABHON-R3 무인기</Korean>
             <Chinese>"亞伯罕-R3型"空中無人載具</Chinese>
             <Chinesesimp>"联合"-R3</Chinesesimp>
             <Turkish>YABHON-R3</Turkish>
@@ -166,7 +166,7 @@
             <Italian>YABHON-R3 (CAS)</Italian>
             <Portuguese>YABHON-R3 (CAS)</Portuguese>
             <Japanese>YABHON-R3 (CAS)</Japanese>
-            <Korean>YABHON-R3 (근접지원)</Korean>
+            <Korean>YABHON-R3 무인기 (근접지원)</Korean>
             <Chinese>"亞伯罕-R3型"空中無人載具 (近空支援)</Chinese>
             <Chinesesimp>"联合"-R3（近空支援）</Chinesesimp>
             <Turkish>YABHON-R3 (CAS)</Turkish>
@@ -556,7 +556,7 @@
             <Portuguese>Leopard 2SG</Portuguese>
             <Hungarian>Leopard 2SG</Hungarian>
             <Italian>Leopard 2SG</Italian>
-            <Japanese>レオパルト 2SG</Japanese>
+            <Japanese>レオパルト2SG</Japanese>
             <Korean>레오파르트 2SG</Korean>
             <Chinese>"豹2型新加坡版"主戰坦克</Chinese>
             <Chinesesimp>"豹"2 新加坡版</Chinesesimp>
@@ -701,6 +701,11 @@
         <Key ID="STR_ACE_RealisticNames_Truck_02_water_Name">
             <English>KamAZ Water</English>
             <Portuguese>KamAZ Água</Portuguese>
+            <Japanese>KamAZ 給水</Japanese>
+            <Russian>КамАЗ (водоноситель)</Russian>
+            <Korean>카마즈 급수</Korean>
+            <German>KamAS Wasser</German>
+            <Italian>KamAZ Acqua</Italian>
         </Key>
         <Key ID="STR_ACE_RealisticNames_Truck_02_MRL_Name">
             <English>KamAZ MRL</English>
@@ -1319,7 +1324,7 @@
             <Czech>Demoliční nálož M183</Czech>
             <French>M183 Charge de démolition</French>
             <Russian>M183 комплектный подрывной заряд</Russian>
-            <Portuguese>M183 Sacola de Demolição</Portuguese>
+            <Portuguese>M183 Conjunto de Carga de Demolição</Portuguese>
             <Hungarian>M183 romboló töltet</Hungarian>
             <Italian>M183 Carica da Demolizioni</Italian>
             <Japanese>M183 梱包爆薬</Japanese>
@@ -1340,6 +1345,7 @@
             <German>M183 Geballte Sprengladung (Werfbar)</German>
             <Chinesesimp>M183 炸药包（可投掷）</Chinesesimp>
             <Korean>M183 폭파 장약 (투척)</Korean>
+            <Portuguese>M183 Carga de Demolição (Arremessável)</Portuguese>
         </Key>
         <Key ID="STR_ACE_RealisticNames_DemoCharge_Name">
             <English>M112 Demolition Block</English>
@@ -1370,6 +1376,7 @@
             <German>M112 Sprengladung (Werfbar)</German>
             <Chinesesimp>M112 塑性炸药（可投掷）</Chinesesimp>
             <Korean>M112 폭파 장약 (투척)</Korean>
+            <Portuguese>M112 Carga de Demolição (Arremessável)</Portuguese>
         </Key>
         <Key ID="STR_ACE_RealisticNames_HandGrenade_Name">
             <English>M67 Fragmentation Grenade</English>
@@ -1662,10 +1669,20 @@
         <Key ID="STR_ACE_RealisticNames_sgun_huntershotgun_01_Name">
             <English>CZ 581</English>
             <Portuguese>CZ 581</Portuguese>
+            <Japanese>CZ 581</Japanese>
+            <Russian>CZ 581</Russian>
+            <Korean>CZ 581</Korean>
+            <German>CZ 581</German>
+            <Italian>CZ 581</Italian>
         </Key>
         <Key ID="STR_ACE_RealisticNames_sgun_huntershotgun_sawedoff_01_Name">
             <English>CZ 581 (Sawed-Off)</English>
             <Portuguese>CZ 581 (Cano serrado)</Portuguese>
+            <Japanese>CZ 581 (ソードオフ)</Japanese>
+            <Russian>CZ 581 (Sawed-Off)</Russian>
+            <Korean>CZ 581 (소드오프)</Korean>
+            <German>CZ 581 (Abgesägt)</German>
+            <Italian>CZ 581 (Canne mozze)</Italian>
         </Key>
         <Key ID="STR_ACE_RealisticNames_hgun_Pistol_heavy_01_green_Name">
             <English>FNX-45 Tactical (Green)</English>
@@ -2333,7 +2350,7 @@
             <Russian>Scorpion Evo 3 A1</Russian>
             <Portuguese>Scorpion Evo 3 A1</Portuguese>
             <Italian>Scorpion Evo 3 A1</Italian>
-            <Japanese>スコーピオン エボ 3 A1</Japanese>
+            <Japanese>スコーピオン Evo 3 A1</Japanese>
             <Korean>스콜피온 에보 3 A1</Korean>
             <Chinese>"蠍式"Evo 3 A1衝鋒槍</Chinese>
             <Chinesesimp>Evo 3 A1 "蝎"</Chinesesimp>
@@ -2384,7 +2401,7 @@
             <Russian>Stoner 99 LMG</Russian>
             <Portuguese>Stoner 99 LMG</Portuguese>
             <Italian>Stoner 99 LMG</Italian>
-            <Japanese>ストーナー 99 LMG</Japanese>
+            <Japanese>ストーナー99 LMG</Japanese>
             <Korean>스토너 99 LMG</Korean>
             <Chinese>斯通納99輕機槍</Chinese>
             <Chinesesimp>斯通纳 99</Chinesesimp>
@@ -3071,14 +3088,29 @@
         <Key ID="STR_ACE_RealisticNames_arifle_arx_blk_Name">
             <English>Type 115 (Black)</English>
             <Portuguese>Type 115 (Preto)</Portuguese>
+            <Japanese>Type 115 (ブラック)</Japanese>
+            <Russian>Type 115 (чёрный)</Russian>
+            <Korean>115식 보총 (검정)</Korean>
+            <German>Type 115 (Schwarz)</German>
+            <Italian>Type 115 (Nero)</Italian>
         </Key>
         <Key ID="STR_ACE_RealisticNames_arifle_arx_ghex_Name">
             <English>Type 115 (Green Hex)</English>
             <Portuguese>Type 115 (Verde Hex)</Portuguese>
+            <Japanese>Type 115 (緑六角形迷彩)</Japanese>
+            <Russian>Type 115 (зелёный гекс)</Russian>
+            <Korean>115식 보총 (초록육각)</Korean>
+            <German>Type 115 (Hex Grün)</German>
+            <Italian>Type 115 (Hex Verde)</Italian>
         </Key>
         <Key ID="STR_ACE_RealisticNames_arifle_arx_hex_Name">
             <English>Type 115 (Hex)</English>
             <Portuguese>Type 115 (Hex)</Portuguese>
+            <Japanese>Type 115 (六角形迷彩)</Japanese>
+            <Russian>Type 115 (гекс)</Russian>
+            <Korean>115식 보총 (육각)</Korean>
+            <German>Type 115 (Hex)</German>
+            <Italian>Type 115 (Hex)</Italian>
         </Key>
         <Key ID="STR_ACE_RealisticNames_arifle_CTAR_blk">
             <English>QBZ-95-1 (Black)</English>
@@ -3638,7 +3670,7 @@
             <Czech>Polaris DAGOR (XM312)</Czech>
             <Turkish>Polaris DAGOR (XM312)</Turkish>
             <Spanish>Polaris DAGOR (XM312)</Spanish>
-            <Korean>폴라리스 DAGOR (XM312)</Korean>
+            <Korean>폴라리스 DAGOR (XM312 중기관총)</Korean>
         </Key>
         <Key ID="STR_ACE_RealisticNames_lsv_01_at">
             <English>Polaris DAGOR (Mini-Spike AT)</English>
@@ -3654,7 +3686,7 @@
             <Czech>Polaris DAGOR (Mini-Spike AT)</Czech>
             <Turkish>Polaris DAGOR (Mini-Spike AT)</Turkish>
             <Spanish>Polaris DAGOR (Mini-Spike AT)</Spanish>
-            <Korean>폴라리스 DAGOR (스파이크 미사일 대전차)</Korean>
+            <Korean>폴라리스 DAGOR (스파이크 대전차미사일)</Korean>
         </Key>
         <Key ID="STR_ACE_RealisticNames_lsv_01_unarmed">
             <English>Polaris DAGOR</English>
@@ -3675,7 +3707,7 @@
         <Key ID="STR_ACE_RealisticNames_lsv_01_light">
             <English>Polaris DAGOR (light)</English>
             <German>Polaris DAGOR (leicht)</German>
-            <Japanese>ポラリス DAGOR (軽)</Japanese>
+            <Japanese>ポラリス DAGOR (軽装)</Japanese>
             <Chinese>"北極星"先進佈署越野車 (輕型)</Chinese>
             <Chinesesimp>"北极星"（轻型）</Chinesesimp>
             <Italian>Polaris DAGOR (leggero)</Italian>
@@ -3702,7 +3734,7 @@
             <Czech>LSV Mk. II (M134)</Czech>
             <Turkish>LSV Mk. II (M134)</Turkish>
             <Spanish>LSV Mk. II (M134)</Spanish>
-            <Korean>LSV Mk.II (M134)</Korean>
+            <Korean>LSV Mk.II (M134 미니건)</Korean>
         </Key>
         <Key ID="STR_ACE_RealisticNames_lsv_02_at">
             <English>LSV Mk. II (Metis-M)</English>
@@ -3814,7 +3846,7 @@
             <Czech>Wiesel 2 Ozelot (AA)</Czech>
             <Turkish>Wiesel 2 Ozelot (AA)</Turkish>
             <Spanish>Wiesel 2 Ozelot (AA)</Spanish>
-            <Korean>비젤 2 오셀롯 (대공)</Korean>
+            <Korean>비젤 2 오젤롯 (대공)</Korean>
         </Key>
         <Key ID="STR_ACE_RealisticNames_LT_01_AT">
             <English>Wiesel 2 (ATGM)</English>
@@ -3830,7 +3862,7 @@
             <Czech>Wiesel 2 (ATGM)</Czech>
             <Turkish>Wiesel 2 (ATGM)</Turkish>
             <Spanish>Wiesel 2 (ATGM)</Spanish>
-            <Korean>비젤 2 (대전차유도)</Korean>
+            <Korean>비젤 2 (대전차미사일)</Korean>
         </Key>
         <Key ID="STR_ACE_RealisticNames_LT_01_cannon">
             <English>Wiesel 2 (MK20)</English>
@@ -3867,14 +3899,29 @@
         <Key ID="STR_ACE_RealisticNames_flashlight_Name">
             <English>UTG Defender 126</English>
             <Portuguese>UTG Defender 126</Portuguese>
+            <Japanese>UTG ディフェンダー 126</Japanese>
+            <Russian>UTG Defender 126</Russian>
+            <Korean>UTG 디펜더 126</Korean>
+            <German>UTG Defender 126</German>
+            <Italian>UTG Defender 126</Italian>
         </Key>
         <Key ID="STR_ACE_RealisticNames_optic_mrd_Name">
             <English>EOTech MRDS</English>
             <Portuguese>EOTech MRDS</Portuguese>
+            <Japanese>EOTech MRDS</Japanese>
+            <Russian>EOTech MRDS</Russian>
+            <Korean>이오텍 MRDS</Korean>
+            <German>EOTech MRDS</German>
+            <Italian>EOTech MRDS</Italian>
         </Key>
         <Key ID="STR_ACE_RealisticNames_optic_mrd_black_Name">
             <English>EOTech MRDS (Black)</English>
             <Portuguese>EOTech MRDS (Preto)</Portuguese>
+            <Japanese>EOTech MRDS (ブラック)</Japanese>
+            <Russian>EOTech MRDS (чёрный)</Russian>
+            <Korean>이오텍 MRDS (검정)</Korean>
+            <German>EOTech MRDS (Schwarz)</German>
+            <Italian>EOTech MRDS (Nero)</Italian>
         </Key>
         <Key ID="STR_ACE_RealisticNames_optic_hamr">
             <English>Leupold Mark 4 HAMR</English>
@@ -4031,6 +4078,7 @@
             <Korean>엘칸 스펙터OS (초목)</Korean>
             <Russian>ELCAN SpecterOS (обильная растительность)</Russian>
             <Spanish>ELCAN SpecterOS (Exuberante)</Spanish>
+            <Portuguese>ELCAN SpecterOS (Exuberante)</Portuguese>
         </Key>
         <Key ID="STR_ACE_RealisticNames_optic_arco_arid">
             <English>ELCAN SpecterOS (Arid)</English>
@@ -4043,6 +4091,7 @@
             <Korean>엘칸 스펙터OS (건조)</Korean>
             <Russian>ELCAN SpecterOS (сухая местность)</Russian>
             <Spanish>ELCAN SpecterOS (Árido)</Spanish>
+            <Portuguese>ELCAN SpecterOS (Árido)</Portuguese>
         </Key>
         <Key ID="STR_ACE_RealisticNames_optic_arco_ak_blk">
             <English>ELCAN SpecterOS 7.62 (Black)</English>
@@ -4055,6 +4104,7 @@
             <Korean>엘칸 스펙터OS 7.62 (검정)</Korean>
             <Russian>ELCAN SpecterOS 7.62 (чёрный)</Russian>
             <Spanish>ELCAN SpecterOS 7.62 (Negro)</Spanish>
+            <Portuguese>ELCAN SpecterOS 7.62 (Preto)</Portuguese>
         </Key>
         <Key ID="STR_ACE_RealisticNames_optic_arco_ak_lush">
             <English>ELCAN SpecterOS 7.62 (Lush)</English>
@@ -4067,6 +4117,7 @@
             <Korean>엘칸 스펙터OS 7.62 (초목)</Korean>
             <Russian>ELCAN SpecterOS 7.62 (обильная растительность)</Russian>
             <Spanish>ELCAN SpecterOS 7.62 (Exuberante)</Spanish>
+            <Portuguese>ELCAN SpecterOS 7.62 (Exuberante)</Portuguese>
         </Key>
         <Key ID="STR_ACE_RealisticNames_optic_arco_ak_arid">
             <English>ELCAN SpecterOS 7.62 (Arid)</English>
@@ -4079,6 +4130,7 @@
             <Korean>엘칸 스펙터OS 7.62 (건조)</Korean>
             <Russian>ELCAN SpecterOS 7.62 (сухая местность)</Russian>
             <Spanish>ELCAN SpecterOS 7.62 (Árido)</Spanish>
+            <Portuguese>ELCAN SpecterOS 7.62 (Árido)</Portuguese>
         </Key>
         <Key ID="STR_ACE_RealisticNames_optic_erco_blk">
             <English>SIG BRAVO4 / ROMEO3 (Black)</English>
@@ -4308,7 +4360,7 @@
             <English>KAHLES Helia (Tan)</English>
             <Chinese>KAHLES Helia (Tan)</Chinese>
             <Chinesesimp>KAHLES Helia（沙色）</Chinesesimp>
-            <Japanese>KAHLES Helia (タン)</Japanese>
+            <Japanese>KAHLES ヘリア (タン)</Japanese>
             <Polish>KAHLES Helia (Tan)</Polish>
             <Italian>KAHLES Helia (Marroncino)</Italian>
             <Russian>KAHLES Helia (пустынный)</Russian>
@@ -4363,6 +4415,7 @@
             <Korean>버리스 XTR II (낡음)</Korean>
             <Russian>Burris XTR II (старый)</Russian>
             <Spanish>Burris XTR II (Viejo)</Spanish>
+            <Portuguese>Burris XTR II (Velho)</Portuguese>
         </Key>
         <Key ID="STR_ACE_RealisticNames_optic_dms_weathered_kir">
             <English>Burris XTR II (ASP-1 Kir)</English>
@@ -4375,6 +4428,7 @@
             <Korean>버리스 XTR II (ASP-1 키르용)</Korean>
             <Russian>Burris XTR II (ASP-1 Kir)</Russian>
             <Spanish>Burris XTR II (ASP-1 Kir)</Spanish>
+            <Portuguese>Burris XTR II (ASP-1 Kir)</Portuguese>
         </Key>
         <Key ID="STR_ACE_RealisticNames_optic_holosight">
             <English>EOTech XPS3 (Tan)</English>
@@ -4435,6 +4489,7 @@
             <Korean>이오텍 XPS3 (초목)</Korean>
             <Russian>EOTech XPS3 (обильная растительность)</Russian>
             <Spanish>EOTech XPS3 (Exuberante)</Spanish>
+            <Portuguese>EOTech XPS3 (Exuberante)</Portuguese>
         </Key>
         <Key ID="STR_ACE_RealisticNames_optic_holosight_arid">
             <English>EOTech XPS3 (Arid)</English>
@@ -4447,6 +4502,7 @@
             <Korean>이오텍 XPS3 (건조)</Korean>
             <Russian>EOTech XPS3 (сухая местность)</Russian>
             <Spanish>EOTech XPS3 (Árido)</Spanish>
+            <Portuguese>EOTech XPS3 (Árido)</Portuguese>
         </Key>
         <Key ID="STR_ACE_RealisticNames_optic_holosight_smg">
             <English>EOTech XPS3 SMG (Tan)</English>
diff --git a/addons/rearm/XEH_postInit.sqf b/addons/rearm/XEH_postInit.sqf
index 0c79790ec0..61ec35b8de 100644
--- a/addons/rearm/XEH_postInit.sqf
+++ b/addons/rearm/XEH_postInit.sqf
@@ -1,6 +1,5 @@
 #include "script_component.hpp"
 
-GVAR(hardpointGroupsCache) = [] call CBA_fnc_createNamespace;
 GVAR(configTypesAdded) = [];
 GVAR(magazineNameCache) = createHashMap;
 GVAR(usedMagazineNames) = createHashMap;
diff --git a/addons/rearm/XEH_preStart.sqf b/addons/rearm/XEH_preStart.sqf
index b092699f9b..b013b04b86 100644
--- a/addons/rearm/XEH_preStart.sqf
+++ b/addons/rearm/XEH_preStart.sqf
@@ -4,6 +4,6 @@
 
 // Test binarization one time at startup - ref https://github.com/acemod/ACE3/pull/8093
 private _test = getText (configFile >> "Cfg3DEN" >> "Object" >> "AttributeCategories" >> "ace_attributes" >> "Attributes" >> "ace_rearm_rearmCargo" >> "defaultValue");
-if (!("else {" in _test)) then {
+if !("else {" in _test) then {
     ERROR("3den attribute has ERROR [check binarization]");
 };
diff --git a/addons/rearm/script_component.hpp b/addons/rearm/script_component.hpp
index 83d495bc38..1cc6379ff7 100644
--- a/addons/rearm/script_component.hpp
+++ b/addons/rearm/script_component.hpp
@@ -28,7 +28,9 @@
 
 
 #define REARM_HOLSTER_WEAPON \
-    _unit setVariable [QGVAR(selectedWeaponOnRearm), currentWeapon _unit]; \
+    if (currentWeapon _unit != "") then { \
+        _unit setVariable [QGVAR(selectedWeaponOnRearm), (weaponState _unit) select [0, 3]]; \
+    }; \
     TRACE_2("REARM_HOLSTER_WEAPON",_unit,currentWeapon _unit); \
     _unit action ["SwitchWeapon", _unit, _unit, 299];
 
diff --git a/addons/recoil/$PBOPREFIX$ b/addons/recoil/$PBOPREFIX$
index 1ab9ffa5e1..efd38b75ed 100644
--- a/addons/recoil/$PBOPREFIX$
+++ b/addons/recoil/$PBOPREFIX$
@@ -1 +1 @@
-z\ace\addons\recoil
\ No newline at end of file
+z\ace\addons\recoil
diff --git a/addons/recoil/CfgEventHandlers.hpp b/addons/recoil/CfgEventHandlers.hpp
index 6c29240403..f6503c2479 100644
--- a/addons/recoil/CfgEventHandlers.hpp
+++ b/addons/recoil/CfgEventHandlers.hpp
@@ -1,4 +1,3 @@
-
 class Extended_PreStart_EventHandlers {
     class ADDON {
         init = QUOTE(call COMPILE_SCRIPT(XEH_preStart));
diff --git a/addons/recoil/CfgMoves.hpp b/addons/recoil/CfgMoves.hpp
index 29bca9c81a..aca9d93f3c 100644
--- a/addons/recoil/CfgMoves.hpp
+++ b/addons/recoil/CfgMoves.hpp
@@ -1,4 +1,3 @@
-
 // Completely disable BI's camshake on fire.
 #define ACE_CAMSHAKEFIRE_BASE 0
 #define ACE_CAMSHAKEFIRE_LESS 0
diff --git a/addons/recoil/CfgRecoils.hpp b/addons/recoil/CfgRecoils.hpp
index c6482937ae..b8d181e566 100644
--- a/addons/recoil/CfgRecoils.hpp
+++ b/addons/recoil/CfgRecoils.hpp
@@ -1,4 +1,3 @@
-
 #define KICKBACK 1.4
 
 #define MUZZLETEMP 1.2
@@ -15,28 +14,28 @@ class CfgRecoils {
         // doc: http://forums.bistudio.com/showthread.php?188999-Recoil-Overhaul-Feedback&s=dba8590ec07adb5ffa87f72d38dde6fc&p=2886744&viewfull=1#post2886744
         // {horizontal axis position, vertical axis position, horizontal magnitude, vertical magnitude}
         muzzleOuter[] = {
-            QUOTE(0*MUZZLERIGHT_POS),
-            QUOTE(0.4*MUZZLECLIMB_POS),
-            QUOTE(0.5*MUZZLERIGHT_MAG),
-            QUOTE(0.6*MUZZLECLIMB_MAG)
+            0*MUZZLERIGHT_POS,
+            0.4*MUZZLECLIMB_POS,
+            0.5*MUZZLERIGHT_MAG,
+            0.6*MUZZLECLIMB_MAG
         };
         // restricted area inside the outer ellipse where the recoil cannot end
         muzzleInner[] = {0,0.05,0.2,0.2};
         // minimum and maximum interval for backward force
         kickBack[] = {
-            QUOTE(0.05*KICKBACK),
-            QUOTE(0.1*KICKBACK)
+            0.05*KICKBACK,
+            0.1*KICKBACK
         };
-        permanent = QUOTE(0.1*MUZZLEPERM);
-        temporary = QUOTE(0.01*MUZZLETEMP);
+        permanent = 0.1*MUZZLEPERM;
+        temporary = 0.01*MUZZLETEMP;
     };
 
     class recoil_default: Default {
         muzzleOuter[] = {
-            QUOTE(0.3*MUZZLERIGHT_POS),
-            QUOTE(1*MUZZLECLIMB_POS),
-            QUOTE(0.3*MUZZLERIGHT_MAG),
-            QUOTE(0.2*MUZZLECLIMB_MAG)
+            0.3*MUZZLERIGHT_POS,
+            1*MUZZLECLIMB_POS,
+            0.3*MUZZLERIGHT_MAG,
+            0.2*MUZZLECLIMB_MAG
         };
         muzzleInner[] = {0,
             0,
@@ -44,528 +43,529 @@ class CfgRecoils {
             0.1
         };
         kickBack[] = {
-            QUOTE(0.03*KICKBACK),
-            QUOTE(0.06*KICKBACK)
+            0.03*KICKBACK,
+            0.06*KICKBACK
         };
-        permanent = QUOTE(0.1*MUZZLEPERM);
-        temporary = QUOTE(0.01*MUZZLETEMP);
+        permanent = 0.1*MUZZLEPERM;
+        temporary = 0.01*MUZZLETEMP;
     };
 
     class recoil_mk20: recoil_default {
         muzzleOuter[] = {
-            QUOTE(0.2*MUZZLERIGHT_POS),
-            QUOTE(0.6*MUZZLECLIMB_POS),
-            QUOTE(0.2*MUZZLERIGHT_MAG),
-            QUOTE(0.2*MUZZLECLIMB_MAG)
+            0.2*MUZZLERIGHT_POS,
+            0.6*MUZZLECLIMB_POS,
+            0.2*MUZZLERIGHT_MAG,
+            0.2*MUZZLECLIMB_MAG
         };
         kickBack[] = {
-            QUOTE(0.01*KICKBACK),
-            QUOTE(0.03*KICKBACK)
+            0.01*KICKBACK,
+            0.03*KICKBACK
         };
-        temporary = QUOTE(0.01*MUZZLETEMP);
+        temporary = 0.01*MUZZLETEMP;
     };
 
     class recoil_mk20c: recoil_default {
         muzzleOuter[] = {
-            QUOTE(0.2*MUZZLERIGHT_POS),
-            QUOTE(0.8*MUZZLECLIMB_POS),
-            QUOTE(0.3*MUZZLERIGHT_MAG),
-            QUOTE(0.2*MUZZLECLIMB_MAG)
+            0.2*MUZZLERIGHT_POS,
+            0.8*MUZZLECLIMB_POS,
+            0.3*MUZZLERIGHT_MAG,
+            0.2*MUZZLECLIMB_MAG
         };
         kickBack[] = {
-            QUOTE(0.02*KICKBACK),
-            QUOTE(0.04*KICKBACK)
+            0.02*KICKBACK,
+            0.04*KICKBACK
         };
-        temporary = QUOTE(0.015*MUZZLETEMP);
+        temporary = 0.015*MUZZLETEMP;
     };
 
     class recoil_trg20: recoil_default {
         muzzleOuter[] = {
-            QUOTE(0.2*MUZZLERIGHT_POS),
-            QUOTE(1*MUZZLECLIMB_POS),
-            QUOTE(0.3*MUZZLERIGHT_MAG),
-            QUOTE(0.3*MUZZLECLIMB_MAG)
+            0.2*MUZZLERIGHT_POS,
+            1*MUZZLECLIMB_POS,
+            0.3*MUZZLERIGHT_MAG,
+            0.3*MUZZLECLIMB_MAG
         };
         kickBack[] = {
-            QUOTE(0.02*KICKBACK),
-            QUOTE(0.04*KICKBACK)
+            0.02*KICKBACK,
+            0.04*KICKBACK
         };
-        temporary = QUOTE(0.015*MUZZLETEMP);
+        temporary = 0.015*MUZZLETEMP;
     };
 
     class recoil_trg21: recoil_default {
         muzzleOuter[] = {
-            QUOTE(0.2*MUZZLERIGHT_POS),
-            QUOTE(0.8*MUZZLECLIMB_POS),
-            QUOTE(0.3*MUZZLERIGHT_MAG),
-            QUOTE(0.2*MUZZLECLIMB_MAG)
+            0.2*MUZZLERIGHT_POS,
+            0.8*MUZZLECLIMB_POS,
+            0.3*MUZZLERIGHT_MAG,
+            0.2*MUZZLECLIMB_MAG
         };
         kickBack[] = {
-            QUOTE(0.01*KICKBACK),
-            QUOTE(0.03*KICKBACK)
+            0.01*KICKBACK,
+            0.03*KICKBACK
         };
-        temporary = QUOTE(0.01*MUZZLETEMP);
+        temporary = 0.01*MUZZLETEMP;
     };
 
     class recoil_mx: recoil_default {
         muzzleOuter[] = {
-            QUOTE(0.3*MUZZLERIGHT_POS),
-            QUOTE(1*MUZZLECLIMB_POS),
-            QUOTE(0.4*MUZZLERIGHT_MAG),
-            QUOTE(0.3*MUZZLECLIMB_MAG)
+            0.3*MUZZLERIGHT_POS,
+            1*MUZZLECLIMB_POS,
+            0.4*MUZZLERIGHT_MAG,
+            0.3*MUZZLECLIMB_MAG
         };
         kickBack[] = {
-            QUOTE(0.02*KICKBACK),
-            QUOTE(0.04*KICKBACK)
+            0.02*KICKBACK,
+            0.04*KICKBACK
         };
-        temporary = QUOTE(0.01*MUZZLETEMP);
+        temporary = 0.01*MUZZLETEMP;
     };
 
     class recoil_mxc: recoil_default {
         muzzleOuter[] = {
-            QUOTE(0.3*MUZZLERIGHT_POS),
-            QUOTE(1.2*MUZZLECLIMB_POS),
-            QUOTE(0.4*MUZZLERIGHT_MAG),
-            QUOTE(0.3*MUZZLECLIMB_MAG)
+            0.3*MUZZLERIGHT_POS,
+            1.2*MUZZLECLIMB_POS,
+            0.4*MUZZLERIGHT_MAG,
+            0.3*MUZZLECLIMB_MAG
         };
         kickBack[] = {
-            QUOTE(0.03*KICKBACK),
-            QUOTE(0.06*KICKBACK)
+            0.03*KICKBACK,
+            0.06*KICKBACK
         };
-        temporary = QUOTE(0.015*MUZZLETEMP);
+        temporary = 0.015*MUZZLETEMP;
     };
 
     class recoil_sw: recoil_default {
         muzzleOuter[] = {
-            QUOTE(0.3*MUZZLERIGHT_POS),
-            QUOTE(0.8*MUZZLECLIMB_POS),
-            QUOTE(0.5*MUZZLERIGHT_MAG),
-            QUOTE(0.2*MUZZLECLIMB_MAG)
+            0.3*MUZZLERIGHT_POS,
+            0.8*MUZZLECLIMB_POS,
+            0.5*MUZZLERIGHT_MAG,
+            0.2*MUZZLECLIMB_MAG
         };
         kickBack[] = {
-            QUOTE(0.02*KICKBACK),
-            QUOTE(0.04*KICKBACK)
+            0.02*KICKBACK,
+            0.04*KICKBACK
         };
-        temporary = QUOTE(0.01*MUZZLETEMP); //0.005*MUZZLETEMP;
+        temporary = 0.01*MUZZLETEMP; //0.005*MUZZLETEMP;
     };
 
     class recoil_mxm: recoil_default {
         muzzleOuter[] = {
-            QUOTE(0.3*MUZZLERIGHT_POS),
-            QUOTE(0.8*MUZZLECLIMB_POS),
-            QUOTE(0.4*MUZZLERIGHT_MAG),
-            QUOTE(0.3*MUZZLECLIMB_MAG)
+            0.3*MUZZLERIGHT_POS,
+            0.8*MUZZLECLIMB_POS,
+            0.4*MUZZLERIGHT_MAG,
+            0.3*MUZZLECLIMB_MAG
         };
         kickBack[] = {
-            QUOTE(0.02*KICKBACK),
-            QUOTE(0.04*KICKBACK)
+            0.02*KICKBACK,
+            0.04*KICKBACK
         };
-        temporary = QUOTE(0.01*MUZZLETEMP);
+        temporary = 0.01*MUZZLETEMP;
     };
 
     class recoil_ktb: recoil_default {
         muzzleOuter[] = {
-            QUOTE(0.3*MUZZLERIGHT_POS),
-            QUOTE(1*MUZZLECLIMB_POS),
-            QUOTE(0.3*MUZZLERIGHT_MAG),
-            QUOTE(0.3*MUZZLECLIMB_MAG)
+            0.3*MUZZLERIGHT_POS,
+            1*MUZZLECLIMB_POS,
+            0.3*MUZZLERIGHT_MAG,
+            0.3*MUZZLECLIMB_MAG
         };
         kickBack[] = {
-            QUOTE(0.02*KICKBACK),
-            QUOTE(0.04*KICKBACK)
+            0.02*KICKBACK,
+            0.04*KICKBACK
         };
-        temporary = QUOTE(0.01*MUZZLETEMP);
+        temporary = 0.01*MUZZLETEMP;
     };
 
     class recoil_ktbc: recoil_default {
         muzzleOuter[] = {
-            QUOTE(0.3*MUZZLERIGHT_POS),
-            QUOTE(1.2*MUZZLECLIMB_POS),
-            QUOTE(0.3*MUZZLERIGHT_MAG),
-            QUOTE(0.3*MUZZLECLIMB_MAG)
+            0.3*MUZZLERIGHT_POS,
+            1.2*MUZZLECLIMB_POS,
+            0.3*MUZZLERIGHT_MAG,
+            0.3*MUZZLECLIMB_MAG
         };
         kickBack[] = {
-            QUOTE(0.03*KICKBACK),
-            QUOTE(0.06*KICKBACK)
+            0.03*KICKBACK,
+            0.06*KICKBACK
         };
-        temporary = QUOTE(0.015*MUZZLETEMP);
+        temporary = 0.015*MUZZLETEMP;
     };
 
     class recoil_smg_01: recoil_default {
         muzzleOuter[] = {
-            QUOTE(0.1*MUZZLERIGHT_POS),
-            QUOTE(0.8*MUZZLECLIMB_POS),
-            QUOTE(0.3*MUZZLERIGHT_MAG),
-            QUOTE(0.2*MUZZLECLIMB_MAG)
+            0.1*MUZZLERIGHT_POS,
+            0.8*MUZZLECLIMB_POS,
+            0.3*MUZZLERIGHT_MAG,
+            0.2*MUZZLECLIMB_MAG
         };
         kickBack[] = {
-            QUOTE(0.01*KICKBACK),
-            QUOTE(0.03*KICKBACK)
+            0.01*KICKBACK,
+            0.03*KICKBACK
         };
-        temporary = QUOTE(0.015*MUZZLETEMP);
+        temporary = 0.015*MUZZLETEMP;
     };
 
     class recoil_smg_02: recoil_default {
         muzzleOuter[] = {
-            QUOTE(0.1*MUZZLERIGHT_POS),
-            QUOTE(0.6*MUZZLECLIMB_POS),
-            QUOTE(0.2*MUZZLERIGHT_MAG),
-            QUOTE(0.2*MUZZLECLIMB_MAG)
+            0.1*MUZZLERIGHT_POS,
+            0.6*MUZZLECLIMB_POS,
+            0.2*MUZZLERIGHT_MAG,
+            0.2*MUZZLECLIMB_MAG
         };
         kickBack[] = {
-            QUOTE(0.01*KICKBACK),
-            QUOTE(0.02*KICKBACK)
+            0.01*KICKBACK,
+            0.02*KICKBACK
         };
-        temporary = QUOTE(0.01*MUZZLETEMP);
+        temporary = 0.01*MUZZLETEMP;
     };
 
     class recoil_pdw: recoil_default {
         muzzleOuter[] = {
-            QUOTE(0.2*MUZZLERIGHT_POS),
-            QUOTE(1*MUZZLECLIMB_POS),
-            QUOTE(0.3*MUZZLERIGHT_MAG),
-            QUOTE(0.3*MUZZLECLIMB_MAG)
+            0.2*MUZZLERIGHT_POS,
+            1*MUZZLECLIMB_POS,
+            0.3*MUZZLERIGHT_MAG,
+            0.3*MUZZLECLIMB_MAG
         };
         kickBack[] = {
-            QUOTE(0.02*KICKBACK),
-            QUOTE(0.04*KICKBACK)
+            0.02*KICKBACK,
+            0.04*KICKBACK
         };
-        temporary = QUOTE(0.02*MUZZLETEMP);
+        temporary = 0.02*MUZZLETEMP;
     };
 
     class recoil_sdar: recoil_default {
         muzzleOuter[] = {
-            QUOTE(0.2*MUZZLERIGHT_POS),
-            QUOTE(1*MUZZLECLIMB_POS),
-            QUOTE(0.3*MUZZLERIGHT_MAG),
-            QUOTE(0.3*MUZZLECLIMB_MAG)
+            0.2*MUZZLERIGHT_POS,
+            1*MUZZLECLIMB_POS,
+            0.3*MUZZLERIGHT_MAG,
+            0.3*MUZZLECLIMB_MAG
         };
         kickBack[] = {
-            QUOTE(0.02*KICKBACK),
-            QUOTE(0.04*KICKBACK)
+            0.02*KICKBACK,
+            0.04*KICKBACK
         };
-        temporary = QUOTE(0.01*MUZZLETEMP);
+        temporary = 0.01*MUZZLETEMP;
     };
 
     class recoil_pistol_p07: recoil_default {
         muzzleOuter[] = {
-            QUOTE(0.2*MUZZLERIGHT_POS),
-            QUOTE(1*MUZZLECLIMB_POS),
-            QUOTE(0.2*MUZZLERIGHT_MAG),
-            QUOTE(0.3*MUZZLECLIMB_MAG)
+            0.2*MUZZLERIGHT_POS,
+            1*MUZZLECLIMB_POS,
+            0.2*MUZZLERIGHT_MAG,
+            0.3*MUZZLECLIMB_MAG
         };
         kickBack[] = {
-            QUOTE(0.03*KICKBACK),
-            QUOTE(0.06*KICKBACK)
+            0.03*KICKBACK,
+            0.06*KICKBACK
         };
-        temporary = QUOTE(0.03*MUZZLETEMP);
+        temporary = 0.03*MUZZLETEMP;
     };
 
     class recoil_pistol_rook40: recoil_default {
         muzzleOuter[] = {
-            QUOTE(0.2*MUZZLERIGHT_POS),
-            QUOTE(1*MUZZLECLIMB_POS),
-            QUOTE(0.2*MUZZLERIGHT_MAG),
-            QUOTE(0.3*MUZZLECLIMB_MAG)
+            0.2*MUZZLERIGHT_POS,
+            1*MUZZLECLIMB_POS,
+            0.2*MUZZLERIGHT_MAG,
+            0.3*MUZZLECLIMB_MAG
         };
         kickBack[] = {
-            QUOTE(0.03*KICKBACK),
-            QUOTE(0.06*KICKBACK)
+            0.03*KICKBACK,
+            0.06*KICKBACK
         };
-        temporary = QUOTE(0.02*MUZZLETEMP);
+        temporary = 0.02*MUZZLETEMP;
     };
 
     class recoil_pistol_acpc2: recoil_default {
         muzzleOuter[] = {
-            QUOTE(0.2*MUZZLERIGHT_POS),
-            QUOTE(1.5*MUZZLECLIMB_POS),
-            QUOTE(0.2*MUZZLERIGHT_MAG),
-            QUOTE(0.3*MUZZLECLIMB_MAG)
+            0.2*MUZZLERIGHT_POS,
+            1.5*MUZZLECLIMB_POS,
+            0.2*MUZZLERIGHT_MAG,
+            0.3*MUZZLECLIMB_MAG
         };
         kickBack[] = {
-            QUOTE(0.04*KICKBACK),
-            QUOTE(0.08*KICKBACK)
+            0.04*KICKBACK,
+            0.08*KICKBACK
         };
-        temporary = QUOTE(0.04*MUZZLETEMP);
+        temporary = 0.04*MUZZLETEMP;
     };
 
     class recoil_pistol_4five: recoil_default {
         muzzleOuter[] = {
-            QUOTE(0.2*MUZZLERIGHT_POS),
-            QUOTE(1.5*MUZZLECLIMB_POS),
-            QUOTE(0.2*MUZZLERIGHT_MAG),
-            QUOTE(0.3*MUZZLECLIMB_MAG)
+            0.2*MUZZLERIGHT_POS,
+            1.5*MUZZLECLIMB_POS,
+            0.2*MUZZLERIGHT_MAG,
+            0.3*MUZZLECLIMB_MAG
         };
         kickBack[] = {
-            QUOTE(0.04*KICKBACK),
-            QUOTE(0.08*KICKBACK)
+            0.04*KICKBACK,
+            0.08*KICKBACK
         };
-        temporary = QUOTE(0.06*MUZZLETEMP);
+        temporary = 0.06*MUZZLETEMP;
     };
 
     class recoil_pistol_zubr: recoil_default {
         muzzleOuter[] = {
-            QUOTE(0.2*MUZZLERIGHT_POS),
-            QUOTE(1.5*MUZZLECLIMB_POS),
-            QUOTE(0.2*MUZZLERIGHT_MAG),
-            QUOTE(0.3*MUZZLECLIMB_MAG)
+            0.2*MUZZLERIGHT_POS,
+            1.5*MUZZLECLIMB_POS,
+            0.2*MUZZLERIGHT_MAG,
+            0.3*MUZZLECLIMB_MAG
         };
         kickBack[] = {
-            QUOTE(0.04*KICKBACK),
-            QUOTE(0.08*KICKBACK)
+            0.04*KICKBACK,
+            0.08*KICKBACK
         };
-        temporary = QUOTE(0.08*MUZZLETEMP);
+        temporary = 0.08*MUZZLETEMP;
     };
 
     class recoil_pistol_signal: recoil_default {
         muzzleOuter[] = {
-            QUOTE(0.2*MUZZLERIGHT_POS),
-            QUOTE(1.5*MUZZLECLIMB_POS),
-            QUOTE(0.2*MUZZLERIGHT_MAG),
-            QUOTE(0.3*MUZZLECLIMB_MAG)
+            0.2*MUZZLERIGHT_POS,
+            1.5*MUZZLECLIMB_POS,
+            0.2*MUZZLERIGHT_MAG,
+            0.3*MUZZLECLIMB_MAG
         };
         kickBack[] = {
-            QUOTE(0.02*KICKBACK),
-            QUOTE(0.04*KICKBACK)
+            0.02*KICKBACK,
+            0.04*KICKBACK
         };
-        temporary = QUOTE(0.02*MUZZLETEMP);
+        temporary = 0.02*MUZZLETEMP;
     };
 
     class recoil_rpg: recoil_default {
         muzzleOuter[] = {
-            QUOTE(2*MUZZLERIGHT_POS),
-            QUOTE(3*MUZZLECLIMB_POS),
-            QUOTE(1*MUZZLERIGHT_MAG),
-            QUOTE(0.5*MUZZLECLIMB_MAG)
+            0.0*MUZZLERIGHT_POS,
+            0.1*MUZZLECLIMB_POS,
+            0.3*MUZZLERIGHT_MAG,
+            0.5*MUZZLECLIMB_MAG
         };
         kickBack[] = {
-            QUOTE(0.08*KICKBACK),
-            QUOTE(0.1*KICKBACK)
+            0.0*KICKBACK,
+            0.08*KICKBACK
         };
-        temporary = QUOTE(0.1*MUZZLETEMP);
+        permanent = 1.0*MUZZLEPERM;
+        temporary = 0.05*MUZZLETEMP;
     };
 
     class recoil_nlaw: recoil_default {
         muzzleOuter[] = {
-            QUOTE(2*MUZZLERIGHT_POS),
-            QUOTE(3*MUZZLECLIMB_POS),
-            QUOTE(1*MUZZLERIGHT_MAG),
-            QUOTE(0.5*MUZZLECLIMB_MAG)
+            2*MUZZLERIGHT_POS,
+            3*MUZZLECLIMB_POS,
+            1*MUZZLERIGHT_MAG,
+            0.5*MUZZLECLIMB_MAG
         };
         kickBack[] = {
-            QUOTE(0.06*KICKBACK),
-            QUOTE(0.08*KICKBACK)
+            0.06*KICKBACK,
+            0.08*KICKBACK
         };
-        temporary = QUOTE(0.08*MUZZLETEMP);
+        temporary = 0.08*MUZZLETEMP;
     };
 
     class recoil_titan_long: recoil_default {
         muzzleOuter[] = {
-            QUOTE(2*MUZZLERIGHT_POS),
-            QUOTE(3*MUZZLECLIMB_POS),
-            QUOTE(1*MUZZLERIGHT_MAG),
-            QUOTE(0.5*MUZZLECLIMB_MAG)
+            2*MUZZLERIGHT_POS,
+            3*MUZZLECLIMB_POS,
+            1*MUZZLERIGHT_MAG,
+            0.5*MUZZLECLIMB_MAG
         };
         kickBack[] = {
-            QUOTE(0.1*KICKBACK),
-            QUOTE(0.12*KICKBACK)
+            0.1*KICKBACK,
+            0.12*KICKBACK
         };
-        temporary = QUOTE(0.15*MUZZLETEMP);
+        temporary = 0.15*MUZZLETEMP;
     };
 
     class recoil_titan_short: recoil_default {
         muzzleOuter[] = {
-            QUOTE(2*MUZZLERIGHT_POS),
-            QUOTE(3*MUZZLECLIMB_POS),
-            QUOTE(1*MUZZLERIGHT_MAG),
-            QUOTE(0.5*MUZZLECLIMB_MAG)
+            2*MUZZLERIGHT_POS,
+            3*MUZZLECLIMB_POS,
+            1*MUZZLERIGHT_MAG,
+            0.5*MUZZLECLIMB_MAG
         };
         kickBack[] = {
-            QUOTE(0.1*KICKBACK),
-            QUOTE(0.12*KICKBACK)
+            0.1*KICKBACK,
+            0.12*KICKBACK
         };
-        temporary = QUOTE(0.12*MUZZLETEMP);
+        temporary = 0.12*MUZZLETEMP;
     };
 
     class recoil_mk200: recoil_default {
         muzzleOuter[] = {
-            QUOTE(0.4*MUZZLERIGHT_POS),
-            QUOTE(0.6*MUZZLECLIMB_POS),
-            QUOTE(0.6*MUZZLERIGHT_MAG),
-            QUOTE(0.2*MUZZLECLIMB_MAG)
+            0.4*MUZZLERIGHT_POS,
+            0.6*MUZZLECLIMB_POS,
+            0.6*MUZZLERIGHT_MAG,
+            0.2*MUZZLECLIMB_MAG
         };
         kickBack[] = {
-            QUOTE(0.03*KICKBACK),
-            QUOTE(0.06*KICKBACK)
+            0.03*KICKBACK,
+            0.06*KICKBACK
         };
-        temporary = QUOTE(0.01*MUZZLETEMP); //0.005*MUZZLETEMP;
+        temporary = 0.01*MUZZLETEMP; //0.005*MUZZLETEMP;
     };
 
     class recoil_zafir: recoil_default {
         muzzleOuter[] = {
-            QUOTE(0.5*MUZZLERIGHT_POS),
-            QUOTE(1*MUZZLECLIMB_POS),
-            QUOTE(0.7*MUZZLERIGHT_MAG),
-            QUOTE(0.3*MUZZLECLIMB_MAG)
+            0.5*MUZZLERIGHT_POS,
+            1*MUZZLECLIMB_POS,
+            0.7*MUZZLERIGHT_MAG,
+            0.3*MUZZLECLIMB_MAG
         };
         kickBack[] = {
-            QUOTE(0.02*KICKBACK),
-            QUOTE(0.08*KICKBACK)
+            0.02*KICKBACK,
+            0.08*KICKBACK
         };
-        temporary = QUOTE(0.01*MUZZLETEMP); //0.005*MUZZLETEMP;
+        temporary = 0.01*MUZZLETEMP; //0.005*MUZZLETEMP;
     };
 
     class recoil_m320: recoil_default {
         muzzleOuter[] = {
-            QUOTE(1*MUZZLERIGHT_POS),
-            QUOTE(3*MUZZLECLIMB_POS),
-            QUOTE(0.5*MUZZLERIGHT_MAG),
-            QUOTE(0.6*MUZZLECLIMB_MAG)
+            1*MUZZLERIGHT_POS,
+            3*MUZZLECLIMB_POS,
+            0.5*MUZZLERIGHT_MAG,
+            0.6*MUZZLECLIMB_MAG
         };
         kickBack[] = {
-            QUOTE(0.08*KICKBACK),
-            QUOTE(0.1*KICKBACK)
+            0.08*KICKBACK,
+            0.1*KICKBACK
         };
-        temporary = QUOTE(0.02*MUZZLETEMP);
+        temporary = 0.02*MUZZLETEMP;
     };
 
     class recoil_gm6: recoil_default {
         muzzleOuter[] = {
-            QUOTE(1.4*MUZZLERIGHT_POS),
-            QUOTE(3.5*MUZZLECLIMB_POS),
-            QUOTE(0.7*MUZZLERIGHT_MAG),
-            QUOTE(0.8*MUZZLECLIMB_MAG)
+            1.4*MUZZLERIGHT_POS,
+            3.5*MUZZLECLIMB_POS,
+            0.7*MUZZLERIGHT_MAG,
+            0.8*MUZZLECLIMB_MAG
         };
         kickBack[] = {
-            QUOTE(0.1*KICKBACK),
-            QUOTE(0.12*KICKBACK)
+            0.1*KICKBACK,
+            0.12*KICKBACK
         };
-        temporary = QUOTE(0.025*MUZZLETEMP);
+        temporary = 0.025*MUZZLETEMP;
     };
 
     class recoil_ebr: recoil_default {
         muzzleOuter[] = {
-            QUOTE(0.4*MUZZLERIGHT_POS),
-            QUOTE(1.5*MUZZLECLIMB_POS),
-            QUOTE(0.6*MUZZLERIGHT_MAG),
-            QUOTE(0.4*MUZZLECLIMB_MAG)
+            0.4*MUZZLERIGHT_POS,
+            1.5*MUZZLECLIMB_POS,
+            0.6*MUZZLERIGHT_MAG,
+            0.4*MUZZLECLIMB_MAG
         };
         kickBack[] = {
-            QUOTE(0.04*KICKBACK),
-            QUOTE(0.07*KICKBACK)
+            0.04*KICKBACK,
+            0.07*KICKBACK
         };
-        temporary = QUOTE(0.01*MUZZLETEMP);
+        temporary = 0.01*MUZZLETEMP;
     };
 
     class recoil_dmr_01: recoil_default {
         muzzleOuter[] = {
-            QUOTE(0.5*MUZZLERIGHT_POS),
-            QUOTE(2*MUZZLECLIMB_POS),
-            QUOTE(0.5*MUZZLERIGHT_MAG),
-            QUOTE(0.5*MUZZLECLIMB_MAG)
+            0.5*MUZZLERIGHT_POS,
+            2*MUZZLECLIMB_POS,
+            0.5*MUZZLERIGHT_MAG,
+            0.5*MUZZLECLIMB_MAG
         };
         kickBack[] = {
-            QUOTE(0.03*KICKBACK),
-            QUOTE(0.08*KICKBACK)
+            0.03*KICKBACK,
+            0.08*KICKBACK
         };
-        temporary = QUOTE(0.015*MUZZLETEMP);
+        temporary = 0.015*MUZZLETEMP;
     };
 
     class recoil_dmr_02: recoil_default {
         muzzleOuter[] = {
-            QUOTE(0.5*MUZZLERIGHT_POS),
-            QUOTE(2.5*MUZZLECLIMB_POS),
-            QUOTE(0.6*MUZZLERIGHT_MAG),
-            QUOTE(0.5*MUZZLECLIMB_MAG)
+            0.5*MUZZLERIGHT_POS,
+            2.5*MUZZLECLIMB_POS,
+            0.6*MUZZLERIGHT_MAG,
+            0.5*MUZZLECLIMB_MAG
         };
         kickBack[] = {
-            QUOTE(0.06*KICKBACK),
-            QUOTE(0.08*KICKBACK)
+            0.06*KICKBACK,
+            0.08*KICKBACK
         };
-        temporary = QUOTE(0.01*MUZZLETEMP);
+        temporary = 0.01*MUZZLETEMP;
     };
 
     class recoil_dmr_03: recoil_default {
         muzzleOuter[] = {
-            QUOTE(0.3*MUZZLERIGHT_POS),
-            QUOTE(1.5*MUZZLECLIMB_POS),
-            QUOTE(0.5*MUZZLERIGHT_MAG),
-            QUOTE(0.4*MUZZLECLIMB_MAG)
+            0.3*MUZZLERIGHT_POS,
+            1.5*MUZZLECLIMB_POS,
+            0.5*MUZZLERIGHT_MAG,
+            0.4*MUZZLECLIMB_MAG
         };
         kickBack[] = {
-            QUOTE(0.03*KICKBACK),
-            QUOTE(0.06*KICKBACK)
+            0.03*KICKBACK,
+            0.06*KICKBACK
         };
-        temporary = QUOTE(0.005*MUZZLETEMP);
+        temporary = 0.005*MUZZLETEMP;
     };
 
     class recoil_dmr_04: recoil_default {
         muzzleOuter[] = {
-            QUOTE(0.4*MUZZLERIGHT_POS),
-            QUOTE(1.5*MUZZLECLIMB_POS),
-            QUOTE(0.5*MUZZLERIGHT_MAG),
-            QUOTE(0.4*MUZZLECLIMB_MAG)
+            0.4*MUZZLERIGHT_POS,
+            1.5*MUZZLECLIMB_POS,
+            0.5*MUZZLERIGHT_MAG,
+            0.4*MUZZLECLIMB_MAG
         };
         kickBack[] = {
-            QUOTE(0.02*KICKBACK),
-            QUOTE(0.04*KICKBACK)
+            0.02*KICKBACK,
+            0.04*KICKBACK
         };
-        temporary = QUOTE(0.015*MUZZLETEMP);
+        temporary = 0.015*MUZZLETEMP;
     };
 
     class recoil_dmr_05: recoil_default {
         muzzleOuter[] = {
-            QUOTE(0.5*MUZZLERIGHT_POS),
-            QUOTE(2.5*MUZZLECLIMB_POS),
-            QUOTE(0.8*MUZZLERIGHT_MAG),
-            QUOTE(0.6*MUZZLECLIMB_MAG)
+            0.5*MUZZLERIGHT_POS,
+            2.5*MUZZLECLIMB_POS,
+            0.8*MUZZLERIGHT_MAG,
+            0.6*MUZZLECLIMB_MAG
         };
         kickBack[] = {
-            QUOTE(0.08*KICKBACK),
-            QUOTE(0.1*KICKBACK)
+            0.08*KICKBACK,
+            0.1*KICKBACK
         };
-        temporary = QUOTE(0.01*MUZZLETEMP);
+        temporary = 0.01*MUZZLETEMP;
     };
 
     class recoil_dmr_06: recoil_default {
         muzzleOuter[] = {
-            QUOTE(0.5*MUZZLERIGHT_POS),
-            QUOTE(2*MUZZLECLIMB_POS),
-            QUOTE(0.7*MUZZLERIGHT_MAG),
-            QUOTE(0.5*MUZZLECLIMB_MAG)
+            0.5*MUZZLERIGHT_POS,
+            2*MUZZLECLIMB_POS,
+            0.7*MUZZLERIGHT_MAG,
+            0.5*MUZZLECLIMB_MAG
         };
         kickBack[] = {
-            QUOTE(0.05*KICKBACK),
-            QUOTE(0.1*KICKBACK)
+            0.05*KICKBACK,
+            0.1*KICKBACK
         };
-        temporary = QUOTE(0.01*MUZZLETEMP);
+        temporary = 0.01*MUZZLETEMP;
     };
 
     class recoil_mmg_01: recoil_default {
         muzzleOuter[] = {
-            QUOTE(0.6*MUZZLERIGHT_POS),
-            QUOTE(1.5*MUZZLECLIMB_POS),
-            QUOTE(0.8*MUZZLERIGHT_MAG),
-            QUOTE(0.3*MUZZLECLIMB_MAG)
+            0.6*MUZZLERIGHT_POS,
+            1.5*MUZZLECLIMB_POS,
+            0.8*MUZZLERIGHT_MAG,
+            0.3*MUZZLECLIMB_MAG
         };
         kickBack[] = {
-            QUOTE(0.02*KICKBACK),
-            QUOTE(0.08*KICKBACK)
+            0.02*KICKBACK,
+            0.08*KICKBACK
         };
-        temporary = QUOTE(0.01*MUZZLETEMP); //0.005*MUZZLETEMP;
+        temporary = 0.01*MUZZLETEMP; //0.005*MUZZLETEMP;
     };
 
     class recoil_mmg_02: recoil_default {
         muzzleOuter[] = {
-            QUOTE(0.5*MUZZLERIGHT_POS),
-            QUOTE(1.5*MUZZLECLIMB_POS),
-            QUOTE(0.6*MUZZLERIGHT_MAG),
-            QUOTE(0.4*MUZZLECLIMB_MAG)
+            0.5*MUZZLERIGHT_POS,
+            1.5*MUZZLECLIMB_POS,
+            0.6*MUZZLERIGHT_MAG,
+            0.4*MUZZLECLIMB_MAG
         };
         kickBack[] = {
-            QUOTE(0.04*KICKBACK),
-            QUOTE(0.08*KICKBACK)
+            0.04*KICKBACK,
+            0.08*KICKBACK
         };
-        temporary = QUOTE(0.01*MUZZLETEMP); //0.005*MUZZLETEMP;
+        temporary = 0.01*MUZZLETEMP; //0.005*MUZZLETEMP;
     };
 };
diff --git a/addons/recoil/XEH_PREP.hpp b/addons/recoil/XEH_PREP.hpp
index 9e34c47492..90c7c9cccf 100644
--- a/addons/recoil/XEH_PREP.hpp
+++ b/addons/recoil/XEH_PREP.hpp
@@ -1,2 +1 @@
-
 PREP(camshake);
diff --git a/addons/recoil/XEH_preInit.sqf b/addons/recoil/XEH_preInit.sqf
index ffd1bfc414..1566a79fd4 100644
--- a/addons/recoil/XEH_preInit.sqf
+++ b/addons/recoil/XEH_preInit.sqf
@@ -7,4 +7,6 @@ PREP_RECOMPILE_START;
 #include "XEH_PREP.hpp"
 PREP_RECOMPILE_END;
 
+GVAR(recoilCache) = createHashMap;
+
 ADDON = true;
diff --git a/addons/recoil/functions/fnc_camshake.sqf b/addons/recoil/functions/fnc_camshake.sqf
index d68da81db7..9c6e78608f 100644
--- a/addons/recoil/functions/fnc_camshake.sqf
+++ b/addons/recoil/functions/fnc_camshake.sqf
@@ -1,17 +1,17 @@
 #include "..\script_component.hpp"
 /*
- * Author: Orginal by Ryan Schultz, edited by KoffeinFlummi, commy2
+ * Author: Original by Ryan Schultz, edited by KoffeinFlummi, commy2
  * Adds camera shake when firing. Called from the unified fired EH only for the local player.
  * From TMR: Small Arms
  *
  * Arguments:
- * None. Parameters inherited from EFUNC(common,firedEH)
+ * Parameters inherited from EFUNC(common,firedEH)
  *
  * Return Value:
  * None
  *
  * Example:
- * [player, (currentWeapon player), (currentMuzzle player)] call ace_recoil_fnc_camshake;
+ * [player, currentWeapon player, currentMuzzle player] call ace_recoil_fnc_camshake
  *
  * Public: No
  */
@@ -28,20 +28,19 @@ if (toLowerANSI _weapon in ["throw", "put"]) exitWith {};
 
 private _powerMod = ([0, -0.1, -0.1, 0, -0.2] select (["STAND", "CROUCH", "PRONE", "UNDEFINED", ""] find stance _unit)) + ([0, -1, 0, -1] select (["INTERNAL", "EXTERNAL", "GUNNER", "GROUP"] find cameraView));
 
-// to get camshake read kickback
-private _recoil = missionNamespace getVariable format [QGVAR(%1-%2), _weapon, _muzzle];
-
-if (isNil "_recoil") then {
+// Get camshake read kickback
+private _recoil = GVAR(recoilCache) getOrDefaultCall [_weapon + _muzzle, {
     private _config = configFile >> "CfgWeapons" >> _weapon;
 
-    if (_muzzle == _weapon) then {
-        _recoil = getText (_config >> "recoil")
+    private _recoil = if (_muzzle == _weapon) then {
+        getText (_config >> "recoil")
     } else {
-        _recoil = getText (_config >> _muzzle >> "recoil")
+        getText (_config >> _muzzle >> "recoil")
     };
 
     if (isClass (configFile >> "CfgRecoils" >> _recoil)) then {
         _recoil = getArray (configFile >> "CfgRecoils" >> _recoil >> "kickBack");
+
         if (count _recoil < 2) then {
             _recoil = [0, 0];
         };
@@ -51,17 +50,20 @@ if (isNil "_recoil") then {
 
     TRACE_3("Caching Recoil config",_weapon,_muzzle,_recoil);
 
-    // parse numbers
-    _recoil set [0, call compile format ["%1", _recoil select 0]];
-    _recoil set [1, call compile format ["%1", _recoil select 1]];
+    // Ensure format is correct
+    _recoil resize [2, 0];
 
-    missionNamespace setVariable [format [QGVAR(%1-%2), _weapon, _muzzle], _recoil];
-};
+    // Parse numbers
+    _recoil apply { if (_x isEqualType 0) then { _x } else { call compile format ["%1", _x] } } // return
+}, true];
 
 private _powerCoef = RECOIL_COEF * linearConversion [0, 1, random 1, _recoil select 0, _recoil select 1, false];
 
 if (isWeaponRested _unit) then {_powerMod = _powerMod - 0.07};
 if (isWeaponDeployed _unit) then {_powerMod = _powerMod - 0.11};
+if (_weapon isEqualTo secondaryWeapon _unit) then {
+    _powerCoef = _powerCoef + 25.0;
+};
 
 private _camshake = [
     _powerCoef * (BASE_POWER + _powerMod) max 0,
diff --git a/addons/refuel/CfgVehicles.hpp b/addons/refuel/CfgVehicles.hpp
index 44575a141d..dbbcaf04d1 100644
--- a/addons/refuel/CfgVehicles.hpp
+++ b/addons/refuel/CfgVehicles.hpp
@@ -238,6 +238,20 @@ class CfgVehicles {
         // Patria = LAV
         GVAR(fuelCapacity) = 269;
     };
+    class APC_Wheeled_02_base_F: Wheeled_APC_F {
+        class EGVAR(interaction,anims);
+    };
+    class APC_Wheeled_02_base_v2_F: APC_Wheeled_02_base_F {
+        class EGVAR(interaction,anims): EGVAR(interaction,anims) {
+            class showCanisters {
+                phase = 0;
+                positions[] = {{-1.188, -3.87, -0.769}, {1.638, -3.87, -0.769}};
+                items[] = {"Land_CanisterFuel_F", "Land_CanisterFuel_F", "Land_CanisterFuel_F", "Land_CanisterFuel_F"};
+                name = CSTRING(TakeFuelCanister);
+                text = CSTRING(TakeFuelCanisterAction);
+            };
+        };
+    };
 
     class Truck_F: Car_F {
         GVAR(fuelCapacity) = 400;
@@ -308,12 +322,14 @@ class CfgVehicles {
     class MBT_01_base_F: Tank_F {
         // Merkava IV
         GVAR(fuelCapacity) = 1400;
+        class EGVAR(interaction,anims);
     };
 
     class MBT_02_base_F: Tank_F {
         // T100 Black Eagle
         // Assuming T80
         GVAR(fuelCapacity) = 1100;
+        class EGVAR(interaction,anims);
     };
 
     class MBT_03_base_F: Tank_F {
@@ -324,11 +340,37 @@ class CfgVehicles {
     class MBT_01_arty_base_F: MBT_01_base_F {
         // Assuming similar 2S3
         GVAR(fuelCapacity) = 830;
+
+        class EGVAR(interaction,anims): EGVAR(interaction,anims) {
+            class showCanisters {
+                phase = 0;
+                // Rotate interactions with turret rotation
+                positions[] = {
+                    "[0, -2.5, 0] vectorAdd ([[1.6, -2.4, -0.3], [0, 0, 1], deg (_target animationPhase 'MainTurret')] call CBA_fnc_vectRotate3D)",
+                    "[0, -2.5, 0] vectorAdd ([[1.8, 0.55, -0.7], [0, 0, 1], deg (_target animationPhase 'MainTurret')] call CBA_fnc_vectRotate3D)",
+                    "[0, -2.5, 0] vectorAdd ([[-1.8, 0.55, -0.7], [0, 0, 1], deg (_target animationPhase 'MainTurret')] call CBA_fnc_vectRotate3D)"
+                };
+                items[] = {"Land_CanisterFuel_F", "Land_CanisterFuel_F", "Land_CanisterFuel_F", "Land_CanisterFuel_F", "Land_CanisterFuel_F", "Land_CanisterFuel_F", "Land_CanisterFuel_F"};
+                name = CSTRING(TakeFuelCanister);
+                text = CSTRING(TakeFuelCanisterAction);
+            };
+        };
     };
 
     class MBT_02_arty_base_F: MBT_02_base_F {
         // Assuming similar 2S3
         GVAR(fuelCapacity) = 830;
+
+        class EGVAR(interaction,anims): EGVAR(interaction,anims) {
+            class showCanisters {
+                phase = 0;
+                // Rotate interactions with turret rotation
+                positions[] = {"[0, -2.1, 0] vectorAdd ([[1.6, -2.65, -0.3], [0, 0, 1], deg (_target animationPhase 'MainTurret')] call CBA_fnc_vectRotate3D)"};
+                items[] = {"Land_CanisterFuel_F"};
+                name = CSTRING(TakeFuelCanister);
+                text = CSTRING(TakeFuelCanisterAction);
+            };
+        };
     };
 
     class Heli_Light_02_base_F: Helicopter_Base_H {
diff --git a/addons/refuel/XEH_postInit.sqf b/addons/refuel/XEH_postInit.sqf
index f6f5a7d7b3..d007266e5f 100644
--- a/addons/refuel/XEH_postInit.sqf
+++ b/addons/refuel/XEH_postInit.sqf
@@ -49,7 +49,6 @@
         private _halfWorldSize = worldSize / 2;
         private _worldCenter = [_halfWorldSize, _halfWorldSize];
         _halfWorldSize = _halfWorldSize * sqrt 2;
-        private _refuelMissionObjects = allMissionObjects "" select {getFuelCargo _x > 0};
         private _baseStaticClasses = keys (uiNamespace getVariable QGVAR(cacheRefuelClassesBaseStatic));
 
         {
diff --git a/addons/reload/stringtable.xml b/addons/reload/stringtable.xml
index 2c4bbcab76..ec860ff46a 100644
--- a/addons/reload/stringtable.xml
+++ b/addons/reload/stringtable.xml
@@ -38,7 +38,7 @@
             <Polish>Zawsze pokazuj interakcję od sprawdzania amunicji</Polish>
             <Italian>Mostra sempre l'autointerazione di controllo delle munizioni</Italian>
             <Czech>Vždy zobrazit kontrolu munice v menu vlastní interakce</Czech>
-            <Japanese>セルフ インタラクションへ弾薬確認を常に表示</Japanese>
+            <Japanese>弾薬確認アクションを常に表示</Japanese>
             <Chinese>總是在自我互動中顯示檢查彈藥動作</Chinese>
             <Chinesesimp>总是在自我互动中显示检查弹药动作</Chinesesimp>
             <French>Toujours afficher l'action de vérification des munitions</French>
@@ -53,7 +53,7 @@
             <Polish>Pokazuje interakcję od sprawdzania amunicji poza bronią statyczną.</Polish>
             <Italian>Mostra l'autointerazione di controllo delle munizioni anche quando non si è in un'arma statica.</Italian>
             <Czech>Zobrazuje kontrolu munice v menu vlastní interakce i pokud hráč nepoužívá statickou zbraň.</Czech>
-            <Japanese>設置型火器を使っていなくても、セルフ インタラクションへ弾薬確認を常に表示します。</Japanese>
+            <Japanese>設置型火器以外でも常にセルフ・インタラクションに弾薬確認アクションを表示します。</Japanese>
             <Chinese>即使不是固定式支援武器也依然在自我互動中顯示檢查彈藥動作</Chinese>
             <Chinesesimp>即使不是固定式支援武器也依然在自我互动中显示检查弹药动作</Chinesesimp>
             <French>Permet d'afficher l'action de vérification des munitions du menu d'interaction personnel, même si le joueur n'utilise pas d'arme statique.</French>
@@ -107,7 +107,7 @@
             <German>Gurt anhängen</German>
             <Hungarian>Töltényheveder összekötése</Hungarian>
             <Italian>Combina nastro</Italian>
-            <Portuguese>Ligar cintos de munição</Portuguese>
+            <Portuguese>Conectar cintos de munição</Portuguese>
             <Japanese>ベルトを繋げる</Japanese>
             <Korean>탄띠 연결</Korean>
             <Chinesesimp>连接弹链</Chinesesimp>
@@ -123,7 +123,7 @@
             <German>Gurt anhängen...</German>
             <Hungarian>Töltényheveder összekötése folyamatban...</Hungarian>
             <Italian>Combinando nastro...</Italian>
-            <Portuguese>Ligando cintos...</Portuguese>
+            <Portuguese>Conectando cintos...</Portuguese>
             <Japanese>ベルトを繋げています・・・</Japanese>
             <Korean>탄띠 연결 중...</Korean>
             <Chinesesimp>正在连接弹链...</Chinesesimp>
@@ -139,6 +139,7 @@
             <Korean>탄띠가 연결되었습니다</Korean>
             <Russian>Ремень был пристегнут</Russian>
             <Spanish>Cinta enganchada</Spanish>
+            <Portuguese>Cinto conectado</Portuguese>
         </Key>
         <Key ID="STR_ACE_Reload_BeltNotLinked">
             <English>Belt could not be linked</English>
@@ -150,6 +151,7 @@
             <Korean>탄띠를 연결할 수 없습니다</Korean>
             <Russian>Ремень не удалось пристегнуть</Russian>
             <Spanish>La cinta no ha podido ser enganchada</Spanish>
+            <Portuguese>Cinto não pôde ser conectado</Portuguese>
         </Key>
     </Package>
 </Project>
diff --git a/addons/reloadlaunchers/stringtable.xml b/addons/reloadlaunchers/stringtable.xml
index b55ccde170..6324a97b55 100644
--- a/addons/reloadlaunchers/stringtable.xml
+++ b/addons/reloadlaunchers/stringtable.xml
@@ -11,6 +11,7 @@
             <French>Affichage de notifications lors d'une rechargement par un ami</French>
             <Russian>Отображает уведомления о загрузке помощника</Russian>
             <Spanish>Mostrar notificaciones para recarga de compañero</Spanish>
+            <Portuguese>Mostrar notificações para Carregamento de Companheiro</Portuguese>
         </Key>
         <Key ID="STR_ACE_ReloadLaunchers_SettingDisplayStatusTextDesc">
             <English>Displays notifications when an assistant loads a gunner's launcher.</English>
@@ -22,6 +23,7 @@
             <French>Affiche une notofication lorsqu'un assistant recharge l'arme du tireur.</French>
             <Russian>Отображает уведомления, когда помощник загружает пусковую установку стрелка.</Russian>
             <Spanish>Mostrar notificaciones cuando un asistente recarga el lanzador del tirador.</Spanish>
+            <Portuguese>Notifica quando um assistente carrega o lançador do atirador</Portuguese>
         </Key>
         <Key ID="STR_ACE_ReloadLaunchers_LoadLauncher">
             <English>Load launcher</English>
@@ -50,6 +52,7 @@
             <Korean>%1이(가) 당신의 발사기를 장전했습니다.</Korean>
             <Russian>%1 загружает Вашу установку</Russian>
             <Spanish>%1 está cargando tu lanzador</Spanish>
+            <Portuguese>%1 está carregando seu lançador</Portuguese>
         </Key>
         <Key ID="STR_ACE_ReloadLaunchers_LoadingAborted">
             <English>%1 stopped loading your launcher</English>
@@ -61,6 +64,7 @@
             <Korean>%1이(가) 당신의 발사기 장전을 멈췄습니다.</Korean>
             <Russian>%1 прекратил загружать Вашу установку</Russian>
             <Spanish>%1 paró de cargar tu lanzador</Spanish>
+            <Portuguese>%1 parou de carregar seu lançador</Portuguese>
         </Key>
         <Key ID="STR_ACE_ReloadLaunchers_LoadingLauncher">
             <English>Loading launcher...</English>
@@ -123,6 +127,7 @@
             <Korean>발사기를 장전할 수 없습니다.</Korean>
             <Russian>Не удалось загрузить пусковую установку</Russian>
             <Spanish>El lanzador no ha podido ser cargado</Spanish>
+            <Portuguese>O lançador não pôde ser carregado</Portuguese>
         </Key>
         <Key ID="STR_ACE_ReloadLaunchers_featureDescription">
             <English>Buddy Loading</English>
@@ -134,6 +139,7 @@
             <Japanese>バディローディング</Japanese>
             <Russian>Перезарядка помощником</Russian>
             <Spanish>Cargado de Compañero</Spanish>
+            <Portuguese>Carregamento de Companheiro</Portuguese>
         </Key>
     </Package>
 </Project>
diff --git a/addons/repair/CfgVehicles.hpp b/addons/repair/CfgVehicles.hpp
index ce74737b76..6172b72679 100644
--- a/addons/repair/CfgVehicles.hpp
+++ b/addons/repair/CfgVehicles.hpp
@@ -429,9 +429,33 @@ class CfgVehicles {
         GVAR(hitpointPositions)[] = {{"HitTurret", {0,-2,0}}};
     };
 
+    class Tank_F;
+    class APC_Tracked_02_base_F: Tank_F {
+        class EGVAR(interaction,anims) {
+            class showTracks {
+                phase = 0;
+                positions[] = {{-1.7, -3.875, -0.7}, {1.7, -3.875, -0.7}};
+                items[] = {"ACE_Track", "ACE_Track", "ACE_Track"};
+                name = CSTRING(RemoveTrack);
+                text = CSTRING(RemovingTrack);
+            };
+        };
+    };
+
     class Car_F: Car {
         class HitPoints;
     };
+    class Offroad_02_base_F: Car_F {
+        class EGVAR(interaction,anims) {
+            class hideSpareWheel {
+                selections[] = {"spare_wheel"};
+                items[] = {"ACE_Wheel"};
+                name = CSTRING(RemoveWheel);
+                text = CSTRING(RemovingWheel);
+            };
+        };
+    };
+
     class Truck_F: Car_F {
         class HitPoints: HitPoints {
             class HitLBWheel;
@@ -449,10 +473,43 @@ class CfgVehicles {
         };
     };
 
+    class Truck_01_viv_base_F;
+    class Truck_01_cargo_base_F: Truck_01_viv_base_F {
+        class EGVAR(interaction,anims) {
+            class Tyre1_hide {
+                selections[] = {"tyre1_hide"};
+                items[] = {"ACE_Wheel"};
+                name = CSTRING(RemoveWheel);
+                text = CSTRING(RemovingWheel);
+            };
+        };
+    };
+    class Truck_01_flatbed_base_F: Truck_01_viv_base_F {
+        class EGVAR(interaction,anims) {
+            class Tyre1_hide {
+                selections[] = {"tyre1_hide"};
+                items[] = {"ACE_Wheel"};
+                name = CSTRING(RemoveWheel);
+                text = CSTRING(RemovingWheel);
+            };
+        };
+    };
+
     class Quadbike_01_base_F: Car_F {
         GVAR(hitpointPositions)[] = { {"HitEngine", {0, 0.5, -0.7}}, {"HitFuel", {0, 0, -0.5}} };
     };
     class Hatchback_01_base_F: Car_F {
         GVAR(hitpointPositions)[] = {{"HitBody", {0, 0.7, -0.5}}, {"HitFuel", {0, -1.75, -0.75}}};
     };
+
+    class Van_02_base_F: Truck_F {
+        class EGVAR(interaction,anims) {
+            class spare_tyre_hide {
+                positions[] = {"[[-1.2, -3.7, -0.4], [-0.45, -3.5, -0.4]] select (_target animationPhase 'Door_4_source' == 0)"};
+                items[] = {"ACE_Wheel"};
+                name = CSTRING(RemoveWheel);
+                text = CSTRING(RemovingWheel);
+            };
+        };
+    };
 };
diff --git a/addons/repair/XEH_PREP.hpp b/addons/repair/XEH_PREP.hpp
index 186ec0b310..16e11b7476 100644
--- a/addons/repair/XEH_PREP.hpp
+++ b/addons/repair/XEH_PREP.hpp
@@ -25,7 +25,6 @@ PREP(getSelectionsToIgnore);
 PREP(getPatchWheelTime);
 PREP(getPostRepairDamage);
 PREP(getRepairItems);
-PREP(getWheelHitPointsWithSelections);
 PREP(hasItems);
 PREP(isEngineer);
 PREP(isInRepairFacility);
diff --git a/addons/repair/dev/draw_showRepairInfo.sqf b/addons/repair/dev/draw_showRepairInfo.sqf
index 20bf748e7f..182b2f7a08 100644
--- a/addons/repair/dev/draw_showRepairInfo.sqf
+++ b/addons/repair/dev/draw_showRepairInfo.sqf
@@ -4,6 +4,7 @@
 #include "..\script_component.hpp"
 
 addMissionEventHandler ["Draw3D", {
+    if (isGamePaused) exitWith {};
     if !((cursorObject isKindOf "Car") || (cursorObject isKindOf "Tank") || (cursorObject isKindOf "Air")) exitWith {};
     private _config = configOf cursorObject;
 
@@ -11,7 +12,7 @@ addMissionEventHandler ["Draw3D", {
     private _hitpointGroups = getArray (_config >> QGVAR(hitpointGroups));
 
     (getAllHitPointsDamage cursorObject) params [["_hitPoints", []], ["_hitSelections", []]];
-    ([cursorObject] call FUNC(getWheelHitPointsWithSelections)) params ["_wheelHitPoints", "_wheelHitSelections"];
+    ([cursorObject] call EFUNC(common,getWheelHitPointsWithSelections)) params ["_wheelHitPoints", "_wheelHitSelections"];
 
     private _output = [];
 
@@ -28,7 +29,7 @@ addMissionEventHandler ["Draw3D", {
                 _info = _info + "[Wheel]";
                 _color = [0,1,0,1];
             };
-            if (!((getText (_config>> "HitPoints" >> _hitpoint >> "depends")) in ["", "0"])) then {
+            if !((getText (_config>> "HitPoints" >> _hitpoint >> "depends")) in ["", "0"]) then {
                 _info = _info + format ["[depends: %1]", getText (_config>> "HitPoints" >> _hitpoint >> "depends")];
                 _color = [0,0,1,1]
             };
diff --git a/addons/repair/functions/fnc_addRepairActions.sqf b/addons/repair/functions/fnc_addRepairActions.sqf
index 9dad1ecc31..16711d7b8a 100644
--- a/addons/repair/functions/fnc_addRepairActions.sqf
+++ b/addons/repair/functions/fnc_addRepairActions.sqf
@@ -37,7 +37,7 @@ private _selectionsToIgnore = _vehicle call FUNC(getSelectionsToIgnore);
 (getAllHitPointsDamage _vehicle) params [["_hitPoints", []], ["_hitSelections", []]];  // Since 1.82 these are all lower case
 
 // get hitpoints of wheels with their selections
-([_vehicle] call FUNC(getWheelHitPointsWithSelections)) params ["_wheelHitPoints", "_wheelHitSelections"];
+([_vehicle] call EFUNC(common,getWheelHitPointsWithSelections)) params ["_wheelHitPoints", "_wheelHitSelections"];
 
 private _hitPointsAddedNames = [];
 private _hitPointsAddedStrings = [];
diff --git a/addons/repair/functions/fnc_canRepair.sqf b/addons/repair/functions/fnc_canRepair.sqf
index f1f4aa7b7c..ff61450b12 100644
--- a/addons/repair/functions/fnc_canRepair.sqf
+++ b/addons/repair/functions/fnc_canRepair.sqf
@@ -65,7 +65,7 @@ if (!_return) exitWith {false};
 // if (_vehicleStateCondition == 1 && {!([_target] call FUNC(isInStableCondition))}) exitWith {false};
 
 private _repairLocations = getArray (_config >> "repairLocations");
-if (!("All" in _repairLocations)) then {
+if !("All" in _repairLocations) then {
     private _repairFacility = {([_caller] call FUNC(isInRepairFacility)) || ([_target] call FUNC(isInRepairFacility))};
     private _repairVeh = {([_caller] call FUNC(isNearRepairVehicle)) || ([_target] call FUNC(isNearRepairVehicle))};
     {
diff --git a/addons/repair/functions/fnc_getSelectionsToIgnore.sqf b/addons/repair/functions/fnc_getSelectionsToIgnore.sqf
index 08ca639a20..455b58c040 100644
--- a/addons/repair/functions/fnc_getSelectionsToIgnore.sqf
+++ b/addons/repair/functions/fnc_getSelectionsToIgnore.sqf
@@ -28,7 +28,7 @@ private _turretPaths = ((fullCrew [_vehicle, "gunner", true]) + (fullCrew [_vehi
 
 (getAllHitPointsDamage _vehicle) params [["_hitPoints", []], ["_hitSelections", []]];
 // get hitpoints of wheels with their selections
-([_vehicle] call FUNC(getWheelHitPointsWithSelections)) params ["_wheelHitPoints", "_wheelHitSelections"];
+([_vehicle] call EFUNC(common,getWheelHitPointsWithSelections)) params ["_wheelHitPoints", "_wheelHitSelections"];
 
 private _indexesToIgnore = [];
 private _processedSelections = [];
@@ -117,7 +117,7 @@ private _processedSelections = [];
         continue
     };
 
-    if (!(getText (_vehCfg >> "HitPoints" >> _hitpoint >> "depends") in ["", "0"])) then { // skip depends hitpoints, should be normalized by engine
+    if !(getText (_vehCfg >> "HitPoints" >> _hitpoint >> "depends") in ["", "0"]) then { // skip depends hitpoints, should be normalized by engine
         TRACE_3("Skipping depends hitpoint",_hitpoint,_forEachIndex,_selection);
         /*#ifdef DEBUG_MODE_FULL
         systemChat format ["Skipping depends hitpoint, hitpoint %1, index %2, selection %3", _hitpoint, _forEachIndex, _selection];
diff --git a/addons/repair/functions/fnc_getWheelHitPointsWithSelections.sqf b/addons/repair/functions/fnc_getWheelHitPointsWithSelections.sqf
deleted file mode 100644
index 5d655887c6..0000000000
--- a/addons/repair/functions/fnc_getWheelHitPointsWithSelections.sqf
+++ /dev/null
@@ -1,97 +0,0 @@
-#include "..\script_component.hpp"
-/*
- * Author: commy2
- * Returns the wheel hitpoints and their selections.
- *
- * Arguments:
- * 0: Vehicle <OBJECT>
- *
- * Return Value:
- * 0: Wheel hitpoints <ARRAY>
- * 1: Wheel hitpoint selections in model coordinates <ARRAY>
- *
- * Example:
- * [car1] call ace_repair_fnc_getWheelHitPointsWithSelections
- *
- * Public: No
- */
-
-params ["_vehicle"];
-TRACE_1("params",_vehicle);
-
-// get the vehicles wheel config
-private _wheels = configOf _vehicle >> "Wheels";
-
-// exit with nothing if the vehicle has no wheels class
-if !(isClass _wheels) exitWith {TRACE_1("No Wheels",_wheels); [[],[]]};
-
-// get all hitpoints and selections
-(getAllHitPointsDamage _vehicle) params ["_hitPoints", "_hitPointSelections"];
-
-// get all wheels and read selections from config
-_wheels = "true" configClasses _wheels;
-
-private _wheelHitPoints = [];
-private _wheelHitPointSelections = [];
-
-{
-    private _wheelName = configName _x;
-    private _wheelCenter = getText (_x >> "center");
-    private _wheelBone = getText (_x >> "boneName");
-    private _wheelBoneNameResized = _wheelBone select [0, 9]; //ount "wheel_X_Y"; // this is a requirement for physx. Should work for all addon vehicles.
-
-    TRACE_4("",_wheelName,_wheelCenter,_wheelBone,_wheelBoneNameResized);
-
-    private _wheelHitPoint = "";
-    private _wheelHitPointSelection = "";
-
-    //Commy's orginal method
-    {
-        if ((_wheelBoneNameResized != "") && {_x find _wheelBoneNameResized == 0}) exitWith {  // same as above. Requirement for physx.
-            _wheelHitPoint = _hitPoints select _forEachIndex;
-            _wheelHitPointSelection = _hitPointSelections select _forEachIndex;
-            TRACE_2("wheel found [Orginal]",_wheelName,_wheelHitPoint);
-        };
-    } forEach _hitPointSelections;
-
-
-    if (_vehicle isKindOf "Car") then {
-        //Backup method, search for the closest hitpoint to the wheel's center selection pos.
-        //Ref #2742 - RHS's HMMWV
-        if (_wheelHitPoint == "") then {
-            private _wheelCenterPos = _vehicle selectionPosition _wheelCenter;
-            if (_wheelCenterPos isEqualTo [0,0,0]) exitWith {TRACE_1("no center?",_wheelCenter);};
-
-
-            private _bestDist = 99;
-            private _bestIndex = -1;
-            {
-                if (_x != "") then {
-                     //Filter out things that definitly aren't wheeels (#3759)
-                    if ((toLowerANSI (_hitPoints select _forEachIndex)) in ["hitengine", "hitfuel", "hitbody"]) exitWith {TRACE_1("filter",_x)};
-                    private _xPos = _vehicle selectionPosition _x;
-                    if (_xPos isEqualTo [0,0,0]) exitWith {};
-                    private _xDist = _wheelCenterPos distance _xPos;
-                    if (_xDist < _bestDist) then {
-                        _bestIndex = _forEachIndex;
-                        _bestDist = _xDist;
-                    };
-                };
-            } forEach _hitPointSelections;
-
-            TRACE_2("closestPoint",_bestDist,_bestIndex);
-            if (_bestIndex != -1) then {
-                _wheelHitPoint = _hitPoints select _bestIndex;
-                _wheelHitPointSelection = _hitPointSelections select _bestIndex;
-                TRACE_2("wheel found [Backup]",_wheelName,_wheelHitPoint);
-            };
-        };
-    };
-
-    if ((_wheelHitPoint != "") && {_wheelHitPointSelection != ""}) then {
-        _wheelHitPoints pushBack _wheelHitPoint;
-        _wheelHitPointSelections pushBack _wheelHitPointSelection;
-    };
-} forEach _wheels;
-
-[_wheelHitPoints, _wheelHitPointSelections]
diff --git a/addons/repair/functions/fnc_normalizeHitPoints.sqf b/addons/repair/functions/fnc_normalizeHitPoints.sqf
index 5e61ef8c88..97f34c22db 100644
--- a/addons/repair/functions/fnc_normalizeHitPoints.sqf
+++ b/addons/repair/functions/fnc_normalizeHitPoints.sqf
@@ -33,7 +33,7 @@ private _dependentHitPointScripts = [];
 {
     if ((_x != "") && {isClass (_config >> _x)} && {!(_x in _realHitPoints)}) then {
         _realHitPoints pushBack _x;
-        if (!((getText (_config >> _x >> "depends")) in ["", "0"])) then {
+        if !((getText (_config >> _x >> "depends")) in ["", "0"]) then {
             _dependentHitPoints pushBack _x;
             _dependentHitPointScripts pushBack compile getText (_config >> _x >> "depends");
         };
diff --git a/addons/repair/functions/fnc_repair.sqf b/addons/repair/functions/fnc_repair.sqf
index 86ff191000..ccb2e42dfd 100644
--- a/addons/repair/functions/fnc_repair.sqf
+++ b/addons/repair/functions/fnc_repair.sqf
@@ -70,7 +70,7 @@ if (!_return) exitWith {false};
 // if (_vehicleStateCondition == 1 && {!([_target] call FUNC(isInStableCondition))}) exitWith {false};
 
 private _repairLocations = getArray (_config >> "repairLocations");
-if (!("All" in _repairLocations)) then {
+if !("All" in _repairLocations) then {
     private _repairFacility = {([_caller] call FUNC(isInRepairFacility)) || ([_target] call FUNC(isInRepairFacility))};
     private _repairVeh = {([_caller] call FUNC(isNearRepairVehicle)) || ([_target] call FUNC(isNearRepairVehicle))};
     {
@@ -149,10 +149,15 @@ if (_callbackProgress == "") then {
 // Player Animation
 private _callerAnim = [getText (_config >> "animationCaller"), getText (_config >> "animationCallerProne")] select (stance _caller == "PRONE");
 private _loopAnim = (getNumber (_config >> "loopAnimation")) isEqualTo 1;
-_caller setVariable [QGVAR(selectedWeaponOnrepair), currentWeapon _caller];
+
+private _currentWeapon = currentWeapon _caller;
+
+if (_currentWeapon != "") then {
+    _caller setVariable [QGVAR(selectedWeaponOnrepair), (weaponState _caller) select [0, 3]];
+};
 
 // Cannot use secondairy weapon for animation
-if (currentWeapon _caller == secondaryWeapon _caller) then {
+if (_currentWeapon == secondaryWeapon _caller) then {
     _caller selectWeapon (primaryWeapon _caller);
 };
 
diff --git a/addons/repair/functions/fnc_repair_failure.sqf b/addons/repair/functions/fnc_repair_failure.sqf
index c305c90b6b..37b2c50447 100644
--- a/addons/repair/functions/fnc_repair_failure.sqf
+++ b/addons/repair/functions/fnc_repair_failure.sqf
@@ -38,9 +38,11 @@ if (vehicle _caller == _caller && {!(_caller call EFUNC(common,isSwimming))}) th
 _caller setVariable [QGVAR(repairCurrentAnimCaller), nil];
 _caller setVariable [QGVAR(repairPrevAnimCaller), nil];
 
-private _weaponSelect = (_caller getVariable [QGVAR(selectedWeaponOnrepair), ""]);
-if (_weaponSelect != "") then {
+private _weaponSelect = _caller getVariable QGVAR(selectedWeaponOnrepair);
+
+if (!isNil "_weaponSelect") then {
     _caller selectWeapon _weaponSelect;
+    _caller setVariable [QGVAR(selectedWeaponOnrepair), nil];
 } else {
     _caller action ["SwitchWeapon", _caller, _caller, 299];
 };
@@ -65,7 +67,7 @@ if (isNil _callback) then {
 } else {
     _callback = missionNamespace getVariable _callback;
 };
-if (!(_callback isEqualType {})) then {_callback = {TRACE_1("callback was NOT code",_callback)};};
+if !(_callback isEqualType {}) then {_callback = {TRACE_1("callback was NOT code",_callback)};};
 
 _args call _callback;
 
diff --git a/addons/repair/functions/fnc_repair_success.sqf b/addons/repair/functions/fnc_repair_success.sqf
index 271d662cd4..9da2b0c403 100644
--- a/addons/repair/functions/fnc_repair_success.sqf
+++ b/addons/repair/functions/fnc_repair_success.sqf
@@ -38,9 +38,11 @@ if (vehicle _caller == _caller && {!(_caller call EFUNC(common,isSwimming))}) th
 _caller setVariable [QGVAR(repairCurrentAnimCaller), nil];
 _caller setVariable [QGVAR(repairPrevAnimCaller), nil];
 
-private _weaponSelect = (_caller getVariable [QGVAR(selectedWeaponOnrepair), ""]);
-if (_weaponSelect != "") then {
+private _weaponSelect = _caller getVariable QGVAR(selectedWeaponOnrepair);
+
+if (!isNil "_weaponSelect") then {
     _caller selectWeapon _weaponSelect;
+    _caller setVariable [QGVAR(selectedWeaponOnrepair), nil];
 } else {
     _caller action ["SwitchWeapon", _caller, _caller, 299];
 };
@@ -60,7 +62,7 @@ if (isNil _callback) then {
 } else {
     _callback = missionNamespace getVariable _callback;
 };
-if (!(_callback isEqualType {})) then {_callback = {TRACE_1("callback was NOT code",_callback)};};
+if !(_callback isEqualType {}) then {_callback = {TRACE_1("callback was NOT code",_callback)};};
 
 _args call _callback;
 
diff --git a/addons/repair/stringtable.xml b/addons/repair/stringtable.xml
index 850f9dee7f..6f16e91e09 100644
--- a/addons/repair/stringtable.xml
+++ b/addons/repair/stringtable.xml
@@ -280,7 +280,7 @@
             <Italian>Coefficiente di riparazione completa</Italian>
             <Korean>전체 수리 시간 계수</Korean>
             <French>Coefficient du temps de réparation complète</French>
-            <Russian>Коэффициент времени полного ремонта</Russian>
+            <Russian>Коэф. времени полного ремонта</Russian>
             <Spanish>Coeficiente de Tiempo de Reparación Completa</Spanish>
         </Key>
         <Key ID="STR_ACE_Repair_timeCoefficientFullRepair_description">
diff --git a/addons/respawn/functions/fnc_handleKilled.sqf b/addons/respawn/functions/fnc_handleKilled.sqf
index 1383561f2c..eeca8f96e5 100644
--- a/addons/respawn/functions/fnc_handleKilled.sqf
+++ b/addons/respawn/functions/fnc_handleKilled.sqf
@@ -21,7 +21,7 @@ params ["_unit"];
 // Saves the gear when the player! (and only him) is killed
 if (ACE_player == _unit && {GVAR(SavePreDeathGear)}) then {
     _unit setVariable [QGVAR(unitGear), [_unit] call CBA_fnc_getLoadout];
-    _unit setVariable [QGVAR(activeWeaponAndMuzzle), [currentWeapon _unit, currentMuzzle _unit, currentWeaponMode _unit]];
+    _unit setVariable [QGVAR(activeWeaponAndMuzzle), (weaponState _unit) select [0, 3]];
     [QGVAR(saveGear), _unit] call CBA_fnc_localEvent;
 };
 
diff --git a/addons/respawn/functions/fnc_restoreGear.sqf b/addons/respawn/functions/fnc_restoreGear.sqf
index afbc7def86..34c5918383 100644
--- a/addons/respawn/functions/fnc_restoreGear.sqf
+++ b/addons/respawn/functions/fnc_restoreGear.sqf
@@ -5,7 +5,8 @@
  *
  * Arguments:
  * 0: Unit <OBJECT>
- * 1: All Gear based on return value of ACE_common_fnc_getAllGear <ARRAY>
+ * 1: All Gear based on return value of ace_common_fnc_getAllGear <ARRAY>
+ * 2: All weapon info needed for restoring previous weapon status <ARRAY>
  *
  * Return Value:
  * None
@@ -19,36 +20,12 @@
 params ["_unit", "_allGear", "_activeWeaponAndMuzzle"];
 TRACE_3("restoreGear",_unit,count _allGear,_activeWeaponAndMuzzle);
 
-// restore all gear
+// Restore all gear
 if (!isNil "_allGear") then {
     [_unit, _allGear] call CBA_fnc_setLoadout;
 };
 
-// restore the last active weapon, muzzle and weaponMode
+// Restore the last active weapon, muzzle and weapon mode
 if (!isNil "_activeWeaponAndMuzzle") then {
-    // @todo, replace this with CBA_fnc_selectWeapon after next CBA update
-    _activeWeaponAndMuzzle params ["_activeWeapon", "_activeMuzzle", "_activeWeaponMode"];
-
-    if (
-        (_activeMuzzle != "") &&
-        {_activeMuzzle != _activeWeapon} &&
-        {_activeMuzzle in getArray (configFile >> "CfgWeapons" >> _activeWeapon >> "muzzles")}
-    ) then {
-        _unit selectWeapon _activeMuzzle;
-    } else {
-        if (_activeWeapon != "") then {
-            _unit selectWeapon _activeWeapon;
-        };
-    };
-
-    if (currentWeapon _unit != "") then {
-        private _index = 0;
-
-        while {
-            _index < 299 && {currentWeaponMode _unit != _activeWeaponMode}
-        } do {
-            _unit action ["SwitchWeapon", _unit, _unit, _index];
-            _index = _index + 1;
-        };
-    };
+    _unit selectWeapon _activeWeaponAndMuzzle;
 };
diff --git a/addons/respawn/stringtable.xml b/addons/respawn/stringtable.xml
index 6db9f12913..1de77a45d3 100644
--- a/addons/respawn/stringtable.xml
+++ b/addons/respawn/stringtable.xml
@@ -28,7 +28,7 @@
             <Hungarian>Kihelyezés 5 másodperc múlva...</Hungarian>
             <Italian>Dispiegamento in 5 secondi...</Italian>
             <Portuguese>Será posicionado em 5 segundos...</Portuguese>
-            <Japanese>5秒後に設置します・・・</Japanese>
+            <Japanese>5秒後に設置が完了します・・・</Japanese>
             <Korean>5초 후 재투입...</Korean>
             <Chinesesimp>5秒后完成部署...</Chinesesimp>
             <Chinese>5秒後完成佈署...</Chinese>
@@ -126,7 +126,7 @@
             <Hungarian>Gyülekezőpont, Nyugat (Bázis)</Hungarian>
             <Czech>Bod shromáždění Západ (Základna)</Czech>
             <Portuguese>Ponto de encontro Oeste (Base)</Portuguese>
-            <Japanese>ラリーポイント 同盟軍 (ベース)</Japanese>
+            <Japanese>ラリーポイント BLUFOR軍 (ベース)</Japanese>
             <Chinesesimp>蓝方集合点（基地）</Chinesesimp>
             <Chinese>藍方集合點 (基地)</Chinese>
             <Korean>청군 집결지 (기지)</Korean>
@@ -158,7 +158,7 @@
             <Hungarian>Gyülekezőpont, Független (Bázis)</Hungarian>
             <Czech>Bod shromáždění Nezávislý (Základna)</Czech>
             <Portuguese>Ponto de encontro Independente (Base)</Portuguese>
-            <Japanese>ラリーポイント 独立軍 (ベース)</Japanese>
+            <Japanese>ラリーポイント INDEPENDENT軍 (ベース)</Japanese>
             <Chinesesimp>独立方集合点（基地）</Chinesesimp>
             <Chinese>獨立方集合點 (基地)</Chinese>
             <Korean>무소속군 집결지 (기지)</Korean>
@@ -174,7 +174,7 @@
             <Hungarian>Gyülekezőpont, Nyugat</Hungarian>
             <Czech>Bod shromáždění Západ</Czech>
             <Portuguese>Ponto de encontro Oeste</Portuguese>
-            <Japanese>ラリーポイント 同盟軍</Japanese>
+            <Japanese>ラリーポイント BLUFOR軍</Japanese>
             <Chinesesimp>蓝方集合点</Chinesesimp>
             <Chinese>藍方集合點</Chinese>
             <Korean>청군 집결지</Korean>
@@ -206,7 +206,7 @@
             <Hungarian>Gyülekezőpont, Független</Hungarian>
             <Czech>Bod shromáždění Nezávislý</Czech>
             <Portuguese>Ponto de encontro Independente</Portuguese>
-            <Japanese>ラリーポイント 独立軍</Japanese>
+            <Japanese>ラリーポイント INDEPENDENT軍</Japanese>
             <Chinesesimp>独立方集合点</Chinesesimp>
             <Chinese>獨立方集合點</Chinese>
             <Korean>무소속군 집결지</Korean>
@@ -319,7 +319,7 @@
             <French>Ce module vous permet de configurer les fonctionnalités ACE spécifiques à la réapparition des joueurs.</French>
             <Italian>Questo modulo ti permette di configurare le funzionalità ACE specifiche dei respawn.</Italian>
             <Spanish>Este módulo permite configurar parámetros relacionados con la reaparición</Spanish>
-            <Japanese>有効化するとリスポーンへ ACE 機能を設定できます。</Japanese>
+            <Japanese>このモジュールを使用すると、リスポーンに ACE 固有の機能を設定できます。</Japanese>
             <Korean>이 모듈은 ACE 재투입의 자세한 설정을 변경할 수 있게 해줍니다.</Korean>
             <Chinesesimp>该模块使您可以设定 ACE 的重生功能</Chinesesimp>
             <Chinese>該模塊使您可以設定ACE的重生功能</Chinese>
@@ -335,7 +335,7 @@
             <Hungarian>Baráti tűz üzenetek</Hungarian>
             <Russian>Сообщения об огне по своим</Russian>
             <Italian>Messaggi Fuoco Amico</Italian>
-            <Japanese>友軍誤射の布告</Japanese>
+            <Japanese>フレンドリーファイア通知</Japanese>
             <Korean>아군 오인사격 메시지</Korean>
             <Chinesesimp>友军误击信息</Chinesesimp>
             <Chinese>友軍誤擊訊息</Chinese>
@@ -350,7 +350,7 @@
             <French>L'utilisation de ce module fait en sorte qu'à chaque joueur mort par un tir ami, un rapport sera affiché dans le chat, indiquant qui a tué qui.</French>
             <Italian>Usando questo modulo nella tua missione farà in modo che ogni uccisione per fuoco amico venga mostrata in forma di messaggio in chat.</Italian>
             <Spanish>El usar este módulo, todas las muertes por fuego amigo serán indicadas en el chat.</Spanish>
-            <Japanese>もし友軍誤射による死者が出た場合は、チャットにてその旨を表示します。</Japanese>
+            <Japanese>ミッションでこのモジュールを使用すると、誤射による友軍キルがチャット上のメッセージとして表示されるようになります。</Japanese>
             <Korean>이 모듈은 미션 중 아군 오인사격으로 인한 사망자 발생 시 채팅창에 메시지를 표시해줍니다.</Korean>
             <Chinesesimp>摆放此模块后，当有发生友军误击致死的事件，会显示提示信息在聊天视窗中。</Chinesesimp>
             <Chinese>擺放此模塊後，當有發生友軍誤擊致死的事件，會顯示提示訊息在聊天視窗中</Chinese>
@@ -381,7 +381,7 @@
             <Italian>Questo modulo ti consente di usare Rallypoint in missione, a cui ti puoi teleportare rapidamente dalla bandiera in base. Richiede il piazzamento di oggetti speciali in mappa - base e bandiera. Entrambi disponibili nella categoria Vuoto -&gt; ACE Riapparizione</Italian>
             <Spanish>Este módulo permite usar puntos de reunión en la misión, a los que pueden teletransportarse las unidades desde la bandera de base. Requiere colocar objetos especiales en el mapa: las banderas de base y de reunión, ambas disponibles en la categoría Vacio-&gt; Reaparición ACE</Spanish>
             <French>Ce module vous permet d'utiliser des points de ralliement dans les missions, vers lesquels vous pouvez vous téléporter rapidement depuis le drapeau de la base.\nNécessite de placer des objets spéciaux sur la carte - base et drapeau, tous deux disponibles dans la catégorie "Vide -&gt; ACE Réapparition".</French>
-            <Japanese>ミッションでベースから素早く移動できるラリーポイントを使えるようにします。ゲーム内に専用オブジェクトとなるベースとフラッグを設置している必要があります。両オブジェクトは Empty 下の ACE リスポーンから設置できます。</Japanese>
+            <Japanese>このモジュールを使用すると、ミッションでラリーポイントを使用できるようになります。ラリーポイントには、ベース旗からすばやくテレポートできます。マップ上に特別なラリー/ベース旗オブジェクトを配置する必要があります。両オブジェクトは道具カテゴリ下の看板サブカテゴリ内、旗から設置できます。</Japanese>
             <Korean>이 모듈은 미션 중에 기지 깃발에서 집결지로 빠르게 텔레포트 시켜주는 역할을 합니다. 지도 상에 기지 및 깃발이 필요합니다. 두 가지 모두 비어 있음-&gt;ACE 재투입 카테고리에서 찾을 수 있습니다.</Korean>
             <Chinesesimp>摆放此模块后，你将能在任务中部署集合点，使你可以快速往返基地与前线。要使用本功能，请记得放上空物体-&gt;ACE 重生里面的基地与旗帜。</Chinesesimp>
             <Chinese>擺放此模塊後，你將能在任務中佈署集合點，使你可以快速往返基地與前線。要使用本功能，請記得放上空物件-&gt;ACE 重生裡面的基地與旗幟</Chinese>
diff --git a/addons/safemode/CfgEventHandlers.hpp b/addons/safemode/CfgEventHandlers.hpp
index 6c29240403..f6503c2479 100644
--- a/addons/safemode/CfgEventHandlers.hpp
+++ b/addons/safemode/CfgEventHandlers.hpp
@@ -1,4 +1,3 @@
-
 class Extended_PreStart_EventHandlers {
     class ADDON {
         init = QUOTE(call COMPILE_SCRIPT(XEH_preStart));
diff --git a/addons/safemode/XEH_PREP.hpp b/addons/safemode/XEH_PREP.hpp
index 2f23aa02c9..499ae80867 100644
--- a/addons/safemode/XEH_PREP.hpp
+++ b/addons/safemode/XEH_PREP.hpp
@@ -1,6 +1,6 @@
-
+PREP(getWeaponSafety);
 PREP(lockSafety);
 PREP(playChangeFiremodeSound);
 PREP(setSafeModeVisual);
-PREP(unlockSafety);
 PREP(setWeaponSafety);
+PREP(unlockSafety);
diff --git a/addons/safemode/XEH_postInit.sqf b/addons/safemode/XEH_postInit.sqf
index db922f9b35..79064789d5 100644
--- a/addons/safemode/XEH_postInit.sqf
+++ b/addons/safemode/XEH_postInit.sqf
@@ -4,18 +4,26 @@
 
 if (!hasInterface) exitWith {};
 
-["ACE3 Weapons", QGVAR(safeMode), localize LSTRING(SafeMode), {
+["ACE3 Weapons", QGVAR(safeMode), LLSTRING(SafeMode), {
     // Conditions: canInteract
     if !([ACE_player, objNull, ["isNotEscorting", "isNotInside", "isNotSwimming"]] call EFUNC(common,canInteractWith)) exitWith {false};
-    // Conditions: specific
-    if !([ACE_player] call CBA_fnc_canUseWeapon && {currentWeapon ACE_player != binocular ACE_player} && {currentWeapon ACE_player != ""}) exitWith {false};
 
-    // Statement
-    [ACE_player, currentWeapon ACE_player, currentMuzzle ACE_player] call FUNC(lockSafety);
+    (weaponState ACE_player) params ["_currentWeapon", "_currentMuzzle"];
+
+    // Conditions: specific
+    if !(ACE_player call CBA_fnc_canUseWeapon && {_currentWeapon != ""} && {_currentWeapon != binocular ACE_player}) exitWith {false};
+
+    // Statement: Toggle weapon safety
+    [ACE_player, _currentWeapon, _currentMuzzle] call FUNC(lockSafety);
+
     true
 }, {false}, [DIK_GRAVE, [false, true, false]], false] call CBA_fnc_addKeybind;
 
 ["unit", {
-    private _weaponSafe = currentWeapon ACE_player in (ACE_player getVariable [QGVAR(safedWeapons), []]);
-    [!_weaponSafe] call FUNC(setSafeModeVisual);
+    (weaponState ACE_player) params ["_currentWeapon", "_currentMuzzle"];
+
+    private _weaponSafe = [ACE_player, _currentWeapon, _currentMuzzle] call FUNC(getWeaponSafety);
+
+    // Player HUD
+    !_weaponSafe call FUNC(setSafeModeVisual);
 }] call CBA_fnc_addPlayerEventHandler;
diff --git a/addons/safemode/functions/fnc_getWeaponSafety.sqf b/addons/safemode/functions/fnc_getWeaponSafety.sqf
new file mode 100644
index 0000000000..b171d974e4
--- /dev/null
+++ b/addons/safemode/functions/fnc_getWeaponSafety.sqf
@@ -0,0 +1,45 @@
+#include "..\script_component.hpp"
+/*
+ * Author: johnb43
+ * Getter for weapon safety state.
+ *
+ * Arguments:
+ * 0: Unit <OBJECT>
+ * 1: Weapon <STRING>
+ * 2: Muzzle <STRING> (default: current muzzle of weapon)
+ *
+ * Return Value:
+ * Safety status <BOOL>
+ *
+ * Example:
+ * [ACE_player, currentWeapon ACE_player] call ace_safemode_fnc_getWeaponSafety
+ *
+ * Public: Yes
+ */
+
+params [
+    ["_unit", objNull, [objNull]],
+    ["_weapon", "", [""]],
+    ["_muzzle", nil, [""]]
+];
+
+if (_weapon == "" || {!(_unit hasWeapon _weapon)}) exitWith {false};
+
+// Check if weapon is a binocular
+if ((_weapon call EFUNC(common,getItemType)) select 1 == "binocular") exitWith {false};
+
+// Check for invalid muzzles
+_muzzle = if (isNil "_muzzle") then {
+    // Get current weapon muzzle if not defined
+    (_unit weaponState _weapon) select 1
+} else {
+    // Get config case muzzle names
+    private _muzzles = _weapon call EFUNC(common,getWeaponMuzzles);
+
+    _muzzles param [_muzzles findIf {_x == _muzzle}, ""]
+};
+
+// Weapon is not available
+if (_muzzle == "") exitWith {false};
+
+_muzzle in ((_unit getVariable [QGVAR(safedWeapons), createHashMap]) getOrDefault [_weapon, createHashMap]) // return
diff --git a/addons/safemode/functions/fnc_lockSafety.sqf b/addons/safemode/functions/fnc_lockSafety.sqf
index 6c617c1898..28adb42df9 100644
--- a/addons/safemode/functions/fnc_lockSafety.sqf
+++ b/addons/safemode/functions/fnc_lockSafety.sqf
@@ -1,13 +1,13 @@
 #include "..\script_component.hpp"
 /*
- * Author: commy2
- * Put weapon on safety, or take it off safety if safety is already put on.
+ * Author: commy2, johnb43
+ * Puts weapon on safety, or take it off safety if safety is already put on.
  *
  * Arguments:
  * 0: Unit <OBJECT>
  * 1: Weapon <STRING>
  * 2: Muzzle <STRING>
- * 3: Show hint <BOOL>
+ * 3: Show hint <BOOL> (default: true)
  *
  * Return Value:
  * None
@@ -18,67 +18,74 @@
  * Public: No
  */
 
-params ["_unit", "_weapon", "_muzzle", ["_hint", true, [true]]];
+params ["_unit", "_weapon", "_muzzle", ["_hint", true]];
 
-private _safedWeapons = _unit getVariable [QGVAR(safedWeapons), []];
+private _safedWeapons = _unit getVariable QGVAR(safedWeapons);
 
-if (_weapon in _safedWeapons) exitWith {
-    _this call FUNC(unlockSafety);
+if (isNil "_safedWeapons") then {
+    _safedWeapons = createHashMap;
+
+    _unit setVariable [QGVAR(safedWeapons), _safedWeapons];
 };
 
-_safedWeapons pushBack _weapon;
+// See if the current weapon has locked muzzles
+private _safedWeaponMuzzles = _safedWeapons getOrDefault [_weapon, createHashMap, true];
 
-_unit setVariable [QGVAR(safedWeapons), _safedWeapons];
+// If muzzle is locked, unlock it (toggle)
+if (_muzzle in _safedWeaponMuzzles) exitWith {
+    [_unit, _weapon, _muzzle, _hint] call FUNC(unlockSafety);
+};
 
-if (_unit getVariable [QGVAR(actionID), -1] == -1) then {
+private _firemode = (_unit weaponState _muzzle) select 2;
+
+// This syntax of selectWeapon doesn't mess with gun lights and lasers
+_unit selectWeapon [_weapon, _muzzle, _firemode];
+
+// Store new muzzle & firemode
+_safedWeaponMuzzles set [_muzzle, _firemode];
+
+// Lock muzzle
+if (isNil {_unit getVariable QGVAR(actionID)}) then {
     _unit setVariable [QGVAR(actionID), [
         _unit, "DefaultAction", {
+            params ["", "_unit"];
+
             if (
-                [_this select 1] call CBA_fnc_canUseWeapon
-                && {
-                    if (currentMuzzle (_this select 1) in ((_this select 1) getVariable [QGVAR(safedWeapons), []])) then {
-                        if (inputAction "nextWeapon" > 0) exitWith {
-                            [_this select 1, currentWeapon (_this select 1), currentMuzzle (_this select 1)] call FUNC(unlockSafety);
+                _unit call CBA_fnc_canUseWeapon && {
+                    (weaponState _unit) params ["_currentWeapon", "_currentMuzzle"];
+
+                    // Block firing the muzzle in safe mode
+                    if (_currentMuzzle in ((_unit getVariable [QGVAR(safedWeapons), createHashMap]) getOrDefault [_currentWeapon, createHashMap])) then {
+                        if (inputAction "nextWeapon" > 0 || {inputAction "prevWeapon" > 0}) exitWith {
+                            [_unit, _currentWeapon, _currentMuzzle] call FUNC(unlockSafety);
+
                             false
                         };
+
                         true
-                    } else {false}
+                    } else {
+                        false
+                    }
                 }
             ) then {
-                // player hud
-                [false] call FUNC(setSafeModeVisual);
+                // Player HUD
+                false call FUNC(setSafeModeVisual);
+
                 true
             } else {
-                // player hud
-                [true] call FUNC(setSafeModeVisual);
+                // Player HUD
+                true call FUNC(setSafeModeVisual);
+
                 false
             };
         }, {}
     ] call EFUNC(common,addActionEventHandler)];
 };
 
-if (_muzzle isEqualType "") then {
-    private _laserEnabled = _unit isIRLaserOn _weapon || {_unit isFlashlightOn _weapon};
-
-    _unit selectWeapon _muzzle;
-
-    if (
-        _laserEnabled
-        && {
-            _muzzle == primaryWeapon _unit // prevent UGL switch
-            || {"" == primaryWeapon _unit} // Arma switches to primary weapon if exists
-        }
-    ) then {
-        {_unit action [_x, _unit]} forEach ["GunLightOn", "IRLaserOn"];
-    };
-};
-
-// play fire mode selector sound
+// Play fire mode selector sound
 [_unit, _weapon, _muzzle] call FUNC(playChangeFiremodeSound);
 
-// show info box unless disabled
+// Show info box unless disabled
 if (_hint) then {
-    private _picture = getText (configFile >> "CfgWeapons" >> _weapon >> "picture");
-    [localize LSTRING(PutOnSafety), _picture] call EFUNC(common,displayTextPicture);
+    [LLSTRING(PutOnSafety), getText (configFile >> "CfgWeapons" >> _weapon >> "picture")] call EFUNC(common,displayTextPicture);
 };
-
diff --git a/addons/safemode/functions/fnc_playChangeFiremodeSound.sqf b/addons/safemode/functions/fnc_playChangeFiremodeSound.sqf
index 257e5864f6..1edc236334 100644
--- a/addons/safemode/functions/fnc_playChangeFiremodeSound.sqf
+++ b/addons/safemode/functions/fnc_playChangeFiremodeSound.sqf
@@ -1,7 +1,7 @@
 #include "..\script_component.hpp"
 /*
  * Author: commy2
- * Play weapon firemode change sound.
+ * Plays weapon firemode change sound.
  *
  * Arguments:
  * 0: Unit <OBJECT>
@@ -21,21 +21,23 @@ params ["_unit", "_weapon"];
 private _sound = getArray (configFile >> "CfgWeapons" >> _weapon >> "changeFiremodeSound");
 
 if (_sound isEqualTo []) exitWith {
-    playSound "ACE_Sound_Click";
+    playSoundUI ["ACE_Sound_Click"];
 };
 
-// get position where to play the sound (position of the weapon)
-private _position = _unit modelToWorldVisualWorld (_unit selectionPosition "RightHand");
-
-_sound params ["_filename", ["_volume", 1], ["_soundPitch", 1], ["_distance", 0]];
+_sound params [["_filename", ""], ["_volume", 1], ["_soundPitch", 1], ["_distance", 0]];
 
 if (_filename == "") exitWith {
-    playSound "ACE_Sound_Click";
+    playSoundUI ["ACE_Sound_Click"];
 };
 
-// add file extension .wss as default
+// Add file extension .wss as default
 if !(toLowerANSI (_filename select [count _filename - 4]) in [".wav", ".ogg", ".wss"]) then {
     _filename = format ["%1.wss", _filename];
 };
 
-playSound3D [_filename, objNull, false, _position, _volume, _soundPitch, _distance];
+// Get position where to play the sound (position of the weapon)
+private _position = _unit modelToWorldVisualWorld (_unit selectionPosition "RightHand");
+
+playSound3D [_filename, objNull, insideBuilding _unit >= 0.5, _position, _volume, _soundPitch, _distance];
+
+nil // return
diff --git a/addons/safemode/functions/fnc_setSafeModeVisual.sqf b/addons/safemode/functions/fnc_setSafeModeVisual.sqf
index d62a542b9d..12b7f864ef 100644
--- a/addons/safemode/functions/fnc_setSafeModeVisual.sqf
+++ b/addons/safemode/functions/fnc_setSafeModeVisual.sqf
@@ -1,7 +1,7 @@
 #include "..\script_component.hpp"
 /*
  * Author: commy2
- * Show firemode indicator, representing safety lock
+ * Shows firemode indicator, representing safety lock.
  *
  * Arguments:
  * 0: Show firemode <BOOL>
@@ -10,7 +10,7 @@
  * None
  *
  * Example:
- * [true] call ace_safemode_fnc_setSafeModeVisual
+ * true call ace_safemode_fnc_setSafeModeVisual
  *
  * Public: No
  */
@@ -27,8 +27,8 @@ if (_show) then {
     private _config = configFile >> "RscInGameUI" >> "RscUnitInfoSoldier" >> "WeaponInfoControlsGroupLeft" >> "controls" >> "CA_ModeTexture";
 
     _control ctrlSetPosition [getNumber (_config >> "x"), getNumber (_config >> "y"), getNumber (_config >> "w"), getNumber (_config >> "h")];
-    _control ctrlCommit 0;
 } else {
     _control ctrlSetPosition [0, 0, 0, 0];
-    _control ctrlCommit 0;
 };
+
+_control ctrlCommit 0;
diff --git a/addons/safemode/functions/fnc_setWeaponSafety.sqf b/addons/safemode/functions/fnc_setWeaponSafety.sqf
index d80e1d8c38..3db0033bf8 100644
--- a/addons/safemode/functions/fnc_setWeaponSafety.sqf
+++ b/addons/safemode/functions/fnc_setWeaponSafety.sqf
@@ -1,13 +1,14 @@
 #include "..\script_component.hpp"
 /*
- * Author: Brostrom.A
- * Safe or unsafe the given weapon based on weapon state; locked or unlocked.
+ * Author: Brostrom.A, johnb43
+ * Lock or unlock the given weapon based on weapon state.
  *
  * Arguments:
  * 0: Unit <OBJECT>
  * 1: Weapon <STRING>
  * 2: State <BOOL>
  * 3: Show hint <BOOL> (default: true)
+ * 4: Muzzle <STRING> (default: current muzzle of weapon)
  *
  * Return Value:
  * None
@@ -22,17 +23,31 @@ params [
     ["_unit", objNull, [objNull]],
     ["_weapon", "", [""]],
     ["_state", true, [true]],
-    ["_hint", true, [true]]
+    ["_hint", true, [true]],
+    ["_muzzle", nil, [""]]
 ];
 
-if (_weapon == "") exitWith {};
+// Don't allow to set weapon safety if unit doesn't have one (but allow removing safety, in case unit doesn't have weapon anymore)
+if (_weapon == "" || {_state && {!(_unit hasWeapon _weapon)}}) exitWith {};
 
-private _safedWeapons = _unit getVariable [QGVAR(safedWeapons), []];
+// Check if weapon is a binocular
+if ((_weapon call EFUNC(common,getItemType)) select 1 == "binocular") exitWith {};
 
-_weapon = configName (configFile >> "CfgWeapons" >> _weapon);
+// Check for invalid muzzles
+_muzzle = if (isNil "_muzzle") then {
+    // Get current weapon muzzle if not defined
+    (_unit weaponState _weapon) select 1
+} else {
+    // Get config case muzzle names
+    private _muzzles = _weapon call EFUNC(common,getWeaponMuzzles);
 
-private _muzzle = currentMuzzle _unit;
-
-if (_state isNotEqualTo (_weapon in _safedWeapons)) then {
-    [_unit, _weapon, _muzzle, _hint] call FUNC(lockSafety);
+    _muzzles param [_muzzles findIf {_x == _muzzle}, ""]
 };
+
+// Weapon is not available
+if (_muzzle == "") exitWith {};
+
+// If the weapon is already in the desired state, don't do anything
+if (_state == (_muzzle in ((_unit getVariable [QGVAR(safedWeapons), createHashMap]) getOrDefault [_weapon, createHashMap]))) exitWith {};
+
+[_unit, _weapon, _muzzle, _hint] call FUNC(lockSafety);
diff --git a/addons/safemode/functions/fnc_unlockSafety.sqf b/addons/safemode/functions/fnc_unlockSafety.sqf
index 10372f1a2e..97716025dc 100644
--- a/addons/safemode/functions/fnc_unlockSafety.sqf
+++ b/addons/safemode/functions/fnc_unlockSafety.sqf
@@ -1,13 +1,13 @@
 #include "..\script_component.hpp"
 /*
- * Author: commy2
- * Take weapon of safety lock.
+ * Author: commy2, johnb43
+ * Takes the weapon safety lock off.
  *
  * Arguments:
  * 0: Unit <OBJECT>
  * 1: Weapon <STRING>
  * 2: Muzzle <STRING>
- * 3: Show hint <BOOL>
+ * 3: Show hint <BOOL> (default: true)
  *
  * Return Value:
  * None
@@ -18,67 +18,37 @@
  * Public: No
  */
 
-params ["_unit", "_weapon", "_muzzle", ["_hint", true, [true]]];
+params ["_unit", "_weapon", "_muzzle", ["_hint", true]];
 
-private _safedWeapons = _unit getVariable [QGVAR(safedWeapons), []];
-_safedWeapons deleteAt (_safedWeapons find _weapon);
+private _safedWeaponMuzzles = (_unit getVariable QGVAR(safedWeapons)) get _weapon;
+private _firemode = _safedWeaponMuzzles deleteAt _muzzle;
 
-_unit setVariable [QGVAR(safedWeapons), _safedWeapons];
+// Remove action if all weapons have removed their safeties
+if (_safedWeaponMuzzles isEqualTo createHashMap) then {
+    (_unit getVariable QGVAR(safedWeapons)) deleteAt _weapon;
 
-// remove action if all weapons have put their safety on
-if (_safedWeapons isEqualTo []) then {
-    [_unit, "DefaultAction", _unit getVariable [QGVAR(actionID), -1]] call EFUNC(common,removeActionEventHandler);
-    _unit setVariable [QGVAR(actionID), -1];
-};
+    private _ehID = _unit getVariable QGVAR(actionID);
 
-private _laserEnabled = _unit isIRLaserOn _weapon || {_unit isFlashlightOn _weapon};
+    if (!isNil "_ehID" && {(_unit getVariable QGVAR(safedWeapons)) isEqualTo createHashMap}) then {
+        [_unit, "DefaultAction", _ehID] call EFUNC(common,removeActionEventHandler);
 
-_unit selectWeapon _muzzle;
-
-if (
-    _laserEnabled
-    && {
-        _muzzle == primaryWeapon _unit // prevent UGL switch
-        || {"" == primaryWeapon _unit} // Arma switches to primary weapon if exists
-    }
-) then {
-    {_unit action [_x, _unit]} forEach ["GunLightOn", "IRLaserOn"];
-};
-
-if (inputAction "nextWeapon" > 0) then {
-    // switch to the last mode to roll over to first after the default nextWeapon action
-    // get weapon modes
-    private _modes = [];
-    {
-        if (getNumber (configFile >> "CfgWeapons" >> _weapon >> _x >> "showToPlayer") == 1) then {
-            _modes pushBack _x;
-        };
-        if (_x == "this") then {
-            _modes pushBack _weapon;
-        };
-    } forEach getArray (configFile >> "CfgWeapons" >> _weapon >> "modes");
-
-    // select last mode
-    private _mode = _modes select (count _modes - 1);
-
-    // switch to last mode
-    private _index = 0;
-    while {
-        _index < 299 && {currentMuzzle _unit != _weapon || {currentWeaponMode _unit != _mode}}
-    } do {
-        _unit action ["SwitchWeapon", _unit, _unit, _index];
-        _index = _index + 1;
+        _unit setVariable [QGVAR(actionID), nil];
     };
-} else {
-    // play fire mode selector sound
+};
+
+// Let engine handle switching to next firemode/muzzle
+if (inputAction "nextWeapon" == 0 && {inputAction "prevWeapon" == 0}) then {
+    // This syntax of selectWeapon doesn't mess with gun lights and lasers
+    _unit selectWeapon [_weapon, _muzzle, _firemode];
+
+    // Play fire mode selector sound
     [_unit, _weapon, _muzzle] call FUNC(playChangeFiremodeSound);
 };
 
-// player hud
-[true] call FUNC(setSafeModeVisual);
+// Player HUD
+true call FUNC(setSafeModeVisual);
 
-// show info box unless disabled
+// Show info box unless disabled
 if (_hint) then {
-    private _picture = getText (configFile >> "CfgWeapons" >> _weapon >> "picture");
-    [localize LSTRING(TookOffSafety), _picture] call EFUNC(common,displayTextPicture);
+    [LLSTRING(TookOffSafety), getText (configFile >> "CfgWeapons" >> _weapon >> "picture")] call EFUNC(common,displayTextPicture);
 };
diff --git a/addons/scopes/functions/fnc_adjustScope.sqf b/addons/scopes/functions/fnc_adjustScope.sqf
index 0a9d7bd089..a760065cde 100644
--- a/addons/scopes/functions/fnc_adjustScope.sqf
+++ b/addons/scopes/functions/fnc_adjustScope.sqf
@@ -22,7 +22,7 @@ if (!GVAR(enabled)) exitWith {false};
 params ["_unit", "_turretAndDirection", "_majorStep"];
 TRACE_3("adjustScope",_unit,_turretAndDirection,_majorStep);
 
-if (!(_unit isKindOf "Man")) exitWith {false};
+if !(_unit isKindOf "Man") exitWith {false};
 if (currentMuzzle _unit != currentWeapon _unit) exitWith {false};
 
 private _weaponIndex = [_unit, currentWeapon _unit] call EFUNC(common,getWeaponIndex);
diff --git a/addons/scopes/functions/fnc_canAdjustZero.sqf b/addons/scopes/functions/fnc_canAdjustZero.sqf
index ca03ab4123..1461d91d20 100644
--- a/addons/scopes/functions/fnc_canAdjustZero.sqf
+++ b/addons/scopes/functions/fnc_canAdjustZero.sqf
@@ -20,7 +20,7 @@ params ["_unit"];
 if (cameraView == "GUNNER") exitWith {false};
 if (!isNull objectParent _unit) exitWith {false};
 if (GVAR(simplifiedZeroing)) exitWith {false};
-if (!(missionNamespace getVariable [QEGVAR(advanced_ballistics,enabled), false])) exitWith {false};
+if !(missionNamespace getVariable [QEGVAR(advanced_ballistics,enabled), false]) exitWith {false};
 
 private _weaponIndex = [_unit, currentWeapon _unit] call EFUNC(common,getWeaponIndex);
 if (_weaponIndex < 0) exitWith {false};
diff --git a/addons/scopes/functions/fnc_canResetZero.sqf b/addons/scopes/functions/fnc_canResetZero.sqf
index 79dae44be9..92bbda1a4d 100644
--- a/addons/scopes/functions/fnc_canResetZero.sqf
+++ b/addons/scopes/functions/fnc_canResetZero.sqf
@@ -19,7 +19,7 @@ params ["_unit"];
 
 if (cameraView == "GUNNER") exitWith {false};
 if (!isNull objectParent _unit) exitWith {false};
-if (!(missionNamespace getVariable [QEGVAR(advanced_ballistics,enabled), false])) exitWith {false};
+if !(missionNamespace getVariable [QEGVAR(advanced_ballistics,enabled), false]) exitWith {false};
 
 private _weaponIndex = [_unit, currentWeapon _unit] call EFUNC(common,getWeaponIndex);
 if (_weaponIndex < 0) exitWith {false};
diff --git a/addons/scopes/functions/fnc_firedEH.sqf b/addons/scopes/functions/fnc_firedEH.sqf
index f1b8e91bf4..5ff78a44b7 100644
--- a/addons/scopes/functions/fnc_firedEH.sqf
+++ b/addons/scopes/functions/fnc_firedEH.sqf
@@ -18,7 +18,7 @@
 //IGNORE_PRIVATE_WARNING ["_unit", "_weapon", "_muzzle", "_mode", "_ammo", "_magazine", "_projectile", "_vehicle", "_gunner", "_turret"];
 TRACE_10("firedEH:",_unit,_weapon,_muzzle,_mode,_ammo,_magazine,_projectile,_vehicle,_gunner,_turret);
 
-if (!(_ammo isKindOf "BulletBase")) exitWith {};
+if !(_ammo isKindOf "BulletBase") exitWith {};
 
 private _weaponIndex = [_unit, currentWeapon _unit] call EFUNC(common,getWeaponIndex);
 if (_weaponIndex < 0) exitWith {};
diff --git a/addons/scopes/functions/fnc_getCurrentZeroRange.sqf b/addons/scopes/functions/fnc_getCurrentZeroRange.sqf
index 001e5e8b79..d1bc3b7790 100644
--- a/addons/scopes/functions/fnc_getCurrentZeroRange.sqf
+++ b/addons/scopes/functions/fnc_getCurrentZeroRange.sqf
@@ -17,12 +17,12 @@
 
 params ["_unit"];
 
-if (!GVAR(enabled)) exitWith { currentZeroing _unit };
+if (!GVAR(enabled)) exitWith {currentZeroing _unit};
 
 private _weaponIndex = [_unit, currentWeapon _unit] call EFUNC(common,getWeaponIndex);
 if (_weaponIndex < 0) exitWith { currentZeroing _unit };
 if (GVAR(simplifiedZeroing)) exitWith {
-    if (!(GVAR(canAdjustElevation) select _weaponIndex)) exitWith { currentZeroing _unit };
+    if !(GVAR(canAdjustElevation) select _weaponIndex) exitWith {currentZeroing _unit};
     private _adjustment = _unit getVariable [QGVAR(Adjustment), [[0, 0, 0], [0, 0, 0], [0, 0, 0]]];
     ((_adjustment select _weaponIndex) select 0)
 };
diff --git a/addons/scopes/functions/fnc_getOptics.sqf b/addons/scopes/functions/fnc_getOptics.sqf
index 6be1952b6f..d419d8d7f0 100644
--- a/addons/scopes/functions/fnc_getOptics.sqf
+++ b/addons/scopes/functions/fnc_getOptics.sqf
@@ -21,7 +21,7 @@ params ["_unit"];
 
 private _optics = ["", "", ""];
 
-if (!(_unit isKindOf "CAManBase")) exitWith {_optics};
+if !(_unit isKindOf "CAManBase") exitWith {_optics};
 
 {
     if (count _x >= 2) then {
diff --git a/addons/scopes/initKeybinds.inc.sqf b/addons/scopes/initKeybinds.inc.sqf
index a147b1b215..0e8db97238 100644
--- a/addons/scopes/initKeybinds.inc.sqf
+++ b/addons/scopes/initKeybinds.inc.sqf
@@ -2,7 +2,7 @@
     // Conditions: canInteract
     if !([ACE_player, objNull, ["isNotInside", "isNotSwimming"]] call EFUNC(common,canInteractWith)) exitWith {false};
     // Conditions: specific
-    if (!([ACE_player] call CBA_fnc_canUseWeapon)) exitWith {false};
+    if !([ACE_player] call CBA_fnc_canUseWeapon) exitWith {false};
 
     [ACE_player] call FUNC(inventoryCheck);
 
@@ -14,7 +14,7 @@
     // Conditions: canInteract
     if !([ACE_player, objNull, ["isNotInside", "isNotSwimming"]] call EFUNC(common,canInteractWith)) exitWith {false};
     // Conditions: specific
-    if (!([ACE_player] call CBA_fnc_canUseWeapon)) exitWith {false};
+    if !([ACE_player] call CBA_fnc_canUseWeapon) exitWith {false};
 
     [ACE_player] call FUNC(inventoryCheck);
 
@@ -26,7 +26,7 @@
     // Conditions: canInteract
     if !([ACE_player, objNull, ["isNotInside", "isNotSwimming"]] call EFUNC(common,canInteractWith)) exitWith {false};
     // Conditions: specific
-    if (!([ACE_player] call CBA_fnc_canUseWeapon)) exitWith {false};
+    if !([ACE_player] call CBA_fnc_canUseWeapon) exitWith {false};
 
     [ACE_player] call FUNC(inventoryCheck);
 
@@ -38,7 +38,7 @@
     // Conditions: canInteract
     if !([ACE_player, objNull, ["isNotInside", "isNotSwimming"]] call EFUNC(common,canInteractWith)) exitWith {false};
     // Conditions: specific
-    if (!([ACE_player] call CBA_fnc_canUseWeapon)) exitWith {false};
+    if !([ACE_player] call CBA_fnc_canUseWeapon) exitWith {false};
 
     [ACE_player] call FUNC(inventoryCheck);
 
@@ -50,7 +50,7 @@
     // Conditions: canInteract
     if !([ACE_player, objNull, ["isNotInside", "isNotSwimming"]] call EFUNC(common,canInteractWith)) exitWith {false};
     // Conditions: specific
-    if (!([ACE_player] call CBA_fnc_canUseWeapon)) exitWith {false};
+    if !([ACE_player] call CBA_fnc_canUseWeapon) exitWith {false};
 
     [ACE_player] call FUNC(inventoryCheck);
 
@@ -62,7 +62,7 @@
     // Conditions: canInteract
     if !([ACE_player, objNull, ["isNotInside", "isNotSwimming"]] call EFUNC(common,canInteractWith)) exitWith {false};
     // Conditions: specific
-    if (!([ACE_player] call CBA_fnc_canUseWeapon)) exitWith {false};
+    if !([ACE_player] call CBA_fnc_canUseWeapon) exitWith {false};
 
     [ACE_player] call FUNC(inventoryCheck);
 
@@ -74,7 +74,7 @@
     // Conditions: canInteract
     if !([ACE_player, objNull, ["isNotInside", "isNotSwimming"]] call EFUNC(common,canInteractWith)) exitWith {false};
     // Conditions: specific
-    if (!([ACE_player] call CBA_fnc_canUseWeapon)) exitWith {false};
+    if !([ACE_player] call CBA_fnc_canUseWeapon) exitWith {false};
 
     [ACE_player] call FUNC(inventoryCheck);
 
@@ -86,7 +86,7 @@
     // Conditions: canInteract
     if !([ACE_player, objNull, ["isNotInside", "isNotSwimming"]] call EFUNC(common,canInteractWith)) exitWith {false};
     // Conditions: specific
-    if (!([ACE_player] call CBA_fnc_canUseWeapon)) exitWith {false};
+    if !([ACE_player] call CBA_fnc_canUseWeapon) exitWith {false};
 
     [ACE_player] call FUNC(inventoryCheck);
 
diff --git a/addons/scopes/stringtable.xml b/addons/scopes/stringtable.xml
index b69d59e3c8..9a47f657cc 100644
--- a/addons/scopes/stringtable.xml
+++ b/addons/scopes/stringtable.xml
@@ -35,7 +35,7 @@
         <Key ID="STR_ACE_Scopes_enabled_description">
             <English>Enable adjustment turrets on high powered scopes</English>
             <German>Aktiviere Absehenverstellungen für Waffen mit Zielfernrohren</German>
-            <Japanese>高倍率スコープでACE スコープ調節を有効化</Japanese>
+            <Japanese>高倍率スコープでのタレット調整を有効化します</Japanese>
             <Korean>고성능 조준경 조절 나사 활성화</Korean>
             <Polish>Włącz pokrętła regulacyjne </Polish>
             <French>Active les tourelles de réglage des lunettes de visée à fort grossissement.</French>
@@ -50,7 +50,7 @@
         <Key ID="STR_ACE_Scopes_forceUseOfAdjustmentTurrets_displayName">
             <English>Force adjustment turrets</English>
             <German>Erzwinge Absehenverstellungen</German>
-            <Japanese>ACE スコープ調節を有効化</Japanese>
+            <Japanese>タレット調整を強制</Japanese>
             <Korean>조절 나사 강제</Korean>
             <Polish>Wymuś użycie pokręteł regulacyjnych</Polish>
             <French>Forcer les tourelles de réglage</French>
@@ -65,7 +65,7 @@
         <Key ID="STR_ACE_Scopes_forceUseOfAdjustmentTurrets_description">
             <English>Force usage of adjustment turrets on high powered scopes</English>
             <German>Erzwinge Absehenverstellungen für Waffen mit Zielfernrohren</German>
-            <Japanese>高倍率スコープで調整の使用を強制させます</Japanese>
+            <Japanese>高倍率スコープでタレット調整の使用を強制させます</Japanese>
             <Korean>고성능 조준경의 조절 나사 사용을 강제합니다</Korean>
             <Polish>Wymuś użycie pokręteł regulacyjnych dla celowników o dużym powiększeniu</Polish>
             <French>Force l'utilisation des tourelles de réglage sur les lunettes de visée à fort grossissement.</French>
@@ -80,7 +80,7 @@
         <Key ID="STR_ACE_Scopes_correctZeroing_displayName">
             <English>Correct zeroing</English>
             <German>Nullungsanpassung</German>
-            <Japanese>ゼロイン調節</Japanese>
+            <Japanese>ゼロイン規整</Japanese>
             <Korean>영점 고치기</Korean>
             <Polish>Poprawka zerowania </Polish>
             <French>Corriger le zérotage</French>
@@ -95,7 +95,7 @@
         <Key ID="STR_ACE_Scopes_correctZeroing_description">
             <English>Corrects the zeroing of all small arms sights</English>
             <German>Korrigiert alle Nullungen von Handfeuerwaffen</German>
-            <Japanese>全ての小口径用照準器のゼロインを調節します</Japanese>
+            <Japanese>全ての小火器用照準器のゼロインを規整します</Japanese>
             <Korean>모든 소화기의 영점을 고칩니다</Korean>
             <Polish>Poprawia zerowanie wszystkich celowników broni ręcznej</Polish>
             <French>Corrige le zérotage de tous les viseurs d'armes légères.</French>
@@ -125,7 +125,7 @@
         <Key ID="STR_ACE_Scopes_overwriteZeroRange_Description">
             <English>Uses the 'defaultZeroRange' setting to overwrite the zero range of high power scopes</English>
             <German>Nutzt die Einstellung 'defaultZeroRange' um Zielfernrohre anzupassen</German>
-            <Japanese>'defaultZeroRange'設定を使う高倍率スコープのゼロイン距離を上書きします</Japanese>
+            <Japanese>'標準のゼロイン距離'設定を使用して、高倍率スコープのゼロイン距離を上書きします。</Japanese>
             <Korean>기존 고성능 조준경의 영점거리에 'defaultZeroRange'를 덮어씌웁니다</Korean>
             <Polish>Używa 'defaultZeroRange' zamiast ustawionej odległości zerowania dla celowników o duzym przybliżeniu </Polish>
             <French>Utilise le paramètre "Distance de zérotage par défaut" pour remplacer la distance de zérotage des lunettes de visée à fort grossissement.</French>
@@ -155,7 +155,7 @@
         <Key ID="STR_ACE_Scopes_defaultZeroRange_description">
             <English>High powered scopes will be zeroed at this distance</English>
             <German>Zielfernrohre werden auf diese Entfernung genullt</German>
-            <Japanese>高倍率スコープのゼロイン距離はこの設定になります</Japanese>
+            <Japanese>高倍率スコープのゼロイン位置はこの設定になります</Japanese>
             <Korean>고성능 조준경이 정해진 수만큼 영점거리를 맞추게 됩니다.</Korean>
             <Polish>Celowniki o dużym powiększeniu będą zerowane dla tej odległości</Polish>
             <French>Distance de zérotage des lunettes de visée à fort grossissement.</French>
@@ -308,7 +308,7 @@
             <Italian>Visualizza Alzo e Deriva con numeri firmati</Italian>
             <Chinese>使用帶著標籤的數字顯示歸零遠近與風偏程度</Chinese>
             <Chinesesimp>使用带着标签的数字显示归零远近与风偏程度</Chinesesimp>
-            <Japanese>印付きの数字で仰角と横風を表示</Japanese>
+            <Japanese>ウィンデージとエレベーションを符号付き数字で表示します</Japanese>
             <Korean>기존의 부호가 있는 숫자로 표고와 폭을 표시합니다.</Korean>
             <Polish>Wyświetla elewację i tarcie powietrza poprzez podpisane liczby</Polish>
             <Russian>Отображает горизонтальные и вертикальные поправки с подписанными числами</Russian>
@@ -320,7 +320,7 @@
         <Key ID="STR_ACE_Scopes_simplifiedZeroing_displayName">
             <English>Simplified zeroing</English>
             <German>Vereinfachte Nullung</German>
-            <Japanese>簡略なゼロイン</Japanese>
+            <Japanese>簡素化ゼロイン</Japanese>
             <Italian>Azzeramento semplificato</Italian>
             <Korean>단순화된 영점 조정</Korean>
             <Chinese>簡單歸零</Chinese>
@@ -335,7 +335,7 @@
         <Key ID="STR_ACE_Scopes_simplifiedZeroing_description">
             <English>Replicates the vanilla zeroing system for riflescopes.</English>
             <German>Repliziert das Vanilla-Zeroing-System für Zielfernrohre.</German>
-            <Japanese>バニラ(ゲーム標準)のライフルスコープ用ゼロイン調整システムを複製します。</Japanese>
+            <Japanese>バニラ(ゲーム標準)のライフルスコープ用ゼロイン調整システムを再現します。</Japanese>
             <Italian>Replica il sistema di azzeramento vanilla per le ottiche.</Italian>
             <Korean>라이플 스코프용 바닐라 영점조정 시스템을 복제합니다.</Korean>
             <Chinese>使用原版的歸零系統來取代ACE複雜的歸零模擬。</Chinese>
@@ -486,7 +486,7 @@
             <Hungarian>Állítások nullázása</Hungarian>
             <Portuguese>Zerar ajuste</Portuguese>
             <Czech>Vynulovat korekci</Czech>
-            <Japanese>ゼロインを調節</Japanese>
+            <Japanese>ゼロイン調節をセット</Japanese>
             <Korean>영점 초기화</Korean>
             <Chinesesimp>设定归零</Chinesesimp>
             <Chinese>設定歸零</Chinese>
@@ -509,7 +509,7 @@
         <Key ID="STR_ACE_Scopes_Description">
             <English>This module adds windage and elevation adjustment turrets on high power rifle scopes.</English>
             <German>Dieses Modul fügt Absehenverstellung (horizontal und vertikal) zu Zielfernrohren hinzu.</German>
-            <Japanese>このモジュールは高倍率ライフル スコープにおいて横風と仰角の調節ができます。</Japanese>
+            <Japanese>このモジュールは高倍率ライフル スコープにおいてウィンデージとエレベーションの調節ができます。</Japanese>
             <Korean>이 모듈은 고성능 조준경에 조준 나사를 이용한 편차 및 고도 조절 기능을 더해줍니다.</Korean>
             <Polish>Ten moduł włącza pokrętła kalibracyjne poprawki na wiatr oraz poprawki wysokości dla celowników o dużym powiększeniu.</Polish>
             <French>Ce module ajoute les tourelles de correction de hausse et de dérive sur les lunettes de visée à fort grossissement.</French>
diff --git a/addons/sitting/functions/fnc_getRandomAnimation.sqf b/addons/sitting/functions/fnc_getRandomAnimation.sqf
index ac8bd9e68d..b0aa2ba270 100644
--- a/addons/sitting/functions/fnc_getRandomAnimation.sqf
+++ b/addons/sitting/functions/fnc_getRandomAnimation.sqf
@@ -4,7 +4,7 @@
  * Gets a random animations from the list.
  *
  * Arguments:
- * None
+ * 0: Object to get animation pool from <OBJECT> (default: objNull)
  *
  * Return Value:
  * Random Animation <STRING>
@@ -15,30 +15,42 @@
  * Public: No
  */
 
+params [["_object", objNull, [objNull]]];
+
+private _animations = [];
+
+if (!isNull _object) then {
+    _animations = getArray (configOf _object >> QGVAR(animations));
+};
+
+if (_animations isEqualTo []) then {
+    _animations = [
+        QGVAR(HubSittingChairA_idle1),
+        QGVAR(HubSittingChairA_idle2),
+        QGVAR(HubSittingChairA_idle3),
+        QGVAR(HubSittingChairA_move1),
+        QGVAR(HubSittingChairB_idle1),
+        QGVAR(HubSittingChairB_idle2),
+        QGVAR(HubSittingChairB_idle3),
+        QGVAR(HubSittingChairB_move1),
+        QGVAR(HubSittingChairC_idle1),
+        QGVAR(HubSittingChairC_idle2),
+        QGVAR(HubSittingChairC_idle3),
+        QGVAR(HubSittingChairC_move1),
+        QGVAR(HubSittingChairUA_idle1),
+        QGVAR(HubSittingChairUA_idle2),
+        QGVAR(HubSittingChairUA_idle3),
+        QGVAR(HubSittingChairUA_move1),
+        QGVAR(HubSittingChairUB_idle1),
+        QGVAR(HubSittingChairUB_idle2),
+        QGVAR(HubSittingChairUB_idle3),
+        QGVAR(HubSittingChairUB_move1),
+        QGVAR(HubSittingChairUC_idle1),
+        QGVAR(HubSittingChairUC_idle2),
+        QGVAR(HubSittingChairUC_idle3),
+        QGVAR(HubSittingChairUC_move1)
+    ];
+};
+
 // Select random animation from Animations Pool
-selectRandom [
-    QGVAR(HubSittingChairA_idle1),
-    QGVAR(HubSittingChairA_idle2),
-    QGVAR(HubSittingChairA_idle3),
-    QGVAR(HubSittingChairA_move1),
-    QGVAR(HubSittingChairB_idle1),
-    QGVAR(HubSittingChairB_idle2),
-    QGVAR(HubSittingChairB_idle3),
-    QGVAR(HubSittingChairB_move1),
-    QGVAR(HubSittingChairC_idle1),
-    QGVAR(HubSittingChairC_idle2),
-    QGVAR(HubSittingChairC_idle3),
-    QGVAR(HubSittingChairC_move1),
-    QGVAR(HubSittingChairUA_idle1),
-    QGVAR(HubSittingChairUA_idle2),
-    QGVAR(HubSittingChairUA_idle3),
-    QGVAR(HubSittingChairUA_move1),
-    QGVAR(HubSittingChairUB_idle1),
-    QGVAR(HubSittingChairUB_idle2),
-    QGVAR(HubSittingChairUB_idle3),
-    QGVAR(HubSittingChairUB_move1),
-    QGVAR(HubSittingChairUC_idle1),
-    QGVAR(HubSittingChairUC_idle2),
-    QGVAR(HubSittingChairUC_idle3),
-    QGVAR(HubSittingChairUC_move1)
-]
+selectRandom _animations
diff --git a/addons/sitting/functions/fnc_sit.sqf b/addons/sitting/functions/fnc_sit.sqf
index 2d7cc999da..033a1f4d2c 100644
--- a/addons/sitting/functions/fnc_sit.sqf
+++ b/addons/sitting/functions/fnc_sit.sqf
@@ -48,7 +48,7 @@ if (_multiSitting) then {
 };
 
 // Get random animation and perform it (before moving player to ensure correct placement)
-[_player, call FUNC(getRandomAnimation), 2] call EFUNC(common,doAnimation); // Correctly places when using non-transitional animations
+[_player, [_seat] call FUNC(getRandomAnimation), 2] call EFUNC(common,doAnimation); // Correctly places when using non-transitional animations
 [_player, "", 1] call EFUNC(common,doAnimation); // Correctly applies animation's config values (such as disallow throwing of grenades, intercept keybinds... etc).
 
 TRACE_2("Sit pos and dir",_sitPosition,_sitDirection);
@@ -78,7 +78,7 @@ if (_seatsClaimed isEqualTo []) then {
 _seat setVariable [QGVAR(seatsClaimed), _seatsClaimed, true];
 
 // Also prevent dragging/carrying
-if (!([_seat] call EFUNC(common,owned))) then {
+if !([_seat] call EFUNC(common,owned)) then {
     [_player, _seat] call EFUNC(common,claim);
 };
 
diff --git a/addons/slideshow/functions/fnc_mapImage_init.sqf b/addons/slideshow/functions/fnc_mapImage_init.sqf
index 5235315bd0..3fb6e4c7f8 100644
--- a/addons/slideshow/functions/fnc_mapImage_init.sqf
+++ b/addons/slideshow/functions/fnc_mapImage_init.sqf
@@ -50,7 +50,7 @@ ctrlMapAnimCommit _map;
 
 // add drawEH to draw markers next update (they will get drawn 3 times total)
 _map setVariable ["markers", _markers];
-_map ctrlAddEventHandler ["draw", {
+_map ctrlAddEventHandler ["Draw", {
     params ["_map"];
     private _markers = _map getVariable ["markers", []];
     TRACE_2("drawing markers",_map,count _markers);
diff --git a/addons/smallarms/stringtable.xml b/addons/smallarms/stringtable.xml
index 0b89a38b0d..ebb387113a 100644
--- a/addons/smallarms/stringtable.xml
+++ b/addons/smallarms/stringtable.xml
@@ -30,6 +30,7 @@
             <Japanese>.45 ACP 25Rnd マガジン</Japanese>
             <Chinesesimp>.45 ACP 25发 弹匣</Chinesesimp>
             <Korean>.45 ACP 25발 탄창</Korean>
+            <Portuguese>Carregador 25Mun. .45 ACP</Portuguese>
         </Key>
         <Key ID="STR_ACE_SmallArms_25Rnd_45_Tracer_Green_Name">
             <English>.45 ACP 25Rnd Tracers (Green) Mag</English>
@@ -44,6 +45,7 @@
             <Japanese>.45 ACP 25Rnd トレーサー (緑) マガジン</Japanese>
             <Chinesesimp>.45 ACP 25发 弹匣（曳光，绿）</Chinesesimp>
             <Korean>.45 ACP 25발 예광탄 (초록) 탄창</Korean>
+            <Portuguese>Carregador 25Mun. .45 ACP Traçante (Verde)</Portuguese>
         </Key>
         <Key ID="STR_ACE_SmallArms_25Rnd_45_Tracer_Red_Name">
             <English>.45 ACP 25Rnd Tracers (Red) Mag</English>
@@ -58,6 +60,7 @@
             <Japanese>.45 ACP 25Rnd トレーサー (赤) マガジン</Japanese>
             <Chinesesimp>.45 ACP 25发 弹匣（曳光，红）</Chinesesimp>
             <Korean>.45 ACP 25발 예광탄 (빨강) 탄창</Korean>
+            <Portuguese>Carregador 25Mun. .45 ACP Traçante (Vermelha)</Portuguese>
         </Key>
         <Key ID="STR_ACE_SmallArms_25Rnd_45_Tracer_Yellow_Name">
             <English>.45 ACP 25Rnd Tracers (Yellow) Mag</English>
@@ -72,6 +75,7 @@
             <Japanese>.45 ACP 25Rnd トレーサー (黄) マガジン</Japanese>
             <Chinesesimp>.45 ACP 25发 弹匣（曳光，黄）</Chinesesimp>
             <Korean>.45 ACP 25발 예광탄 (노랑) 탄창</Korean>
+            <Portuguese>Carregador 25Mun. .45 ACP Traçante (Amarela)</Portuguese>
         </Key>
         <Key ID="STR_ACE_SmallArms_8Rnd_45_Name">
             <English>.45 ACP 8Rnd Mag</English>
@@ -86,6 +90,7 @@
             <Japanese>.45 ACP 8Rnd マガジン</Japanese>
             <Chinesesimp>.45 ACP 8发 弹匣</Chinesesimp>
             <Korean>.45 ACP 8발 탄창</Korean>
+            <Portuguese>Carregador 8Mun. .45 ACP</Portuguese>
         </Key>
         <Key ID="STR_ACE_SmallArms_15Rnd_45_Name">
             <English>.45 ACP 15Rnd Mag</English>
@@ -100,6 +105,7 @@
             <Japanese>.45 ACP 15Rnd マガジン</Japanese>
             <Chinesesimp>.45 ACP 15发 弹匣</Chinesesimp>
             <Korean>.45 ACP 15발 탄창</Korean>
+            <Portuguese>Carregador 15Mun. .45 ACP</Portuguese>
         </Key>
     </Package>
 </Project>
diff --git a/addons/spectator/functions/fnc_cam.sqf b/addons/spectator/functions/fnc_cam.sqf
index d63a3c24a8..a9f8e97522 100644
--- a/addons/spectator/functions/fnc_cam.sqf
+++ b/addons/spectator/functions/fnc_cam.sqf
@@ -132,6 +132,9 @@ if (_init) then {
     GVAR(camDummy) = nil;
 
     // Stop tracking everything
+    { deleteVehicle _x; } forEach GVAR(camLights);
+    GVAR(camLights)             = nil;
+
     GVAR(camMode)               = nil;
     GVAR(camVision)             = nil;
     GVAR(camFocus)              = nil;
@@ -144,6 +147,5 @@ if (_init) then {
     GVAR(camYaw)                = nil;
     GVAR(camPitch)              = nil;
     GVAR(camSlow)               = nil;
-    GVAR(camLights)             = nil;
     GVAR(camLight)              = nil;
 };
diff --git a/addons/switchunits/functions/fnc_switchUnit.sqf b/addons/switchunits/functions/fnc_switchUnit.sqf
index 135088d243..9ce074eecb 100644
--- a/addons/switchunits/functions/fnc_switchUnit.sqf
+++ b/addons/switchunits/functions/fnc_switchUnit.sqf
@@ -18,7 +18,7 @@
 params ["_unit"];
 
 // don't switch to original player units
-if (!([_unit] call FUNC(isValidAi))) exitWith {};
+if !([_unit] call FUNC(isValidAi)) exitWith {};
 
 // exit var
 private _leave = false;
diff --git a/addons/switchunits/stringtable.xml b/addons/switchunits/stringtable.xml
index c772b40867..11e54342aa 100644
--- a/addons/switchunits/stringtable.xml
+++ b/addons/switchunits/stringtable.xml
@@ -92,7 +92,7 @@
             <Hungarian>Átváltás BLUFOR-ra?</Hungarian>
             <Russian>На синих?</Russian>
             <Italian>Cambia per BLUFOR?</Italian>
-            <Japanese>同盟軍へ切り替える?</Japanese>
+            <Japanese>BLUFOR軍へ切り替える?</Japanese>
             <Chinesesimp>切换至蓝方？</Chinesesimp>
             <Chinese>切換至藍方?</Chinese>
             <Korean>청군으로 변경합니까?</Korean>
@@ -109,7 +109,7 @@
             <Hungarian>Nyugat-fakciós egységekre való váltás engedélyezése?</Hungarian>
             <Russian>Разрешить переключаться на синих юнитов?</Russian>
             <Italian>Consenti passaggio ad unità BLUFOR?</Italian>
-            <Japanese>同盟軍ユニットへの切り替えを許可しますか?</Japanese>
+            <Japanese>BLUFOR軍ユニットへの切り替えを許可しますか?</Japanese>
             <Chinesesimp>允许切换至蓝方？</Chinesesimp>
             <Chinese>允許切換至藍方?</Chinese>
             <Korean>청군 인원으로 변경하는 것을 허락합니까?</Korean>
@@ -158,7 +158,7 @@
             <Hungarian>Átváltás INDFOR-ra?</Hungarian>
             <Russian>На независимых?</Russian>
             <Italian>Cambia per INDFOR?</Italian>
-            <Japanese>独立軍へ切り替える?</Japanese>
+            <Japanese>INDEPENDENT軍へ切り替える?</Japanese>
             <Chinesesimp>切换至独立方？</Chinesesimp>
             <Chinese>切換至獨立方?</Chinese>
             <Korean>무소속군으로 전환합니까?</Korean>
@@ -175,7 +175,7 @@
             <Hungarian>Független egységekre való váltás engedélyezése?</Hungarian>
             <Russian>Разрешить переключаться на независимых юнитов?</Russian>
             <Italian>Consenti passaggio ad unità INDFOR?</Italian>
-            <Japanese>独立軍ユニットへの切り替えを許可しますか?</Japanese>
+            <Japanese>INDEPENDENT軍ユニットへの切り替えを許可しますか?</Japanese>
             <Chinesesimp>允许切换至独立方？</Chinesesimp>
             <Chinese>允許切換至獨立方?</Chinese>
             <Korean>무소속군 인원으로 변경하는 것을 허락합니까?</Korean>
diff --git a/addons/tagging/XEH_postInit.sqf b/addons/tagging/XEH_postInit.sqf
index dd46b7fb98..02e082648a 100644
--- a/addons/tagging/XEH_postInit.sqf
+++ b/addons/tagging/XEH_postInit.sqf
@@ -1,14 +1,6 @@
 // by esteldunedain
 #include "script_component.hpp"
 
-
-// Cache for static objects
-GVAR(cacheStaticModels) = [false] call CBA_fnc_createNamespace;
-private _cacheStaticModels = call (uiNamespace getVariable [QGVAR(cacheStaticModels), {[]}]);
-{
-    GVAR(cacheStaticModels) setVariable [_x, true];
-} forEach _cacheStaticModels;
-
 if (hasInterface) then {
     // Compile and cache config tags
     call FUNC(compileConfigTags);
diff --git a/addons/tagging/XEH_preStart.sqf b/addons/tagging/XEH_preStart.sqf
index e1ac396c48..eb8f7ab767 100644
--- a/addons/tagging/XEH_preStart.sqf
+++ b/addons/tagging/XEH_preStart.sqf
@@ -26,9 +26,9 @@ private _cfgBase = configFile >> "CfgNonAIVehicles";
         private _array = _model splitString "\";
         _cacheStaticModels pushBackUnique toLowerANSI (_array select -1);
     };
-} forEach (_nonaivehicleClasses select {(configName _x) isKindOf ["Bridge_base_F", _cfgBase]});
+} forEach (_nonAIVehicleClasses select {(configName _x) isKindOf ["Bridge_base_F", _cfgBase]});
 
-uiNamespace setVariable [QGVAR(cacheStaticModels), compileFinal str _cacheStaticModels];
+uiNamespace setVariable [QGVAR(cacheStaticModels), compileFinal (_cacheStaticModels createHashMapFromArray [])];
 TRACE_1("compiled",count _cacheStaticModels);
 
 // force preload of stencil texture to avoid error popup
diff --git a/addons/tagging/functions/fnc_checkTaggable.sqf b/addons/tagging/functions/fnc_checkTaggable.sqf
index 7eab60c1ba..ef20062a32 100644
--- a/addons/tagging/functions/fnc_checkTaggable.sqf
+++ b/addons/tagging/functions/fnc_checkTaggable.sqf
@@ -43,14 +43,14 @@
         if (_object isKindOf "Static") exitWith {false};
 
         // Taggable vehicle, do not exit
-        if (((_object getVariable [QGVAR(canTag), getNumber (configOf _object >> QGVAR(canTag))]) in [1, true]) 
+        if (((_object getVariable [QGVAR(canTag), getNumber (configOf _object >> QGVAR(canTag))]) in [1, true])
         && {getText (configOf _object >> "selectionClan") in selectionNames _object}) exitWith {
             false
         };
 
         // If the class is not categorized correctly search the cache
-        private _modelName = (getModelInfo _object) select 0;
-        private _isStatic = GVAR(cacheStaticModels) getVariable [_modelName, false];
+        private _modelName = toLowerANSI ((getModelInfo _object) select 0);
+        private _isStatic = _modelName in (uiNamespace getVariable QGVAR(cacheStaticModels));
         TRACE_2("Object:",_modelName,_isStatic);
         // If the class in not on the cache, exit
         (!_isStatic)
diff --git a/addons/tagging/functions/fnc_generateStencilTexture.sqf b/addons/tagging/functions/fnc_generateStencilTexture.sqf
index 1870d67114..6d8dffdc55 100644
--- a/addons/tagging/functions/fnc_generateStencilTexture.sqf
+++ b/addons/tagging/functions/fnc_generateStencilTexture.sqf
@@ -29,10 +29,10 @@ params [
     ["_dimension", 512, [0]]
 ];
 
-if (_textColor select [0, 1] == "#") then { _textColor = _textColor select [1]; };
-if (_backgroundColor select [0, 1] == "#") then { _backgroundColor = _backgroundColor select [1]; };
-if (!((count _textColor) in [6,8])) exitWith { ERROR_1("bad Tcolor %1",_textColor); "" };
-if (!((count _backgroundColor) in [6,8])) exitWith { ERROR_1("bad Bcolor %1",_textColor); "" };
+if (_textColor select [0, 1] == "#") then {_textColor = _textColor select [1];};
+if (_backgroundColor select [0, 1] == "#") then {_backgroundColor = _backgroundColor select [1];};
+if !((count _textColor) in [6,8]) exitWith {ERROR_1("bad Tcolor %1",_textColor); ""};
+if !((count _backgroundColor) in [6,8]) exitWith {ERROR_1("bad Bcolor %1",_textColor); ""};
 
 if (_autoMultiline) then {
     private _magicWidth = 0.75;
diff --git a/addons/tagging/functions/fnc_stencilVehicle.sqf b/addons/tagging/functions/fnc_stencilVehicle.sqf
index b2ee99c241..1dfd86a2f9 100644
--- a/addons/tagging/functions/fnc_stencilVehicle.sqf
+++ b/addons/tagging/functions/fnc_stencilVehicle.sqf
@@ -29,7 +29,7 @@ TRACE_2("",_vehicle,_text);
 if (!isServer) exitWith {};
 if (_text == "") exitWith {};
 private _clanSel = getText (configOf _vehicle >> "selectionClan");
-if (!(_clanSel in selectionNames _vehicle)) exitWith { TRACE_1("no tag",_clanSel); };
+if !(_clanSel in selectionNames _vehicle) exitWith {TRACE_1("no tag",_clanSel);};
 
 private _texture = [_text, _textSize, _textColor, "00000000", true] call FUNC(generateStencilTexture);
 TRACE_1("",_texture);
diff --git a/addons/tagging/functions/fnc_tag.sqf b/addons/tagging/functions/fnc_tag.sqf
index aa0ba9fac9..f130e1322b 100644
--- a/addons/tagging/functions/fnc_tag.sqf
+++ b/addons/tagging/functions/fnc_tag.sqf
@@ -60,8 +60,8 @@ if ((!isNull _object) && {
     };
 
     // If the class is not categorized correctly search the cache
-    private _modelName = (getModelInfo _object) select 0;
-    private _isStatic = GVAR(cacheStaticModels) getVariable [_modelName, false];
+    private _modelName = toLowerANSI ((getModelInfo _object) select 0);
+    private _isStatic = _modelName in (uiNamespace getVariable QGVAR(cacheStaticModels));
     TRACE_2("Object:",_modelName,_isStatic);
     // If the class in not on the cache, exit
     (!_isStatic)
diff --git a/addons/towing/functions/fnc_towStateMachinePFH.sqf b/addons/towing/functions/fnc_towStateMachinePFH.sqf
index 50afdeb153..7b295754fa 100644
--- a/addons/towing/functions/fnc_towStateMachinePFH.sqf
+++ b/addons/towing/functions/fnc_towStateMachinePFH.sqf
@@ -44,15 +44,14 @@ if (GVAR(isSwimming) && {currentWeapon _unit isNotEqualTo ""}) then {
 private _exitCondition = !(
     (alive GVAR(attachHelper)) &&
     { alive _parent } &&
-    { alive _unit } &&
+    { _unit call EFUNC(common,isAwake) } &&
     {
         currentWeapon _unit isEqualTo ""
         || {_unit call EFUNC(common,isSwimming)} // swimming in wetsuit forces weapon in hands
         || {getPosASLW _unit select 2 < -1.5} // walking-to-swimming animation in wetsuit lasts for 3 seconds
     } &&
     { [_unit, objNull, [INTERACTION_EXCEPTIONS]] call EFUNC(common,canInteractWith) } &&
-    { "unconscious" isNotEqualTo toLowerANSI animationState _unit } &&
-    { !(_unit getVariable ["ACE_isUnconscious", false]) } &&
+    { "unconscious" != animationState _unit } &&
     { ACE_player == _unit }
 );
 
diff --git a/addons/towing/stringtable.xml b/addons/towing/stringtable.xml
index 949d36dd48..7549fb3c8a 100644
--- a/addons/towing/stringtable.xml
+++ b/addons/towing/stringtable.xml
@@ -12,6 +12,7 @@
             <Chinesesimp>牵引</Chinesesimp>
             <Korean>견인</Korean>
             <Spanish>Remolcado</Spanish>
+            <Portuguese>Rebocando</Portuguese>
         </Key>
         <Key ID="STR_ACE_Towing_attach">
             <English>Attach Tow Rope</English>
@@ -24,6 +25,7 @@
             <Chinesesimp>系上牵引绳</Chinesesimp>
             <Korean>견인줄 부착</Korean>
             <Spanish>Sujetar cuerda de remolcado</Spanish>
+            <Portuguese>Fixar corda de reboque</Portuguese>
         </Key>
         <Key ID="STR_ACE_Towing_canceled">
             <English>Attaching Cancelled</English>
@@ -36,6 +38,7 @@
             <Chinesesimp>取消系上绳索</Chinesesimp>
             <Korean>견인 취소됨</Korean>
             <Spanish>Sujección cancelada</Spanish>
+            <Portuguese>Reboque cancelado</Portuguese>
         </Key>
         <Key ID="STR_ACE_Towing_start3">
             <English>Attach Tow Rope (3.2m)</English>
@@ -48,6 +51,7 @@
             <Chinesesimp>系上牵引绳（3.2米）</Chinesesimp>
             <Korean>견인줄 부착(3.2M)</Korean>
             <Spanish>Sujetar cuerda de remolcado (3.2m)</Spanish>
+            <Portuguese>Fixar corda de reboque (3,2m)</Portuguese>
         </Key>
         <Key ID="STR_ACE_Towing_start6">
             <English>Attach Tow Rope (6.2m)</English>
@@ -60,6 +64,7 @@
             <Chinesesimp>系上牵引绳（6.2米）</Chinesesimp>
             <Korean>견인줄 부착(6.2M)</Korean>
             <Spanish>Sujetar cuerda de remolcado (6.2m)</Spanish>
+            <Portuguese>Fixar corda de reboque (6,2m)</Portuguese>
         </Key>
         <Key ID="STR_ACE_Towing_start12">
             <English>Attach Tow Rope (12.2m)</English>
@@ -72,6 +77,7 @@
             <Chinesesimp>系上牵引绳（12.2米）</Chinesesimp>
             <Korean>견인줄 부착(12.2M)</Korean>
             <Spanish>Sujetar cuerda de remolcado (12.2m)</Spanish>
+            <Portuguese>Fixar corda de reboque (12,2m)</Portuguese>
         </Key>
         <Key ID="STR_ACE_Towing_start15">
             <English>Attach Tow Rope (15.2m)</English>
@@ -84,6 +90,7 @@
             <Chinesesimp>系上牵引绳（15.2米）</Chinesesimp>
             <Korean>견인줄 부착(15.2M)</Korean>
             <Spanish>Sujetar cuerda de remolcado (15.2m)</Spanish>
+            <Portuguese>Fixar corda de reboque (15,2m)</Portuguese>
         </Key>
         <Key ID="STR_ACE_Towing_start18">
             <English>Attach Tow Rope (18.3m)</English>
@@ -96,6 +103,7 @@
             <Chinesesimp>系上牵引绳（18.3米）</Chinesesimp>
             <Korean>견인줄 부착(18.2M)</Korean>
             <Spanish>Sujetar cuerda de remolcado (18.3m)</Spanish>
+            <Portuguese>Fixar corda de reboque (18,3m)</Portuguese>
         </Key>
         <Key ID="STR_ACE_Towing_start27">
             <English>Attach Tow Rope (27.4m)</English>
@@ -108,6 +116,7 @@
             <Chinesesimp>系上牵引绳（27.4米）</Chinesesimp>
             <Korean>견인줄 부착(27.4M)</Korean>
             <Spanish>Sujetar cuerda de remolcado (27.4m)</Spanish>
+            <Portuguese>Fixar corda de reboque (27,4m)</Portuguese>
         </Key>
         <Key ID="STR_ACE_Towing_start36">
             <English>Attach Tow Rope (36.6m)</English>
@@ -120,6 +129,7 @@
             <Chinesesimp>系上牵引绳（36.6米）</Chinesesimp>
             <Korean>견인줄 부착(36.6M)</Korean>
             <Spanish>Sujetar cuerda de remolcado (36.6m)</Spanish>
+            <Portuguese>Fixar corda de reboque (36,6m)</Portuguese>
         </Key>
         <Key ID="STR_ACE_Towing_detach">
             <English>Detach Tow Rope</English>
@@ -132,6 +142,7 @@
             <Chinesesimp>解开牵引绳</Chinesesimp>
             <Korean>견인줄 분리</Korean>
             <Spanish>Desmontar cuerda de remolcado</Spanish>
+            <Portuguese>Soltar corda de reboque</Portuguese>
         </Key>
         <Key ID="STR_ACE_Towing_Setting_addRopeToVehicleInventory_DisplayName">
             <English>Add Tow Rope to Vehicle Inventory</English>
@@ -143,6 +154,7 @@
             <Japanese>車両のインベントリに牽引ロープを追加する</Japanese>
             <German>Abschleppseil zum Fahrzeuginventar hinzufügen</German>
             <French>Ajouter une corde à l'inventaire des véhicules</French>
+            <Portuguese>Adicionar corda de reboque ao inventário do veículo</Portuguese>
         </Key>
     </Package>
 </Project>
diff --git a/addons/trenches/CfgVehicles.hpp b/addons/trenches/CfgVehicles.hpp
index bec66e2e64..554a75149b 100644
--- a/addons/trenches/CfgVehicles.hpp
+++ b/addons/trenches/CfgVehicles.hpp
@@ -106,4 +106,44 @@ class CfgVehicles {
             MACRO_ADDITEM(ACE_EntrenchingTool,50);
         };
     };
+
+    class Wheeled_APC_F;
+    class APC_Wheeled_02_base_F: Wheeled_APC_F {
+        class EGVAR(interaction,anims);
+    };
+    class APC_Wheeled_02_base_v2_F: APC_Wheeled_02_base_F {
+        class EGVAR(interaction,anims): EGVAR(interaction,anims) {
+            class showTools {
+                phase = 0;
+                positions[] = {{-1.108, -1.47, -0.769}};
+                items[] = {"ACE_EntrenchingTool"};
+                name = CSTRING(EntrenchingToolName);
+                text = CSTRING(EntrenchingToolName);
+            };
+        };
+    };
+    class APC_Wheeled_03_base_F: Wheeled_APC_F {
+        class EGVAR(interaction,anims) {
+            class showTools {
+                phase = 0;
+                positions[] = {{-0.9, -3, -0.5}};
+                items[] = {"ACE_EntrenchingTool"};
+                name = CSTRING(EntrenchingToolName);
+                text = CSTRING(EntrenchingToolName);
+            };
+        };
+    };
+
+    class Tank_F;
+    class LT_01_base_F: Tank_F {
+        class EGVAR(interaction,anims) {
+            class showTools {
+                phase = 0;
+                positions[] = {{0.6, 0, -0.3}};
+                items[] = {"ACE_EntrenchingTool"};
+                name = CSTRING(EntrenchingToolName);
+                text = CSTRING(EntrenchingToolName);
+            };
+        };
+    };
 };
diff --git a/addons/trenches/stringtable.xml b/addons/trenches/stringtable.xml
index 4b47ee6a14..5242603bc2 100644
--- a/addons/trenches/stringtable.xml
+++ b/addons/trenches/stringtable.xml
@@ -237,6 +237,7 @@
             <Italian>Camuffa la trincea</Italian>
             <Japanese>塹壕を偽装</Japanese>
             <German>Graben tarnen</German>
+            <Portuguese>Camuflar trincheira</Portuguese>
         </Key>
         <Key ID="STR_ACE_Trenches_RemovingTrench">
             <English>Removing Trench</English>
@@ -265,6 +266,7 @@
             <Italian>ACE Trincee</Italian>
             <Chinesesimp>ACE 战壕</Chinesesimp>
             <Korean>ACE 참호</Korean>
+            <Portuguese>ACE Trincheiras</Portuguese>
         </Key>
         <Key ID="STR_ACE_Trenches_SmallEnvelopeDigDuration_DisplayName">
             <English>Small Trench Dig Duration</English>
@@ -277,6 +279,7 @@
             <Italian>Trincea piccola - Durata di scavo</Italian>
             <Chinesesimp>小型战壕挖掘时间</Chinesesimp>
             <Korean>소형참호 건설 시간</Korean>
+            <Portuguese>Duração de Escavamento de Trincheira Pequena</Portuguese>
         </Key>
         <Key ID="STR_ACE_Trenches_SmallEnvelopeDigDuration_Description">
             <English>Time, in seconds, required to dig a small trench.</English>
@@ -289,6 +292,7 @@
             <Italian>Tempo in secondi per scavare una trincea piccola.</Italian>
             <Chinesesimp>挖一条小型战壕所需的时间（秒）。</Chinesesimp>
             <Korean>소형 참호를 팔 때 필요한 시간을 설정합니다. (초 단위)</Korean>
+            <Portuguese>Tempo, em segundos, necessário para cavar uma trincheira pequena.</Portuguese>
         </Key>
         <Key ID="STR_ACE_Trenches_SmallEnvelopeRemoveDuration_DisplayName">
             <English>Small Trench Remove Duration</English>
@@ -301,6 +305,7 @@
             <Italian>Trincea piccola - Durata di rimozione</Italian>
             <Chinesesimp>小型战壕回填时间</Chinesesimp>
             <Korean>소형참호 제거 시간</Korean>
+            <Portuguese>Duração de Remoção de Trincheira Pequena</Portuguese>
         </Key>
         <Key ID="STR_ACE_Trenches_SmallEnvelopeRemoveDuration_Description">
             <English>Time, in seconds, required to remove a small trench.</English>
@@ -313,6 +318,7 @@
             <Italian>Tempo in secondi per rimuovere una trincea piccola.</Italian>
             <Chinesesimp>回填一条小型战壕所需的时间（秒）。</Chinesesimp>
             <Korean>소형 참호를 제거할때 필요한 시간을 설정합니다. (초 단위)</Korean>
+            <Portuguese>Tempo, em segundos, necessário para remover uma trincheira pequena.</Portuguese>
         </Key>
         <Key ID="STR_ACE_Trenches_BigEnvelopeDigDuration_DisplayName">
             <English>Big Trench Dig Duration</English>
@@ -325,6 +331,7 @@
             <Italian>Trincea grande - Durata di scavo</Italian>
             <Chinesesimp>大型战壕挖掘时间</Chinesesimp>
             <Korean>대형참호 건설 시간</Korean>
+            <Portuguese>Duração de Escavamento de Trincheira Grande</Portuguese>
         </Key>
         <Key ID="STR_ACE_Trenches_BigEnvelopeDigDuration_Description">
             <English>Time, in seconds, required to dig a big trench.</English>
@@ -337,6 +344,7 @@
             <Italian>Tempo in secondi per scavare una trincea grande.</Italian>
             <Chinesesimp>挖一条大型战壕所需的时间（秒）。</Chinesesimp>
             <Korean>대형 참호를 팔때 필요한 시간을 설정합니다. (초 단위)</Korean>
+            <Portuguese>Tempo, em segundos, necessário para cavar uma trincheira grande.</Portuguese>
         </Key>
         <Key ID="STR_ACE_Trenches_BigEnvelopeRemoveDuration_DisplayName">
             <English>Big Trench Remove Duration</English>
@@ -349,6 +357,7 @@
             <Italian>Trincea grande - Durata di rimozione</Italian>
             <Chinesesimp>大型战壕回填时间</Chinesesimp>
             <Korean>대형참호 제거 시간</Korean>
+            <Portuguese>Duração de Remoção de Trincheira Grande</Portuguese>
         </Key>
         <Key ID="STR_ACE_Trenches_BigEnvelopeRemoveDuration_Description">
             <English>Time, in seconds, required to remove a big trench.</English>
@@ -361,6 +370,7 @@
             <Italian>Tempo in secondi per rimuovere una trincea grande.</Italian>
             <Chinesesimp>回填一条大型战壕所需的时间（秒）。</Chinesesimp>
             <Korean>대형 참호를 제거할때 필요한 시간을 설정합니다. (초 단위)</Korean>
+            <Portuguese>Tempo, em segundos, necessário para remover uma trincheira grande.</Portuguese>
         </Key>
     </Package>
 </Project>
diff --git a/addons/ui/XEH_PREP.hpp b/addons/ui/XEH_PREP.hpp
index f7edabcc3f..436e59361c 100644
--- a/addons/ui/XEH_PREP.hpp
+++ b/addons/ui/XEH_PREP.hpp
@@ -1,5 +1,4 @@
 PREP(compileConfigUI);
-PREP(handlePlayerChanged);
 PREP(handleSpeedIndicator);
 PREP(moduleInit);
 PREP(onAnimChanged);
diff --git a/addons/ui/XEH_clientInit.sqf b/addons/ui/XEH_clientInit.sqf
index 1ef328b176..d9d3fa5717 100644
--- a/addons/ui/XEH_clientInit.sqf
+++ b/addons/ui/XEH_clientInit.sqf
@@ -4,11 +4,11 @@
 if (!hasInterface) exitWith {};
 
 // Compile and cache config UI
-GVAR(configCache) = call CBA_fnc_createNamespace;
+GVAR(configCache) = createHashMap;
 call FUNC(compileConfigUI);
 
 // Scripted API namespace
-GVAR(elementsSet) = call CBA_fnc_createNamespace;
+GVAR(elementsSet) = createHashMap;
 
 // Attach all event handlers where UI has to be updated
 ["CBA_settingsInitialized", {
@@ -21,7 +21,7 @@ GVAR(elementsSet) = call CBA_fnc_createNamespace;
         // Defaults must be set in this EH to make sure controls are activated and advanced settings can be modified
         {
             [_x, missionNamespace getVariable (format [QGVAR(%1), _x]), false, !GVAR(allowSelectiveUI)] call FUNC(setAdvancedElement);
-        } forEach (allVariables GVAR(configCache));
+        } forEach (keys GVAR(configCache));
 
         // Execute local event for when it's safe to modify UI through this API
         // infoDisplayChanged can execute multiple times, make sure it only happens once
@@ -40,12 +40,11 @@ GVAR(elementsSet) = call CBA_fnc_createNamespace;
             [true] call FUNC(setElements);
         } else {
             private _nameNoPrefix = toLowerANSI (_name select [7]);
-            private _cachedElement = GVAR(configCache) getVariable _nameNoPrefix;
-            if (!isNil "_cachedElement") then {
+            if (_nameNoPrefix in GVAR(configCache)) then {
                 [_nameNoPrefix, _value, true] call FUNC(setAdvancedElement);
             };
         };
     }] call CBA_fnc_addEventHandler;
 }] call CBA_fnc_addEventHandler;
 
-["unit", LINKFUNC(handlePlayerChanged), true] call CBA_fnc_addPlayerEventHandler;
+[QUOTE(ADDON), "AnimChanged", LINKFUNC(onAnimChanged), true] call EFUNC(common,addPlayerEH);
diff --git a/addons/ui/functions/fnc_compileConfigUI.sqf b/addons/ui/functions/fnc_compileConfigUI.sqf
index ef6ec1026a..960db9aed4 100644
--- a/addons/ui/functions/fnc_compileConfigUI.sqf
+++ b/addons/ui/functions/fnc_compileConfigUI.sqf
@@ -40,6 +40,6 @@
             TRACE_1("Caching Condition",_x);
         } forEach (configProperties [_x >> "conditions"]);
 
-        GVAR(configCache) setVariable [_class, [_idd, _elements, _location, _conditions]];
+        GVAR(configCache) set [_class, [_idd, _elements, _location, _conditions]];
     };
 } forEach ("true" configClasses (configFile >> "ACE_UI"));
diff --git a/addons/ui/functions/fnc_handlePlayerChanged.sqf b/addons/ui/functions/fnc_handlePlayerChanged.sqf
deleted file mode 100644
index 94f317a18c..0000000000
--- a/addons/ui/functions/fnc_handlePlayerChanged.sqf
+++ /dev/null
@@ -1,32 +0,0 @@
-#include "..\script_component.hpp"
-/*
- * Author: veteran29
- * Handles switching units.
- *
- * Arguments:
- * 0: New Unit <OBJECT>
- * 1: Old Unit <OBJECT>
- *
- * Return Value:
- * None
- *
- * Example:
- * [newbob, oldbob] call ace_ui_fnc_handlePlayerChanged
- *
- * Public: No
- */
-params ["_newUnit", "_oldUnit"];
-TRACE_2("unit changed",_newUnit,_oldUnit);
-
-if (!isNull _oldUnit) then {
-    _oldUnit removeEventHandler ["AnimChanged", _oldUnit getVariable [QGVAR(animHandler), -1]];
-    _oldUnit setVariable [QGVAR(animHandler), nil];
-    TRACE_1("remove old",_oldUnit getVariable QGVAR(animHandler));
-};
-
-// Don't add a new EH if the unit respawned
-if (_newUnit getVariable [QGVAR(animHandler), -1] == -1) then {
-    private _animHandler = _newUnit addEventHandler ["AnimChanged", LINKFUNC(onAnimChanged)];
-    TRACE_1("add new",_animHandler);
-    _newUnit setVariable [QGVAR(animHandler), _animHandler];
-};
diff --git a/addons/ui/functions/fnc_setAdvancedElement.sqf b/addons/ui/functions/fnc_setAdvancedElement.sqf
index 6751d9700c..86a1134802 100644
--- a/addons/ui/functions/fnc_setAdvancedElement.sqf
+++ b/addons/ui/functions/fnc_setAdvancedElement.sqf
@@ -20,7 +20,9 @@
 
 params ["_element", "_show", ["_showHint", false, [true]], ["_force", false, [true]]];
 
-private _cachedElement = GVAR(configCache) getVariable _element;
+_element = toLowerANSI _element;
+
+private _cachedElement = GVAR(configCache) get _element;
 if (isNil "_cachedElement") exitWith {TRACE_1("nil element",_this)};
 
 if (!_force && {!GVAR(allowSelectiveUI)}) exitWith {
@@ -56,7 +58,7 @@ if (
 
 // Get setting from scripted API
 if (!_force) then {
-    private _setElement = GVAR(elementsSet) getVariable _element;
+    private _setElement = GVAR(elementsSet) get _element;
     if (!isNil "_setElement") then {
         _setElement params ["_sourceSet", "_showSet"];
         if (_showHint) then {
diff --git a/addons/ui/functions/fnc_setElementVisibility.sqf b/addons/ui/functions/fnc_setElementVisibility.sqf
index f7f8dccd0c..938fb2da7d 100644
--- a/addons/ui/functions/fnc_setElementVisibility.sqf
+++ b/addons/ui/functions/fnc_setElementVisibility.sqf
@@ -32,12 +32,11 @@ if (_source == "" || {_element == ""}) exitWith {
 _element = toLowerANSI _element;
 
 // Verify element is bound
-private _cachedElement = GVAR(configCache) getVariable _element;
-if (isNil "_cachedElement") exitWith {
+if !(_element in GVAR(configCache)) exitWith {
     WARNING_2("Element '%1' does not exist - modification by '%2' failed.",_element,_source);
 };
 
-private _setElement = GVAR(elementsSet) getVariable _element;
+private _setElement = GVAR(elementsSet) get _element;
 private _return = false;
 
 if (isNil "_setElement") then {
@@ -45,7 +44,7 @@ if (isNil "_setElement") then {
     private _success = [_element, _show, false, true] call FUNC(setAdvancedElement);
 
     if (_success) then {
-        GVAR(elementsSet) setVariable [_element, [_source, _show]];
+        GVAR(elementsSet) set [_element, [_source, _show]];
         _return = true;
     };
 } else {
@@ -57,7 +56,7 @@ if (isNil "_setElement") then {
         };
     } else {
         TRACE_3("Unsetting element",_sourceSet,_element,_show);
-        GVAR(elementsSet) setVariable [_element, nil];
+        GVAR(elementsSet) set [_element, nil];
 
         [_element, _show, false, true] call FUNC(setAdvancedElement);
         _return = true;
diff --git a/addons/ui/stringtable.xml b/addons/ui/stringtable.xml
index 562abe2765..11089428c2 100644
--- a/addons/ui/stringtable.xml
+++ b/addons/ui/stringtable.xml
@@ -168,6 +168,7 @@
             <Italian>Filigrana per versione in fase di sviluppo</Italian>
             <Chinesesimp>开发建设水印</Chinesesimp>
             <Korean>개발용 빌드 워터마크</Korean>
+            <Portuguese>Marca d'agua de versão de desenvolvimento</Portuguese>
         </Key>
         <Key ID="STR_ACE_UI_WeaponName">
             <English>Weapon Name</English>
@@ -645,7 +646,7 @@
             <Portuguese>A modificação da interface do usuário está desabilitada.</Portuguese>
             <French>La personnalisation de l'Interface Utilisateur est désactivée.</French>
             <Russian>Изменение пользовательского интерфейса запрещено.</Russian>
-            <Japanese>ユーザ インターフェースの変更は無効化されています。</Japanese>
+            <Japanese>ユーザ インタフェースの変更は無効化されています。</Japanese>
             <Polish>Modyfikacja interfejsu użytkownika jest wyłączona.</Polish>
             <German>Die Modifizierung des UI ist deaktiviert.</German>
             <Korean>사용자 인터페이스 변경이 비활성화 되어 있습니다.</Korean>
@@ -659,7 +660,7 @@
             <Portuguese>Não é possível modificar um elemento forçado da interface do usuário.</Portuguese>
             <French>Impossible de modifier un élément forcé de l'Interface Utilisateur.</French>
             <Russian>Невозможно изменить зафиксированный элемент пользовательского интерфейса.</Russian>
-            <Japanese>ユーザ インターフェース要素の強制はできません。</Japanese>
+            <Japanese>ユーザ インタフェース要素の強制はできません。</Japanese>
             <Polish>Nie można modyfikować wymuszonego elementu interfejsu użytkownika.</Polish>
             <German>Gesperrte UI-Elemente können nicht modifiziert werden.</German>
             <Korean>강제 사용자 인터페이스는 변경하실 수 없습니다.</Korean>
@@ -680,6 +681,7 @@
             <Chinesesimp>启用移动速度指示器</Chinesesimp>
             <Korean>이동 속도 표시기 활성화</Korean>
             <Spanish>Habilitar indicador de velocidad de movimiento</Spanish>
+            <Portuguese>Habilitar indicador de velocidade de movimento</Portuguese>
         </Key>
         <Key ID="STR_ACE_UI_EnableSpeedIndicator_Description">
             <English>Enables movement speed indicator for player character.</English>
@@ -692,6 +694,7 @@
             <Chinesesimp>为玩家角色启用移动速度指示器。</Chinesesimp>
             <Korean>플레이어 캐릭터를 위한 이동속도 표시기를 활성화합니다.</Korean>
             <Spanish>Habilita el indicador de velocidad de movimiento para el personaje del jugador.</Spanish>
+            <Portuguese>Habilita o indicador de velocidade de movimento do personagem do jogador.</Portuguese>
         </Key>
         <Key ID="STR_ACE_UI_HideDefaultActionIcon">
             <English>Hide Default Action Icon</English>
@@ -704,6 +707,7 @@
             <German>Standardaktionssymbol ausblenden</German>
             <French>Masquer l'icône d'action par défaut</French>
             <Italian>Nascondi Icona dell'Interazione Standard</Italian>
+            <Portuguese>Esconder ícone padrão de ação</Portuguese>
         </Key>
         <Key ID="STR_ACE_UI_HideDefaultActionIcon_Description">
             <English>Hides the icon shown automatically when something is in front of the cursor. Requires a game restart.\nWarning: Does not remove the action itself! It is advisable to unbind 'Use default action' key to prevent unwanted interactions.</English>
@@ -716,6 +720,7 @@
             <German>Blendet das Symbol aus, das automatisch angezeigt wird, wenn sich etwas vor dem Cursor befindet. Erfordert einen Neustart des Spiels.\nWarnung: Die Aktion selbst wird nicht entfernt! Es empfiehlt sich, die Belegung der Taste 'Standardaktion verwenden' aufzuheben, um unerwünschte Interaktionen zu verhindern.</German>
             <French>Cache l'icône qui s'affiche automatiquement lorsque quelque chose est devant le curseur. Nécessite un redémarrage du jeu.\nAvertissement : l'action n'est pas supprimée ! Il est recommandé d'annuler l'affectation du bouton 'Utiliser l'action par défaut' afin d'éviter des interactions indésirables.</French>
             <Italian>Nasconde l'icona mostrata in automatico quando qualcosa è davanti al cursore. La modifica richiede un riavvio del gioco.\nAttenzione: Non rimuovere l'azione stessa! È consigliato rimuovere solo il tasto dall'assegnazione 'Usa Azione Standard' per impedire interazioni non volute.</Italian>
+            <Portuguese>Esconde o ícone mostrado automaticamente quando algo está a frente do cursor. É preciso reiniciar o jogo.\nAviso: Não remove a ação em si! É recomendado desvincular a tecla de "Usar ação padrão" para previnir interações indesejadas.</Portuguese>
         </Key>
     </Package>
 </Project>
diff --git a/addons/vector/functions/fnc_onKeyHold.sqf b/addons/vector/functions/fnc_onKeyHold.sqf
index 60a38ba96d..f19039851b 100644
--- a/addons/vector/functions/fnc_onKeyHold.sqf
+++ b/addons/vector/functions/fnc_onKeyHold.sqf
@@ -16,7 +16,7 @@
  * Public: No
  */
 
-if (!((currentWeapon ACE_player) isKindOf ["ACE_Vector", configFile >> "CfgWeapons"])) exitWith {
+if !((currentWeapon ACE_player) isKindOf ["ACE_Vector", configFile >> "CfgWeapons"]) exitWith {
     [_this select 1] call CBA_fnc_removePerFrameHandler;
 
     GVAR(currentMode) = "";
diff --git a/addons/vehicle_damage/XEH_postInit.sqf b/addons/vehicle_damage/XEH_postInit.sqf
index d14770dea0..9784d335ed 100644
--- a/addons/vehicle_damage/XEH_postInit.sqf
+++ b/addons/vehicle_damage/XEH_postInit.sqf
@@ -10,7 +10,7 @@
             TRACE_3("bailOut",_center,_crewman,_vehicle);
 
             if (isPlayer _crewman) exitWith {};
-            if (!alive _crewman || { !( [_crewman] call EFUNC(common,isAwake))} ) exitWith {};
+            if (!alive _crewman || {!([_crewman] call EFUNC(common,isAwake))}) exitWith {};
 
             unassignVehicle _crewman;
             _crewman leaveVehicle _vehicle;
@@ -31,26 +31,14 @@
             ["Car", "init", LINKFUNC(addEventHandler), true, [], true] call CBA_fnc_addClassEventHandler;
         };
 
-        // blow off turret effect
-        /*
-        Disabled temporarily due to issues with being able to repair tanks after death. Needs work
-        */
-        /*["Tank", "killed", {
-            if (random 1 < 0.15) then {
+        // Blow off turret effect
+        // TODO: Add blowing-off-turret effect to vehicles that cook-off but aren't destroyed (no catastrophic explosion)
+        // The problem is that vehicles are repairable if they haven't been destroyed. So if the turret is gone and vehicle is repaired, how do we handle that?
+        ["Tank", "Killed", {
+            if (_this select 3 && random 1 < 0.15) then {
                 (_this select 0) call FUNC(blowOffTurret);
             };
-        }, true, [], true] call CBA_fnc_addClassEventHandler;*/
-
-        // event to add a turret to a curator if the vehicle already belonged to that curator
-        if (isServer) then {
-            [QGVAR(addTurretToEditable), {
-                params ["_vehicle", "_turret"];
-
-                {
-                    _x addCuratorEditableObjects [[_turret], false];
-                } forEach (objectCurators _vehicle);
-            }] call CBA_fnc_addEventHandler;
-        };
+        }, true, [], true] call CBA_fnc_addClassEventHandler;
     };
 
     // init eject from destroyed vehicle
diff --git a/addons/vehicle_damage/functions/fnc_addEventHandler.sqf b/addons/vehicle_damage/functions/fnc_addEventHandler.sqf
index a7e59c75a1..05f8e084c2 100644
--- a/addons/vehicle_damage/functions/fnc_addEventHandler.sqf
+++ b/addons/vehicle_damage/functions/fnc_addEventHandler.sqf
@@ -28,8 +28,8 @@ private _hitpointHash = [[], nil] call CBA_fnc_hashCreate;
 private _vehicleConfig = configOf _vehicle;
 private _hitpointsConfig = _vehicleConfig >> "HitPoints";
 private _turretConfig = _vehicleConfig >> "Turrets";
-private _eraHitpoints = [_vehicleConfig >> QGVAR(eraHitpoints), "ARRAY", []] call CBA_fnc_getConfigEntry;
-private _slatHitpoints = [_vehicleConfig >> QGVAR(slatHitpoints), "ARRAY", []] call CBA_fnc_getConfigEntry;
+private _eraHitpoints = ([_vehicleConfig >> QGVAR(eraHitpoints), "ARRAY", []] call CBA_fnc_getConfigEntry) apply {toLowerANSI _x};
+private _slatHitpoints = ([_vehicleConfig >> QGVAR(slatHitpoints), "ARRAY", []] call CBA_fnc_getConfigEntry) apply {toLowerANSI _x};
 
 // Add hitpoint names to config for quick lookup
 {
diff --git a/addons/vehicle_damage/functions/fnc_blowOffTurret.sqf b/addons/vehicle_damage/functions/fnc_blowOffTurret.sqf
index a036f0045b..818fe6f6ef 100644
--- a/addons/vehicle_damage/functions/fnc_blowOffTurret.sqf
+++ b/addons/vehicle_damage/functions/fnc_blowOffTurret.sqf
@@ -4,7 +4,7 @@
  * Blow off turret effect.
  *
  * Arguments:
- * 0: Vehicle <Object>
+ * 0: Vehicle <OBJECT>
  *
  * Return Value:
  * None
@@ -15,13 +15,12 @@
  * Public: No
  */
 
-// delayed so the object is spawned after the model changes to a wreck
-// the sudden change in the model would cause nearby physx objects to get stuck
+// Delayed so the object is spawned after the model changes to a wreck
+// The sudden change in the model would cause nearby PhysX objects to get stuck
 [{
     params ["_vehicle"];
 
-    private _config = _vehicle call CBA_fnc_getObjectConfig;
-    getArray (_config >> QGVAR(turret)) params [["_model", "", [""]], ["_offset", [0,0,0], [[]], 3]];
+    (getArray (configOf _vehicle >> QGVAR(turret))) params [["_model", "", [""]], ["_offset", [0, 0, 0], [[]], 3]];
 
     if (_model isEqualTo "") exitWith {};
 
@@ -31,6 +30,8 @@
     _turret setVectorUp [random 1, random 1, 1];
     _turret setVelocity [random 7, random 7, 8 + random 5];
 
-    // add turret to all curators that already own the wreck
-    [QGVAR(addTurretToEditable), [_vehicle, _turret]] call CBA_fnc_serverEvent;
+    // Add turret to all curators that already own the wreck
+    if (["ace_zeus"] call EFUNC(common,isModLoaded)) then {
+        [QEGVAR(zeus,addObjects), [[_turret], objectCurators _vehicle]] call CBA_fnc_serverEvent;
+    };
 }, _this, 1] call CBA_fnc_waitAndExecute;
diff --git a/addons/vehicle_damage/functions/fnc_handleVehicleDamage.sqf b/addons/vehicle_damage/functions/fnc_handleVehicleDamage.sqf
index e18d8a3814..02033b83be 100644
--- a/addons/vehicle_damage/functions/fnc_handleVehicleDamage.sqf
+++ b/addons/vehicle_damage/functions/fnc_handleVehicleDamage.sqf
@@ -28,7 +28,7 @@ TRACE_6("handleVehicleDamage",_vehicle,_hitPoint,_hitIndex,_injurer,_oldDamage,_
 if !(alive _vehicle) exitWith {
     private _eventHandler = _vehicle getVariable[QGVAR(handleDamage), nil];
     if !(isNil "_eventHandler") then {
-        _vehicle removeEventHandler ["handleDamage", _eventHandler];
+        _vehicle removeEventHandler ["HandleDamage", _eventHandler];
     };
     LOG_1("Vehicle [%1] no longer alive",_vehicle);
     true
diff --git a/addons/vehicle_damage/functions/fnc_medicalDamage.sqf b/addons/vehicle_damage/functions/fnc_medicalDamage.sqf
index 2aa8969644..c5234cf1c1 100644
--- a/addons/vehicle_damage/functions/fnc_medicalDamage.sqf
+++ b/addons/vehicle_damage/functions/fnc_medicalDamage.sqf
@@ -23,7 +23,7 @@ params ["_unit", "_source", "_instigator", ["_guaranteeDeath", false]];
 // Check if unit is invulnerable
 if !(isDamageAllowed _unit && {_unit getVariable [QEGVAR(medical,allowDamage), true]}) exitWith {};
 
-if (["ace_medical"] call EFUNC(common,isModLoaded)) then {
+if (GETEGVAR(medical,enabled,false)) then {
     for "_i" from 0 to floor (4 + random 3) do {
         [_unit, random [0, 0.66, 1], selectRandom ["Head", "Body", "LeftArm", "RightArm", "LeftLeg", "RightLeg"], selectRandom ["bullet", "shell", "explosive"], _instigator] call EFUNC(medical,addDamageToUnit);
     };
diff --git a/addons/vehicle_damage/functions/fnc_processHit.sqf b/addons/vehicle_damage/functions/fnc_processHit.sqf
index 2402df7fc2..ff1a0adadd 100644
--- a/addons/vehicle_damage/functions/fnc_processHit.sqf
+++ b/addons/vehicle_damage/functions/fnc_processHit.sqf
@@ -313,11 +313,11 @@ switch (_hitArea) do {
     case "slat": {
         TRACE_2("hit slat",_warheadType,_warheadTypeStr);
         // incredibly small chance of AP destroying SLAT
-        if (_warheadType isEqualTo WARHEAD_TYPE_HEAT || { _warheadType isEqualTo WARHEAD_TYPE_TANDEM } || { _warheadType isEqualTo WARHEAD_TYPE_HE } || { 0.01 > random 1 }) then {
+        if (_warheadType in [WARHEAD_TYPE_HE, WARHEAD_TYPE_AP, WARHEAD_TYPE_HEAT, WARHEAD_TYPE_TANDEM] || { 0.01 > random 1 }) then {
             private _currentDamage = _vehicle getHitIndex _hitIndex;
             TRACE_3("damaged slat",_warheadType,_warheadTypeStr,_currentDamage);
 
-            if (_warheadType isEqualTo WARHEAD_TYPE_HEAT || { _warheadType isEqualTo WARHEAD_TYPE_TANDEM }) then {
+            if (_warheadType in [WARHEAD_TYPE_HEAT, WARHEAD_TYPE_TANDEM, WARHEAD_TYPE_AP]) then {
                 [_vehicle, _hitIndex, _hitpointName, 1] call FUNC(addDamage);
             } else {
                 [_vehicle, _hitIndex, _hitpointName, _currentDamage + (0.5 max random 1)] call FUNC(addDamage);
@@ -330,7 +330,7 @@ switch (_hitArea) do {
     };
     case "era": {
         TRACE_2("hit era",_warheadType,_warheadTypeStr);
-        if (_warheadType isEqualTo WARHEAD_TYPE_HEAT || { _warheadType isEqualTo WARHEAD_TYPE_TANDEM } || { 0.05 > random 1 }) then {
+        if (_warheadType in [WARHEAD_TYPE_AP, WARHEAD_TYPE_HEAT, WARHEAD_TYPE_TANDEM] || { 0.05 > random 1 }) then {
             private _currentDamage = _vehicle getHitIndex _hitIndex;
             TRACE_3("damaged era",_warheadType,_warheadTypeStr,_currentDamage);
             [_vehicle, _hitIndex, _hitpointName, 1] call FUNC(addDamage);
diff --git a/addons/vehicle_damage/stringtable.xml b/addons/vehicle_damage/stringtable.xml
index 4a8fdb4264..8e0bb6fe70 100644
--- a/addons/vehicle_damage/stringtable.xml
+++ b/addons/vehicle_damage/stringtable.xml
@@ -12,6 +12,7 @@
             <Korean>ACE 고급 차량 피해</Korean>
             <Russian>ACE Продвинутое повреждение техники</Russian>
             <Spanish>ACE Daño avanzado de vehículos</Spanish>
+            <Portuguese>ACE Dano avançãdo de veículos</Portuguese>
         </Key>
         <Key ID="STR_ACE_Vehicle_Damage_setting_description">
             <English>Enable/Disable advanced vehicle damage</English>
@@ -24,6 +25,7 @@
             <Korean>고급 차량 피해 활성화/비활성화</Korean>
             <Russian>Включить/выключить продвинутое повреждение техники</Russian>
             <Spanish>Habilitar/Deshabilitar el daño avanzado de vehículos</Spanish>
+            <Portuguese>Ativar/Desativar dano avançado de veículo</Portuguese>
         </Key>
         <Key ID="STR_ACE_Vehicle_Damage_carDamage_setting_description">
             <English>Enable/Disable advanced car damage (Experimental)</English>
@@ -36,6 +38,7 @@
             <Korean>고급 차량 피해(실험용) 활성화/비활성화</Korean>
             <Russian>Включить/выключить продвинутое повреждение машин (экспериментальное)</Russian>
             <Spanish>Habilita/Deshabilita el daño avanzado de coche (Experimental)</Spanish>
+            <Portuguese>Ativar/Desativar dano avançado de carro (Experimental)</Portuguese>
         </Key>
         <Key ID="STR_ACE_Vehicle_Damage_carDamage_setting_enable">
             <English>Enable/Disable advanced car damage</English>
@@ -48,6 +51,7 @@
             <Korean>고급 차량 피해 활성화/비활성화</Korean>
             <Russian>Продвинутое повреждение машин</Russian>
             <Spanish>Habilitar/Deshabilitar daño avanzado de coche (Experimental)</Spanish>
+            <Portuguese>Ativar/Desativar dano avançado de carro</Portuguese>
         </Key>
         <Key ID="STR_ACE_Vehicle_Damage_generic_turret_wreck">
             <English>Wreck (Turret)</English>
diff --git a/addons/vehiclelock/functions/fnc_addKeyForVehicle.sqf b/addons/vehiclelock/functions/fnc_addKeyForVehicle.sqf
index 6461e7fca2..4d0f065c06 100644
--- a/addons/vehiclelock/functions/fnc_addKeyForVehicle.sqf
+++ b/addons/vehiclelock/functions/fnc_addKeyForVehicle.sqf
@@ -23,8 +23,12 @@ if (!params [["_unit", objNull, [objNull]], ["_veh", objNull, [objNull]], ["_use
 };
 TRACE_3("params",_unit,_veh,_useCustom);
 
-if (isNull _unit) exitWith {ERROR("null unit");};
-if (isNull _veh) exitWith {ERROR("null vehicle");};
+if (isNull _unit) exitWith {
+    ERROR("null unit");
+};
+if (isNull _veh) exitWith {
+    ERROR("null vehicle");
+};
 
 if (_useCustom) then {
     private _previousMags = magazinesDetail _unit;
diff --git a/addons/vehiclelock/functions/fnc_lockpick.sqf b/addons/vehiclelock/functions/fnc_lockpick.sqf
index 4ef3289b45..7bb29395f0 100644
--- a/addons/vehiclelock/functions/fnc_lockpick.sqf
+++ b/addons/vehiclelock/functions/fnc_lockpick.sqf
@@ -33,7 +33,10 @@ if ((locked _veh) == 0) exitWith {false};
 if !("ACE_key_lockpick" in (_unit call EFUNC(common,uniqueItems))) exitWith {false};
 
 private _vehLockpickStrength = _veh getVariable[QGVAR(lockpickStrength), GVAR(DefaultLockpickStrength)];
-if (!(_vehLockpickStrength isEqualType 0)) exitWith {ERROR("ACE_vehicleLock_LockpickStrength invalid"); false};
+if !(_vehLockpickStrength isEqualType 0) exitWith {
+    ERROR("ACE_vehicleLock_LockpickStrength invalid");
+    false
+};
 
 //-1 indicates unpickable lock
 if (_vehLockpickStrength < 0) exitWith {false};
@@ -45,7 +48,7 @@ private _condition = {
     ((_unit distance _veh) < 5) && {(speed _veh) < 0.1}
 };
 
-if (!([[_unit, _veh]] call _condition)) exitWith {false};
+if !([[_unit, _veh]] call _condition) exitWith {false};
 
 private _returnValue = _funcType in ["canLockpick", "startLockpick", "finishLockpick"];
 switch (_funcType) do {
diff --git a/addons/vehiclelock/functions/fnc_moduleSync.sqf b/addons/vehiclelock/functions/fnc_moduleSync.sqf
index c29c7a06d2..a269fbd6e5 100644
--- a/addons/vehiclelock/functions/fnc_moduleSync.sqf
+++ b/addons/vehiclelock/functions/fnc_moduleSync.sqf
@@ -22,7 +22,7 @@ if (!isServer) exitWith {};
 params ["_logic", "_syncedObjects", "_activated"];
 TRACE_3("params",_logic,_syncedObjects,_activated);
 
-if !(_activated) exitWith {WARNING("Vehicle Lock Sync Module - placed but not active");};
+if (!_activated) exitWith {WARNING("Vehicle Lock Sync Module - placed but not active");};
 
 [{
     params ["_syncedObjects"];
diff --git a/addons/vehiclelock/stringtable.xml b/addons/vehiclelock/stringtable.xml
index 7cfa58d07a..7f89ec4950 100644
--- a/addons/vehiclelock/stringtable.xml
+++ b/addons/vehiclelock/stringtable.xml
@@ -79,7 +79,7 @@
             <Russian>Взламываем замок...</Russian>
             <Italian>Scassinando il veicolo...</Italian>
             <Portuguese>Usando Mixa...</Portuguese>
-            <Japanese>鍵をこじ開けている・・・</Japanese>
+            <Japanese>鍵をこじ開けています・・・</Japanese>
             <Korean>문따는 중...</Korean>
             <Chinesesimp>正在开锁...</Chinesesimp>
             <Chinese>解鎖中...</Chinese>
@@ -144,7 +144,7 @@
             <Russian>Ключ для открытия большинства машин Красных.</Russian>
             <Italian>Una chiave che apre la maggior parte dei veicoli occidentali</Italian>
             <Portuguese>Uma chave que abre a maioria dos veículos ocidentais</Portuguese>
-            <Japanese>このキーは多くの同盟軍車両を開けられます。</Japanese>
+            <Japanese>このキーは多くのBLUFOR軍車両を開けられます。</Japanese>
             <Korean>거의 모든 청군 진영 차량을 여는 열쇠입니다.</Korean>
             <Chinesesimp>一组解锁钥匙（可解锁大部份蓝方载具）</Chinesesimp>
             <Chinese>一組解鎖鑰匙 (可解鎖大部份藍方載具)</Chinese>
@@ -176,7 +176,7 @@
             <Russian>Ключ для открытия большинства машин Независимых.</Russian>
             <Italian>Una chiave che apre la maggior parte dei veicoli degli indipendenti.</Italian>
             <Portuguese>Uma chave que abre a maioria dos veículos independentes</Portuguese>
-            <Japanese>このキーは多くの独立軍車両を開けられます。</Japanese>
+            <Japanese>このキーは多くのINDEPENDENT軍車両を開けられます。</Japanese>
             <Korean>거의 모든 무소속군 진영 차량을 여는 열쇠입니다.</Korean>
             <Chinesesimp>一组解锁钥匙（可解锁大部份独立方载具）</Chinesesimp>
             <Chinese>一組解鎖鑰匙 (可解鎖大部份獨立方載具)</Chinese>
@@ -288,6 +288,7 @@
             <German>Unklaren Sperrzustand entfernen</German>
             <Chinesesimp>移除不明确的上锁状态</Chinesesimp>
             <Korean>불분명한 잠금상태 제거</Korean>
+            <Portuguese>Remover estado de bloqueio ambíguo</Portuguese>
         </Key>
         <Key ID="STR_ACE_VehicleLock_VehicleStartingLockState_AsIs">
             <English>As Is</English>
diff --git a/addons/vehicles/CfgWeapons.hpp b/addons/vehicles/CfgWeapons.hpp
index 2fbe4e5246..0c2eb0e4de 100644
--- a/addons/vehicles/CfgWeapons.hpp
+++ b/addons/vehicles/CfgWeapons.hpp
@@ -13,8 +13,7 @@ class CfgWeapons {
     class ACE_LMG_coax_DenelMG4: LMG_coax {};
 
     class LMG_Minigun: LMG_RCWS {
-        // Add the following: "2000Rnd_762x51_Belt_T_Green","2000Rnd_762x51_Belt_T_Red","2000Rnd_762x51_Belt_T_Yellow","5000Rnd_762x51_Belt","5000Rnd_762x51_Yellow_Belt"
-        magazines[] = {"PylonWeapon_2000Rnd_65x39_belt", "1000Rnd_65x39_Belt","1000Rnd_65x39_Belt_Green","1000Rnd_65x39_Belt_Tracer_Green","1000Rnd_65x39_Belt_Tracer_Red","1000Rnd_65x39_Belt_Tracer_Yellow","1000Rnd_65x39_Belt_Yellow","2000Rnd_65x39_Belt","2000Rnd_65x39_Belt_Green","2000Rnd_65x39_Belt_Tracer_Green","2000Rnd_65x39_Belt_Tracer_Green_Splash","2000Rnd_65x39_Belt_Tracer_Red","2000Rnd_65x39_Belt_Tracer_Yellow","2000Rnd_65x39_Belt_Tracer_Yellow_Splash","2000Rnd_65x39_Belt_Yellow","2000Rnd_762x51_Belt_T_Green","2000Rnd_762x51_Belt_T_Red","2000Rnd_762x51_Belt_T_Yellow","200Rnd_65x39_Belt","200Rnd_65x39_Belt_Tracer_Green","200Rnd_65x39_Belt_Tracer_Red","200Rnd_65x39_Belt_Tracer_Yellow","5000Rnd_762x51_Belt","5000Rnd_762x51_Yellow_Belt","500Rnd_65x39_Belt","500Rnd_65x39_Belt_Tracer_Red_Splash","500Rnd_65x39_Belt_Tracer_Green_Splash","500Rnd_65x39_Belt_Tracer_Yellow_Splash"};
+        magazines[] += {"2000Rnd_762x51_Belt_T_Green","2000Rnd_762x51_Belt_T_Red","2000Rnd_762x51_Belt_T_Yellow","5000Rnd_762x51_Belt","5000Rnd_762x51_Yellow_Belt"};
     };
 
     class HMG_127: LMG_RCWS {
diff --git a/addons/vehicles/stringtable.xml b/addons/vehicles/stringtable.xml
index 741901d75c..6148bcdd25 100644
--- a/addons/vehicles/stringtable.xml
+++ b/addons/vehicles/stringtable.xml
@@ -29,6 +29,7 @@
             <Russian>Круиз-контроль включён</Russian>
             <Spanish>Control de crucero encendido</Spanish>
             <French>Régulateur de vitesse activé</French>
+            <Portuguese>Controle de cruzeiro ativado</Portuguese>
         </Key>
         <Key ID="STR_ACE_Vehicles_Off">
             <English>Speed Limiter off</English>
@@ -58,6 +59,7 @@
             <Russian>Круиз-контроль выключен</Russian>
             <Spanish>Control de crucero apagado</Spanish>
             <French>Régulateur de vitesse désactivé</French>
+            <Portuguese>Controle de cruzeiro desativado</Portuguese>
         </Key>
         <Key ID="STR_ACE_Vehicles_SpeedLimit">
             <English>Speed Limit</English>
diff --git a/addons/viewdistance/stringtable.xml b/addons/viewdistance/stringtable.xml
index eb7ed94838..2c2e92d24e 100644
--- a/addons/viewdistance/stringtable.xml
+++ b/addons/viewdistance/stringtable.xml
@@ -129,6 +129,7 @@
             <Russian>Значение 0 будет использовать настройки видео по умолчанию</Russian>
             <Spanish>Establecer a 0 utiliza las opciones de video por defecto</Spanish>
             <French>La valeur 0 permet d'utiliser les paramètres vidéo par défaut</French>
+            <Portuguese>Estabelecer em 0 utilizará as configurações padrão de vídeo</Portuguese>
         </Key>
         <Key ID="STR_ACE_ViewDistance_onFoot_DisplayName">
             <English>Client View Distance (On Foot)</English>
diff --git a/addons/viewports/functions/fnc_eachFrame.sqf b/addons/viewports/functions/fnc_eachFrame.sqf
index 068a5edcf5..21f2f09dc8 100644
--- a/addons/viewports/functions/fnc_eachFrame.sqf
+++ b/addons/viewports/functions/fnc_eachFrame.sqf
@@ -27,7 +27,7 @@ private _newIndex = -1;
 if (cba_events_control) then {
     if (cameraView != "INTERNAL") exitWith {};
     if (isTurnedOut _player) exitWith {};
-    if (!([_player, _vehicle, []] call EFUNC(common,canInteractWith))) exitWith {};
+    if !([_player, _vehicle, []] call EFUNC(common,canInteractWith)) exitWith {};
 
     BEGIN_COUNTER(newIndex);
     if ((_shownIndex > -1) && {currentVisionMode _player != _lastVisionMode}) then {
diff --git a/addons/viewports/functions/fnc_getSeatInfo.sqf b/addons/viewports/functions/fnc_getSeatInfo.sqf
index 86dccebdd1..01c71c3cfe 100644
--- a/addons/viewports/functions/fnc_getSeatInfo.sqf
+++ b/addons/viewports/functions/fnc_getSeatInfo.sqf
@@ -41,6 +41,6 @@ private _compartment = switch (_role) do {
     };
 };
 
-if (!(_compartment isEqualType "")) then { _compartment = format ["Compartment%1",_compartment] };
+if !(_compartment isEqualType "") then {_compartment = format ["Compartment%1",_compartment]};
 
 [_role, _cargoIndex, _turretPath, _compartment]
diff --git a/addons/viewports/stringtable.xml b/addons/viewports/stringtable.xml
index be78cdc995..22f7d77813 100644
--- a/addons/viewports/stringtable.xml
+++ b/addons/viewports/stringtable.xml
@@ -12,6 +12,7 @@
             <Spanish>Periscopios</Spanish>
             <German>Sichtfenster</German>
             <French>Périscopes</French>
+            <Portuguese>Periscópios</Portuguese>
         </Key>
         <Key ID="STR_ACE_Viewports_setting_enabled_description">
             <English>Allows crew to look through periscopes</English>
@@ -24,6 +25,7 @@
             <Spanish>Permite a la tripulación asomarse a través de los periscopios</Spanish>
             <German>Ermöglicht der Besatzung den Blick durch Periskope</German>
             <French>Permet à l'équipage de regarder à travers des périscopes.</French>
+            <Portuguese>Permite que a tripulação olhe através de periscópios</Portuguese>
         </Key>
     </Package>
 </Project>
diff --git a/addons/viewrestriction/functions/fnc_changeCamera.sqf b/addons/viewrestriction/functions/fnc_changeCamera.sqf
index 6a1f7d03ff..eb6907386a 100644
--- a/addons/viewrestriction/functions/fnc_changeCamera.sqf
+++ b/addons/viewrestriction/functions/fnc_changeCamera.sqf
@@ -18,7 +18,7 @@
 
 params ["_newCameraView", "_cameraOn"];
 
-if (! ([_newCameraView, _cameraOn] call FUNC(canChangeCamera))) exitWith {};
+if !([_newCameraView, _cameraOn] call FUNC(canChangeCamera)) exitWith {};
 
 TRACE_1("View Restricted",XGVAR(mode));
 
diff --git a/addons/viewrestriction/stringtable.xml b/addons/viewrestriction/stringtable.xml
index fee4a9bf33..7356e6412f 100644
--- a/addons/viewrestriction/stringtable.xml
+++ b/addons/viewrestriction/stringtable.xml
@@ -15,6 +15,7 @@
             <Russian>Ограничение обзора</Russian>
             <Turkish>Görüntüyü Kısıtla</Turkish>
             <Spanish>Reestricción de Vista</Spanish>
+            <Portuguese>Restrição do Modo de Visão</Portuguese>
         </Key>
         <Key ID="STR_ACE_ViewRestriction_ModuleDescription">
             <English>View restriction settings to limit the usage of 1st or 3rd person views globally or per vehicle type.</English>
@@ -29,6 +30,7 @@
             <Russian>Настройки ограничения обзора при виде от 1-го или 3-го лица. Общие для всех, или Выборочные, в зависимости от техники.</Russian>
             <Turkish>1. veya 3. kişi görünümlerinin kullanımını genel olarak veya araç türüne göre sınırlamak için kısıtlama ayarlarını görüntüleyin.</Turkish>
             <Spanish>Opciones de Reestricción de Vista para limitar el uso de 1º o 3º persona globalmente o según el tipo de vehículo.</Spanish>
+            <Portuguese>A restrição do modo de visão limita o uso de 1ª ou 3ª pessoa globalmente ou por tipo de veículo.</Portuguese>
         </Key>
         <Key ID="STR_ACE_ViewRestriction_Mode">
             <English>Mode</English>
@@ -44,6 +46,7 @@
             <Russian>Режим установок</Russian>
             <Turkish>Mod</Turkish>
             <Spanish>Modo</Spanish>
+            <Portuguese>Modo</Portuguese>
         </Key>
         <Key ID="STR_ACE_ViewRestriction_ModeDesc">
             <English>Sets global mode. Default: Disabled</English>
@@ -59,6 +62,7 @@
             <Russian>Общие установки для всех. По умолчанию: Отключено.</Russian>
             <Turkish>Global modu ayarlar. Varsayılan: Devre Dışı</Turkish>
             <Spanish>Establece el modo global. Defecto: Deshabilitado</Spanish>
+            <Portuguese>Define o modo global. Padrão: Desabilitado</Portuguese>
         </Key>
         <Key ID="STR_ACE_ViewRestriction_ModeSelectiveFoot">
             <English>(Selective) Foot</English>
@@ -74,6 +78,7 @@
             <Russian>(Выборочные) Пешком</Russian>
             <Turkish>(Seçilebilir) Ayakta</Turkish>
             <Spanish>(Selectivo) Pie</Spanish>
+            <Portuguese>(Seletivo) A pé</Portuguese>
         </Key>
         <Key ID="STR_ACE_ViewRestriction_ModeSelectiveFootDesc">
             <English>Selective mode on Foot. Default: Disabled (Requires Mode: Selective)</English>
@@ -89,6 +94,7 @@
             <Russian>Выборочные установки без техники. По умолчанию: Отключено (требуется режим: Выборочные)</Russian>
             <Turkish>Ayakta iken seçilen görüş modu. Varsayılan: Etkin Değil</Turkish>
             <Spanish>Modo selectivo a pie. Defecto: Deshabilitado (Requiere Modo: Selectivo)</Spanish>
+            <Portuguese>Modo seletivo a pé. Padrão: Desabilitado (Modo necessário: Seletivo)</Portuguese>
         </Key>
         <Key ID="STR_ACE_ViewRestriction_ModeSelectiveLand">
             <English>(Selective) Land Vehicles</English>
@@ -104,6 +110,7 @@
             <Russian>(Выборочные) Наземная техника</Russian>
             <Turkish>(Seçilebilir) Kara Araçları</Turkish>
             <Spanish>(Selectivo) Vehículos de tierra</Spanish>
+            <Portuguese>(Seletivo) Veículos terrestres</Portuguese>
         </Key>
         <Key ID="STR_ACE_ViewRestriction_ModeSelectiveLandDesc">
             <English>Selective mode in Land Vehicles. Default: Disabled (Requires Mode: Selective)</English>
@@ -119,6 +126,7 @@
             <Russian>Выборочные установки для наземной техники. По умолчанию: Отключено (требуется режим: Выборочные)</Russian>
             <Turkish>Kara araçlarında iken seçilen görüş modu. Varsayılan: Etkin Değil</Turkish>
             <Spanish>Modo selectivo en vehículos de tierra.Defecto: Deshabilitado (Requiere Modo: Selectivo)</Spanish>
+            <Portuguese>Modo seletivo em veículos terrestres. Padrão: Desabilitado (Modo necessário: Seletivo)</Portuguese>
         </Key>
         <Key ID="STR_ACE_ViewRestriction_ModeSelectiveAir">
             <English>(Selective) Air Vehicles</English>
@@ -134,6 +142,7 @@
             <Russian>(Выборочные) Авиатехника</Russian>
             <Turkish>(Seçilebilir) Hava Araçları</Turkish>
             <Spanish>(Selectivo) Vehículos aéreos</Spanish>
+            <Portuguese>(Seletivo) Aeronaves</Portuguese>
         </Key>
         <Key ID="STR_ACE_ViewRestriction_ModeSelectiveAirDesc">
             <English>Selective mode in Air Vehicles. Default: Disabled (Requires Mode: Selective)</English>
@@ -149,6 +158,7 @@
             <Russian>Выборочные установки для авиатехники. По умолчанию: Отключено (требуется режим: Выборочные)</Russian>
             <Turkish>Hava araçlarında iken seçilen görüş modu. Varsayılan: Etkin Değil</Turkish>
             <Spanish>Modo selectivo en vehículos aéreos. Defecto: Deshabilitado (Requiere Modo: Selectivo)</Spanish>
+            <Portuguese>Modo seletivo em aeronaves. Padrão: Desabilitado (Modo necessário: Seletivo)</Portuguese>
         </Key>
         <Key ID="STR_ACE_ViewRestriction_ModeSelectiveSea">
             <English>(Selective) Sea Vehicles</English>
@@ -164,6 +174,7 @@
             <Russian>(Выборочные) Водный транспорт</Russian>
             <Turkish>(Seçilebilir) Deniz Araçları</Turkish>
             <Spanish>(Selectivo) Vehículos marítimos</Spanish>
+            <Portuguese>(Seletivo) Veículos aquáticos</Portuguese>
         </Key>
         <Key ID="STR_ACE_ViewRestriction_ModeSelectiveSeaDesc">
             <English>Selective mode in Sea Vehicles. Default: Disabled (Requires Mode: Selective)</English>
@@ -179,6 +190,7 @@
             <Russian>Выборочные установки для водного транспорта. По умолчанию: Отключено (требуется режим: Выборочные)</Russian>
             <Turkish>Deniz araçlarında iken seçilen görüş modu. Varsayılan: Etkin Değil</Turkish>
             <Spanish>Modo selectivo en vehículos marítimos. Defecto: Deshabilitado (Requiere Modo: Selectivo)</Spanish>
+            <Portuguese>Modo seletivo em veículos aquáticos. Padrão: Desabilitado (Modo necessário: Seletivo)</Portuguese>
         </Key>
         <Key ID="STR_ACE_ViewRestriction_ModeSelectiveUAV">
             <English>(Selective) UAVs</English>
@@ -194,6 +206,7 @@
             <Russian>(Выборочные) Беспиплотники</Russian>
             <Turkish>(Seçilebilir) IHA'lar</Turkish>
             <Spanish>(Selectivo) VANTs</Spanish>
+            <Portuguese>(Seletivo) VANTs</Portuguese>
         </Key>
         <Key ID="STR_ACE_ViewRestriction_ModeSelectiveUAVDesc">
             <English>Selective mode in UAVs. Default: Disabled (Requires Mode: Selective)</English>
@@ -209,6 +222,7 @@
             <Russian>Выборочные установки для беспилотников. По умолчанию: Отключено (требуется режим: Выборочные)</Russian>
             <Turkish>IHA araçlarında iken seçilen görüş modu. Varsayılan: Etkin Değil</Turkish>
             <Spanish>Modo selectivo en VANTs. Defecto: Deshabilitado (Requiere Modo: Selectivo)</Spanish>
+            <Portuguese>Modo seletivo em VANTs. Padrão: Desabilitado (Modo necessário: Seletivo)</Portuguese>
         </Key>
         <Key ID="STR_ACE_ViewRestriction_Disabled">
             <English>Disabled</English>
@@ -224,6 +238,7 @@
             <Russian>Отключено</Russian>
             <Turkish>Devre Dışı</Turkish>
             <Spanish>Deshabilitado</Spanish>
+            <Portuguese>Desabilitado</Portuguese>
         </Key>
         <Key ID="STR_ACE_ViewRestriction_FirstPerson">
             <English>Forced 1st Person</English>
@@ -238,6 +253,7 @@
             <Russian>От 1-го лица (принудительно)</Russian>
             <Turkish>1. Kişi Görüşüne Zorla</Turkish>
             <Spanish>Forzada 1º persona</Spanish>
+            <Portuguese>Forçada 1ª pessoa</Portuguese>
         </Key>
         <Key ID="STR_ACE_ViewRestriction_ThirdPerson">
             <English>Forced 3rd Person</English>
@@ -252,6 +268,7 @@
             <Russian>От 3-го лица (принудительно)</Russian>
             <Turkish>3. Kişi Görüşüne Zorla</Turkish>
             <Spanish>Forzada 3º persona</Spanish>
+            <Portuguese>Forçada 3ª pessoa</Portuguese>
         </Key>
         <Key ID="STR_ACE_ViewRestriction_Selective">
             <English>Selective</English>
@@ -267,6 +284,7 @@
             <Russian>Выборочный</Russian>
             <Turkish>Seçilebilinir</Turkish>
             <Spanish>Selectivo</Spanish>
+            <Portuguese>Seletivo</Portuguese>
         </Key>
         <Key ID="STR_ACE_ViewRestriction_SettingPreserveViewName">
             <English>Preserve view for vehicle types</English>
@@ -281,6 +299,7 @@
             <Korean>차량 타입에 따른 시야 정보 저장</Korean>
             <Spanish>Preservar vista para los tipos de vehículos</Spanish>
             <French>Conserver la vue pour les types de véhicules</French>
+            <Portuguese>Mantém o modo de visão por tipo de veículo</Portuguese>
         </Key>
         <Key ID="STR_ACE_ViewRestriction_SettingPreserveViewDesc">
             <English>Switch view on vehicle change to last used in this vehicle type (Requires Mode: Disabled)</English>
@@ -295,6 +314,7 @@
             <Korean>해당 차량 타입에서 마지막으로 사용했던 시야로 설정하여 봅니다 (모드 - 사용 안함 필요)</Korean>
             <Spanish>Cambiar vista en el cambio de vehículo hacia la última usada en ese tipo de vehículo (Requiere Modo: Deshabilitado)</Spanish>
             <French>Lors d'un changement de véhicule, change la vue pour la dernière utilisée dans ce type de véhicule (Mod requis : désactivé).</French>
+            <Portuguese>Ao trocar de veículo, troca o modo de visão para aquele usado anteriormente no mesmo tipo de veículo (Modo necessário: Desabilitado)</Portuguese>
         </Key>
     </Package>
 </Project>
diff --git a/addons/volume/stringtable.xml b/addons/volume/stringtable.xml
index feecb28b10..08aae728a1 100644
--- a/addons/volume/stringtable.xml
+++ b/addons/volume/stringtable.xml
@@ -14,6 +14,7 @@
             <Polish>Głosność</Polish>
             <Turkish>Ses</Turkish>
             <Spanish>Volumen</Spanish>
+            <Portuguese>Volume</Portuguese>
         </Key>
         <Key ID="STR_ACE_Volume_KeybindName">
             <English>Toggle Volume</English>
@@ -28,6 +29,7 @@
             <Polish>Przełącz Głosność</Polish>
             <Turkish>Sesi Aç/Kapat</Turkish>
             <Spanish>Activar control de volumen</Spanish>
+            <Portuguese>Alternar volume</Portuguese>
         </Key>
         <Key ID="STR_ACE_Volume_KeybindDescription">
             <English>Toggle volume reduction.</English>
@@ -42,6 +44,7 @@
             <Polish>Przełącz redukcje głosności</Polish>
             <Turkish>Ses azaltmayı aç / kapat.</Turkish>
             <Spanish>Activar reducción de volumen.</Spanish>
+            <Portuguese>Alternar redução de volume</Portuguese>
         </Key>
         <Key ID="STR_ACE_Volume_Lowered">
             <English>Lowered volume</English>
@@ -56,6 +59,7 @@
             <Polish>Zmniejszona głosność</Polish>
             <Turkish>Azaltılmış ses</Turkish>
             <Spanish>Volumen reducido</Spanish>
+            <Portuguese>Volume reduzido</Portuguese>
         </Key>
         <Key ID="STR_ACE_Volume_Restored">
             <English>Restored volume</English>
@@ -69,6 +73,7 @@
             <Russian>Громкость восстановлена</Russian>
             <Polish>Przywrócona głosność</Polish>
             <Spanish>Volumen restaurado</Spanish>
+            <Portuguese>Volume restaurado</Portuguese>
         </Key>
         <Key ID="STR_ACE_Volume_Reduction">
             <English>Reduction</English>
@@ -82,6 +87,7 @@
             <Russian>Уменьшение</Russian>
             <Polish>Redukcja</Polish>
             <Spanish>Reducción</Spanish>
+            <Portuguese>Redução</Portuguese>
         </Key>
         <Key ID="STR_ACE_Volume_ReductionDescription">
             <English>Reduce volume by this percentage.</English>
@@ -95,6 +101,7 @@
             <Russian>Уменьшает громкость</Russian>
             <Polish>Zmniejsz głosność o tyle procent</Polish>
             <Spanish>Reducir el volumen este porcentaje.</Spanish>
+            <Portuguese>Reduzir o volume por esta porcentagem.</Portuguese>
         </Key>
         <Key ID="STR_ACE_Volume_LowerInVehicles">
             <English>Lower in vehicles</English>
@@ -109,6 +116,7 @@
             <Polish>Zmniejsz w pojazdach</Polish>
             <Turkish>Araçlarda Daha Düşük</Turkish>
             <Spanish>Reducir en vehículos</Spanish>
+            <Portuguese>Reduzir em veículos</Portuguese>
         </Key>
         <Key ID="STR_ACE_Volume_LowerInVehiclesDescription">
             <English>Automatically lower volume when inside vehicles.</English>
@@ -123,6 +131,7 @@
             <Polish>Automatycznie zmniejsz głosność będąc w pojeździe</Polish>
             <Turkish>Araçlara binince sesi azalt.</Turkish>
             <Spanish>Reduce automáticamente el volumen dentro de vehículos.</Spanish>
+            <Portuguese>Reduz automaticamente o volume dentro de veículos.</Portuguese>
         </Key>
         <Key ID="STR_ACE_Volume_ShowNotification">
             <English>Show notification</English>
@@ -137,6 +146,7 @@
             <Polish>Pokaż powiadomienie</Polish>
             <Turkish>Bildirim Göster</Turkish>
             <Spanish>Mostrar notificación</Spanish>
+            <Portuguese>Mostrar notificação</Portuguese>
         </Key>
         <Key ID="STR_ACE_Volume_ShowNotificationDescription">
             <English>Show notification when lowering/restoring volume.</English>
@@ -151,6 +161,7 @@
             <Polish>Pokaż powiadomienie zmniejszając/odnawiając głosność</Polish>
             <Turkish>Ses azaltıldığın da bildirim göster.</Turkish>
             <Spanish>Mostrar notificación cuando se disminuye/restaura el volumen.</Spanish>
+            <Portuguese>Mostrar notificação quando o volume for reduzido/restaurado</Portuguese>
         </Key>
         <Key ID="STR_ACE_Volume_FadeDelay">
             <English>Fade delay</English>
@@ -164,6 +175,7 @@
             <Russian>Задержка затухания</Russian>
             <Polish>Opoznienie wyciszenia</Polish>
             <Spanish>Retardo en disminución gradual</Spanish>
+            <Portuguese>Atraso de alteração gradual de volume</Portuguese>
         </Key>
         <Key ID="STR_ACE_Volume_FadeDelayDescription">
             <English>Time it takes (in seconds) for the sound to fade in/out.</English>
@@ -177,6 +189,7 @@
             <Russian>Время (сек.) для затухания/восстановления звука.</Russian>
             <Polish>Ilość czasu (w sekundach) ile zajmuje wyciszenie/zgłośnienie dźwięku</Polish>
             <Spanish>Tiempo que tarda (en segundos) para que se active o desactive la disminuación gradual del volumen</Spanish>
+            <Portuguese>Tempo de atraso (em segundos) para que o volume do som sofra alteração gradual</Portuguese>
         </Key>
         <Key ID="STR_ACE_Volume_RemindIfLowered">
             <English>Reminder if lowered</English>
@@ -191,6 +204,7 @@
             <Polish>Przypomnij o zmniejszonej głosności dźwięku</Polish>
             <Turkish>Eğer Düşükse Hatırlat</Turkish>
             <Spanish>Recordatorio s reducido</Spanish>
+            <Portuguese>Lembrete de redução sonora</Portuguese>
         </Key>
         <Key ID="STR_ACE_Volume_RemindIfLoweredDescription">
             <English>Reminds you every minute if your volume is lowered.</English>
@@ -205,6 +219,7 @@
             <Polish>Przypomina co minuten o zmniejszonej głosności dźwięku</Polish>
             <Turkish>Eğer ses düşükse her dakika hatırlatır.</Turkish>
             <Spanish>Te recuerda cada minuto si el volumen está siendo reducido.</Spanish>
+            <Portuguese>Te notifica a cada minuto se o volume sonoro estiver reduzido.</Portuguese>
         </Key>
         <Key ID="STR_ACE_Volume_LoweredReminder">
             <English>Volume still lowered</English>
@@ -219,6 +234,7 @@
             <Polish>Dźwięk jest nadal zmniejszony</Polish>
             <Turkish>Ses hala düşük</Turkish>
             <Spanish>Volumen todavía reducido</Spanish>
+            <Portuguese>Volume ainda está reduzido</Portuguese>
         </Key>
     </Package>
 </Project>
diff --git a/addons/weaponselect/XEH_postInit.sqf b/addons/weaponselect/XEH_postInit.sqf
index 77a2fc673b..e9f05de8bb 100644
--- a/addons/weaponselect/XEH_postInit.sqf
+++ b/addons/weaponselect/XEH_postInit.sqf
@@ -198,7 +198,7 @@ if (!hasInterface) exitWith {};
 
 ["ACE3 Vehicles", QGVAR(CollisionLights), localize LSTRING(CollisionLights), {
     // Conditions: canInteract
-    if (!([ACE_player, vehicle ACE_player, []] call EFUNC(common,canInteractWith))) exitWith {false};
+    if !([ACE_player, vehicle ACE_player, []] call EFUNC(common,canInteractWith)) exitWith {false};
     // Conditions: specific
     if ((ACE_player isEqualTo (vehicle ACE_player)) || {ACE_player != (driver (vehicle ACE_player))}) exitWith {false};
 
diff --git a/addons/weaponselect/XEH_preInit.sqf b/addons/weaponselect/XEH_preInit.sqf
index 92ba1b06a6..e699f3d2f3 100644
--- a/addons/weaponselect/XEH_preInit.sqf
+++ b/addons/weaponselect/XEH_preInit.sqf
@@ -11,18 +11,22 @@ GVAR(GrenadesAll) = [];
 GVAR(GrenadesFrag) = [];
 GVAR(GrenadesNonFrag) = [];
 
+private _cfgMagazines = configFile >> "CfgMagazines";
+private _cfgAmmo = configFile >> "CfgAmmo";
+private _cfgThrow = configFile >> "CfgWeapons" >> "Throw";
+
 {
-    private _magazines = getArray (configFile >> "CfgWeapons" >> "Throw" >> _x >> "magazines");
+    private _magazines = getArray (_cfgThrow >> _x >> "magazines");
 
     GVAR(GrenadesAll) append _magazines;
 
     {
-        private _ammo = getText (configFile >> "CfgMagazines" >> _x >> "ammo");
-        private _explosive = getNumber (configFile >> "CfgAmmo" >> _ammo >> "explosive");
+        private _ammo = getText (_cfgMagazines >> _x >> "ammo");
+        private _explosive = getNumber (_cfgAmmo >> _ammo >> "explosive");
 
         ([GVAR(GrenadesFrag), GVAR(GrenadesNonFrag)] select (_explosive == 0)) pushBack _x;
     } forEach _magazines;
-} forEach getArray (configFile >> "CfgWeapons" >> "Throw" >> "muzzles");
+} forEach getArray (_cfgThrow >> "muzzles");
 
 #include "initSettings.inc.sqf"
 
diff --git a/addons/weaponselect/functions/fnc_playChangeFiremodeSound.sqf b/addons/weaponselect/functions/fnc_playChangeFiremodeSound.sqf
index fc55b54b5f..641787a394 100644
--- a/addons/weaponselect/functions/fnc_playChangeFiremodeSound.sqf
+++ b/addons/weaponselect/functions/fnc_playChangeFiremodeSound.sqf
@@ -35,3 +35,5 @@ if !(toLowerANSI (_filename select [count _filename - 4]) in [".wav", ".ogg", ".
 };
 
 playSound3D [_filename, objNull, false, _position, _volume, _soundPitch, _distance];
+
+nil // return
diff --git a/addons/weaponselect/functions/fnc_selectNextGrenade.sqf b/addons/weaponselect/functions/fnc_selectNextGrenade.sqf
index ff111a93f6..ad17c7f18d 100644
--- a/addons/weaponselect/functions/fnc_selectNextGrenade.sqf
+++ b/addons/weaponselect/functions/fnc_selectNextGrenade.sqf
@@ -61,14 +61,14 @@ private _vestGrenades =     vestItems     _unit select {_x in GVAR(GrenadesAll)
 private _backpackGrenades = backpackItems _unit select {_x in GVAR(GrenadesAll) && {_x != _nextGrenade}};
 
 // remove all grenades except those we are switching to --> this breaks the selector
-{_unit removeItemFromUniform  _x; false} count _uniformGrenades;
-{_unit removeItemFromVest     _x; false} count _vestGrenades;
-{_unit removeItemFromBackpack _x; false} count _backpackGrenades;
+{_unit removeItemFromUniform  _x} forEach _uniformGrenades;
+{_unit removeItemFromVest     _x} forEach _vestGrenades;
+{_unit removeItemFromBackpack _x} forEach _backpackGrenades;
 
 // readd grenades
-{_unit addItemToUniform  _x; false} count _uniformGrenades;
-{_unit addItemToVest     _x; false} count _vestGrenades;
-{_unit addItemToBackpack _x; false} count _backpackGrenades;
+{_unit addItemToUniform  _x} forEach _uniformGrenades;
+{_unit addItemToVest     _x} forEach _vestGrenades;
+{_unit addItemToBackpack _x} forEach _backpackGrenades;
 
 [_nextGrenade, {_x == _nextGrenade} count _magazines] call FUNC(displayGrenadeTypeAndNumber);
 
diff --git a/addons/weaponselect/functions/fnc_selectWeaponMode.sqf b/addons/weaponselect/functions/fnc_selectWeaponMode.sqf
index f2810bb512..3a63e1097f 100644
--- a/addons/weaponselect/functions/fnc_selectWeaponMode.sqf
+++ b/addons/weaponselect/functions/fnc_selectWeaponMode.sqf
@@ -18,35 +18,23 @@
 
 params ["_unit", "_weapon"];
 
-if (_weapon == "") exitWith {};
+if (_weapon == "" || {!(_unit hasWeapon _weapon)}) exitWith {};
+
+private _currentWeaponMode = (_unit weaponState _weapon) select 2;
+private _muzzle = (_weapon call EFUNC(common,getWeaponMuzzles)) select 0;
 
 if (currentWeapon _unit != _weapon) exitWith {
-    _unit selectWeapon _weapon;
+    _unit selectWeapon [_weapon, _muzzle, _currentWeaponMode];
 };
 
-// unlock safety
-if (_weapon in (_unit getVariable [QEGVAR(safemode,safedWeapons), []])) exitWith {
-    [_unit, _weapon, _weapon] call EFUNC(safemode,unlockSafety);
+// Unlock safety
+if ((["ace_safemode"] call EFUNC(common,isModLoaded)) && {[_unit, _weapon] call EFUNC(safemode,getWeaponSafety)}) exitWith {
+    [_unit, _weapon, false] call EFUNC(safemode,setWeaponSafety);
 };
 
-private _muzzles = [_weapon] call EFUNC(common,getWeaponMuzzles);
-private _modes = [_weapon] call EFUNC(common,getWeaponModes);
+private _modes = _weapon call EFUNC(common,getWeaponModes);
 
-private _index = (_modes find currentWeaponMode _unit) + 1;
+_unit selectWeapon [_weapon, _muzzle, _modes select (((_modes find _currentWeaponMode) + 1) % (count _modes))];
 
-if (_index > count _modes - 1) then {_index = 0};
-
-private _muzzle = _muzzles select 0;
-private _mode = _modes select _index;
-
-_index = 0;
-
-while {
-    _index < 299 && {currentMuzzle _unit != _muzzle || {currentWeaponMode _unit != _mode}}
-} do {
-    _unit action ["SwitchWeapon", _unit, _unit, _index];
-    _index = _index + 1;
-};
-
-// play fire mode selector sound
+// Play fire mode selector sound
 [_unit, _weapon] call FUNC(playChangeFiremodeSound);
diff --git a/addons/weaponselect/functions/fnc_selectWeaponMuzzle.sqf b/addons/weaponselect/functions/fnc_selectWeaponMuzzle.sqf
index 9a27a515ad..3882253573 100644
--- a/addons/weaponselect/functions/fnc_selectWeaponMuzzle.sqf
+++ b/addons/weaponselect/functions/fnc_selectWeaponMuzzle.sqf
@@ -18,32 +18,22 @@
 
 params ["_unit", "_weapon"];
 
-if (_weapon == "") exitWith {};
+if (_weapon == "" || {!(_unit hasWeapon _weapon)}) exitWith {};
 
 private _muzzles = _weapon call EFUNC(common,getWeaponMuzzles);
 
-if (currentWeapon _unit != _weapon) exitWith {
-    if (count _muzzles > 1) then {
+if (count _muzzles <= 1) exitWith {};
 
-        // unlock safety
-        /*if (_weapon in (_unit getVariable [QEGVAR(safemode,safedWeapons), []])) exitWith {
-            [_unit, _weapon, _muzzles select 1] call EFUNC(safemode,unlockSafety);
-        };*/
+private _muzzle = (_unit weaponState _weapon) select 1;
 
-        _unit selectWeapon (_muzzles select 1);
-    };
+private _index = if (currentWeapon _unit == _weapon) then {
+    (((_muzzles find currentMuzzle _unit) + 1) % (count _muzzles)) max 1
+} else {
+    1
 };
 
-private _index = (_muzzles find currentMuzzle _unit) + 1;
-
-if (_index > count _muzzles - 1) then {_index = 1};
-
 private _muzzle = _muzzles select _index;
 
-_index = 0;
-while {
-    _index < 299 && {currentMuzzle _unit != _muzzle}
-} do {
-    _unit action ["SwitchWeapon", _unit, _unit, _index];
-    _index = _index + 1;
-};
+_unit selectWeapon [_weapon, _muzzle, ([_weapon, _muzzle] call EFUNC(common,getWeaponModes)) select 0];
+
+nil // return
diff --git a/addons/weather/functions/fnc_calculateWindSpeed.sqf b/addons/weather/functions/fnc_calculateWindSpeed.sqf
index cd73fac358..d24322bef0 100644
--- a/addons/weather/functions/fnc_calculateWindSpeed.sqf
+++ b/addons/weather/functions/fnc_calculateWindSpeed.sqf
@@ -47,15 +47,15 @@ if (_terrainEffectEnabled) then {
         private _newWindSpeed = 0;
         {
             private _windSource = [100, _windDirAdjusted, _x] call _fnc_polar2vect;
-            if (!(terrainIntersectASL [_position, _position vectorAdd _windSource])) exitWith {
+            if !(terrainIntersectASL [_position, _position vectorAdd _windSource]) exitWith {
                 _newWindSpeed = cos(_x * 9) * _windSpeed;
             };
             _windSource = [100, _windDirAdjusted + _x, 0] call _fnc_polar2vect;
-            if (!(terrainIntersectASL [_position, _position vectorAdd _windSource])) exitWith {
+            if !(terrainIntersectASL [_position, _position vectorAdd _windSource]) exitWith {
                 _newWindSpeed = cos(_x * 9) * _windSpeed;
             };
             _windSource = [100, _windDirAdjusted - _x, 0] call _fnc_polar2vect;
-            if (!(terrainIntersectASL [_position, _position vectorAdd _windSource])) exitWith {
+            if !(terrainIntersectASL [_position, _position vectorAdd _windSource]) exitWith {
                 _newWindSpeed = cos(_x * 9) * _windSpeed;
             };
         } forEach [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10];
@@ -69,15 +69,15 @@ if (_obstacleEffectEnabled) then {
         private _newWindSpeed = 0;
         {
             private _windSource = [20, _windDirAdjusted, _x] call _fnc_polar2vect;
-            if (!(lineIntersects [_position, _position vectorAdd _windSource])) exitWith {
+            if !(lineIntersects [_position, _position vectorAdd _windSource]) exitWith {
                 _newWindSpeed = cos(_x * 2) * _windSpeed;
             };
             _windSource = [20, _windDirAdjusted + _x, 0] call _fnc_polar2vect;
-            if (!(lineIntersects [_position, _position vectorAdd _windSource])) exitWith {
+            if !(lineIntersects [_position, _position vectorAdd _windSource]) exitWith {
                 _newWindSpeed = cos(_x * 2) * _windSpeed;
             };
             _windSource = [20, _windDirAdjusted - _x, 0] call _fnc_polar2vect;
-            if (!(lineIntersects [_position, _position vectorAdd _windSource])) exitWith {
+            if !(lineIntersects [_position, _position vectorAdd _windSource]) exitWith {
                 _newWindSpeed = cos(_x * 2) * _windSpeed;
             };
         } forEach [0, 5, 10, 15, 20, 25, 30, 35, 40, 45];
diff --git a/addons/weather/init3DEN.sqf b/addons/weather/init3DEN.sqf
index 34b7dc2d5b..74af5fbaf1 100644
--- a/addons/weather/init3DEN.sqf
+++ b/addons/weather/init3DEN.sqf
@@ -5,7 +5,7 @@
 // cannot create checkboxes which have the default value "true"
 // 3den uses inverted checkboxes instead, but those only change in appearence
 // we have to auto set these settings manually - on mission creation
-add3DENEventHandler ["onMissionNew", {
+add3DENEventHandler ["OnMissionNew", {
     set3DENMissionAttributes [
         ["Intel", "IntelWavesIsForced", true],
         ["Intel", "IntelWindIsForced", true]
diff --git a/addons/weather/stringtable.xml b/addons/weather/stringtable.xml
index bb815b8d06..ece79abe4a 100644
--- a/addons/weather/stringtable.xml
+++ b/addons/weather/stringtable.xml
@@ -142,7 +142,7 @@
             <Italian>Simulazione del Vento (basato sulla mappa)</Italian>
             <Chinese>風力模擬(基於地圖)</Chinese>
             <Chinesesimp>风力模拟（基于地图）</Chinesesimp>
-            <Japanese>風シミュレーション (マップを基に)</Japanese>
+            <Japanese>風シミュレーション (マップに基づく)</Japanese>
             <Korean>바람 시뮬레이션 (지도 기반)</Korean>
             <Polish>Symulacja Wiatru (bazowana na mapie)</Polish>
             <Russian>Симуляция ветра (на основе местности)</Russian>
@@ -158,7 +158,7 @@
             <Italian>Abilita la simulazione del vento basato sulla mappa (sovrascrive il vento vanilla)</Italian>
             <Chinese>啟用後將遵照地圖特色進行風力模擬(覆蓋掉官方原版的風力模擬)</Chinese>
             <Chinesesimp>启用后将遵照地图特色进行风力模拟（覆盖掉官方原版的风力模拟）</Chinesesimp>
-            <Japanese>マップを基にした風シミュレーションを有効化 (ゲーム標準の風を上書き)</Japanese>
+            <Japanese>マップに基づいた風シミュレーションを有効化 (ゲーム標準の風を上書き)</Japanese>
             <Korean>지도 기반의 바람 시뮬레이션을 활성화합니다. (바닐라 바람을 덮어 씀)</Korean>
             <Polish>Aktywuje symulację wiatru bazującą na mapie (nadpisuje wind z domyślnej wersji gry)</Polish>
             <Russian>Включает симуляцию ветра на основе текущей местности (переписывает ванильный ветер)</Russian>
diff --git a/addons/xm157/functions/fnc_keyPress.sqf b/addons/xm157/functions/fnc_keyPress.sqf
index c5e4760563..3a9dd53a26 100644
--- a/addons/xm157/functions/fnc_keyPress.sqf
+++ b/addons/xm157/functions/fnc_keyPress.sqf
@@ -19,8 +19,8 @@
 params ["_func", "_keyDown"];
 
 if (!GVAR(shown)) exitWith { false }; // fast exit if not shown
-if (!([ACE_player, objNull, ["isNotInside"]] call EFUNC(common,canInteractWith))) exitWith { false };
-if (!(ACE_player call CBA_fnc_canUseWeapon)) exitWith { false };
+if !([ACE_player, objNull, ["isNotInside"]] call EFUNC(common,canInteractWith)) exitWith { false };
+if !(ACE_player call CBA_fnc_canUseWeapon) exitWith { false };
 
 if (currentMuzzle ACE_player != currentWeapon ACE_player) exitWith { false };
 private _display = uinamespace getVariable [QGVAR(display), displayNull];
diff --git a/addons/zeus/functions/fnc_addObjectToCurator.sqf b/addons/zeus/functions/fnc_addObjectToCurator.sqf
index 9651630ccc..4b87904d0f 100644
--- a/addons/zeus/functions/fnc_addObjectToCurator.sqf
+++ b/addons/zeus/functions/fnc_addObjectToCurator.sqf
@@ -17,7 +17,7 @@
 
 params ["_object"];
 
-if (!(_object getVariable [QGVAR(addObject), GVAR(autoAddObjects)])) exitWith {};
+if !(_object getVariable [QGVAR(addObject), GVAR(autoAddObjects)]) exitWith {};
 
 [{
     TRACE_1("Delayed addCuratorEditableObjects",_this);
diff --git a/addons/zeus/functions/fnc_bi_moduleCurator.sqf b/addons/zeus/functions/fnc_bi_moduleCurator.sqf
index ec04a12d24..cdc4d35b64 100644
--- a/addons/zeus/functions/fnc_bi_moduleCurator.sqf
+++ b/addons/zeus/functions/fnc_bi_moduleCurator.sqf
@@ -23,13 +23,13 @@ params ["_logic", "_units", "_activated"];
 
 if (_activated) then {
 
-    //--- Terminate when not created on the server
-    if (!isserver && local _logic && isnull (getassignedcuratorunit _logic)) exitwith {
+    // Terminate when not created on the server
+    if (!isServer && local _logic && isnull (getassignedcuratorunit _logic)) exitwith {
         [format ["%1 is trying to create curator logic ModuleCurator_F",profilename],"bis_fnc_error",false] call bis_fnc_mp;
         deletevehicle _logic;
     };
 
-    //--- Get curator owner
+    // Get curator owner
     _ownerVar = _logic getvariable ["owner",""];
     _ownerUID = parsenumber _ownerVar;
     if (cheatsenabled) then {
@@ -46,13 +46,13 @@ if (_activated) then {
     };
     _isAdmin = _ownerVar == "#adminLogged" || _ownerVar == "#adminVoted";
 
-    //--- Wipe out the variable so clients can't access it
+    // Wipe out the variable so clients can't access it
     _logic setvariable ["owner",nil];
 
-    //--- Server
+    // Server
     if (isserver) then {
 
-        //--- Prepare admin variable
+        // Prepare admin variable
         _adminVar = "";
         if (_isAdmin) then {
             _letters = ["a","b","c","d","e","f","g","h","i","j","k","l","m","n","o","p","q","r","s","t","u","v","w","x","y","z"];
@@ -61,12 +61,12 @@ if (_activated) then {
             _logic setvariable ["adminVar",_adminVar,true];
         };
 
-        //--- Get allowed addons
+        // Get allowed addons
         _addonsType = _logic getvariable ["Addons",2];
         _addons = [];
         switch _addonsType do {
 
-            //--- All (including unofficial ones)
+            // All (including unofficial ones)
             case 3: {
                 _cfgPatches = configfile >> "cfgpatches";
                 for "_i" from 0 to (count _cfgPatches - 1) do {
@@ -79,10 +79,10 @@ if (_activated) then {
                 _logic addcuratoraddons _addons;
             };
 
-            //--- All active
+            // All active
             case 2: {};
 
-            //--- All mission
+            // All mission
             case 1: {
                 _addonsList = [];
                 {
@@ -92,13 +92,13 @@ if (_activated) then {
                 _logic addcuratoraddons _addonsList;
             };
 
-            //--- None
+            // None
             case 0: {
                 removeallcuratoraddons _logic;
             };
         };
 
-        //--- Handle ownership
+        // Handle ownership
         [_logic,_ownerVar,_ownerUID,_adminVar] spawn {
             scriptname "BIS_fnc_moduleCurator: Owner";
 
@@ -110,16 +110,16 @@ if (_activated) then {
             _name = _logic getvariable ["name",""];
             if (_name == "") then {_name = localize "STR_A3_curator";};
 
-            //--- Wait until mission starts
+            // Wait until mission starts
             waitUntil {time > 0}; // NOTE: DO NOT CHANGE TO CBA_missionTime, IT BREAKS THE MODULE
 
-            //--- Refresh addon list, so it's broadcasted to clients
+            // Refresh addon list, so it's broadcasted to clients
             _addons = curatoraddons _logic;
             removeAllCuratorAddons _logic;
             _logic addcuratoraddons _addons;
 
             while {true} do {
-                //--- Wait for player to become Zeus
+                // Wait for player to become Zeus
                 switch true do {
                     case (_ownerUID > 0): {
                         waituntil {
@@ -133,7 +133,7 @@ if (_activated) then {
                 };
                 if (isnull _logic) exitwith {};
 
-                //--- Assign
+                // Assign
                 _player = objnull;
                 switch true do {
                     case (_ownerUID > 0): {
@@ -150,7 +150,7 @@ if (_activated) then {
                 waituntil {_player assignCurator _logic; getassignedcuratorunit _logic == _player || isnull _logic};
                 if (isnull _logic) exitwith {};
 
-                //--- Add radio channels
+                // Add radio channels
                 {
                     _x radiochanneladd [_player];
                 } foreach (_logic getvariable ["channels",[]]);
@@ -159,7 +159,7 @@ if (_activated) then {
                 private _msgCode = {
                     params ["_logic","_player"];
 
-                    //--- Sent notification to all assigned players
+                    // Sent notification to all assigned players
                     if ((_logic getVariable ["showNotification",true]) && GVAR(zeusAscension)) then {
                         {
                             if (isplayer _x) then {
@@ -181,7 +181,7 @@ if (_activated) then {
                 // Added by ace_zeus
                 [QGVAR(zeusUnitAssigned), [_logic,_player]] call CBA_fnc_globalEvent;
 
-                //--- Wait for player to stop being Zeus
+                // Wait for player to stop being Zeus
                 switch true do {
                     case (_ownerUID > 0): {
                         waituntil {
@@ -195,12 +195,12 @@ if (_activated) then {
                 };
                 if (isnull _logic) exitwith {};
 
-                //--- Add radio channels
+                // Add radio channels
                 {
                     _x radiochannelremove [_player];
                 } foreach (_logic getvariable ["channels",[]]);
 
-                //--- Unassign
+                // Unassign
                 waituntil {unassigncurator _logic; isnull (getassignedcuratorunit _logic) || isnull _logic};
                 if (isnull _logic) exitwith {};
             };
@@ -211,14 +211,14 @@ if (_activated) then {
             params ["_logic"];
 
             if (GVAR(zeusBird)) then {
-                //--- Create bird
+                // Create bird
                 _birdType = _logic getVariable ["birdType","eagle_f"];
                 if (_birdType != "") then {
                     _bird = createvehicle [_birdType,[100,100,100],[],0,"none"];
                     _logic setVariable ["bird",_bird,true];
                 };
 
-                //--- Locality changed
+                // Locality changed
                 _logic addeventhandler [
                     "local",
                     {
@@ -237,7 +237,7 @@ if (_activated) then {
             [_logic] call _birdCode;
         };
 
-        //--- Activated all future addons
+        // Activated all future addons
         _addons = [];
         {
             if (typeof _x == "ModuleCuratorAddAddons_F") then {
@@ -254,12 +254,12 @@ if (_activated) then {
         if (time <= 0) then { _addons call bis_fnc_activateaddons; };
     };
 
-    //--- Player
+    // Player
     if (hasinterface) then {
         waituntil {local player};
         _serverCommand = ["#kick", "#shutdown"] select (_ownerVar == "#adminLogged");
 
-        //--- Black effect until the interface is open
+        // Black effect until the interface is open
         _forced = _logic getvariable ["forced",0] > 0;
         if (_forced) then {
             _isCurator = switch true do {
@@ -279,15 +279,15 @@ if (_activated) then {
             };
         };
 
-        //--- Check if player is server admin
+        // Check if player is server admin
         if (_isAdmin) then {
             _adminVar = _logic getvariable ["adminVar",""];
             _logic setvariable ["adminVar",nil];
             if (isserver) then {
-                //--- Host
+                // Host
                 missionnamespace setvariable [_adminVar,player];
             } else {
-                //--- Client
+                // Client
                 [_logic,_adminVar,_serverCommand] spawn {
                     scriptname "BIS_fnc_moduleCurator: Admin check";
 
@@ -314,7 +314,7 @@ if (_activated) then {
             sleep 1;
             waituntil {alive player};
 
-            //--- Show warning when Zeus key is not assigned
+            // Show warning when Zeus key is not assigned
             if (count (actionkeys "curatorInterface") == 0) then {
                 [
                     format [
@@ -324,7 +324,7 @@ if (_activated) then {
                 ] call bis_fnc_guiMessage;
             };
 
-            //--- Show hint about pinging for players
+            // Show hint about pinging for players
             if (
                 isnil {profilenamespace getvariable "bis_fnc_curatorPinged_done"}
                 &&
@@ -339,7 +339,7 @@ if (_activated) then {
             };
         };
 
-        //--- Add local event handlers
+        // Add local event handlers
         _logic addeventhandler ["curatorFeedbackMessage",{_this call bis_fnc_showCuratorFeedbackMessage;}];
         _logic addeventhandler ["curatorPinged",{_this call bis_fnc_curatorPinged;}];
         _logic addeventhandler ["curatorObjectPlaced",{_this call bis_fnc_curatorObjectPlaced;}];
diff --git a/addons/zeus/functions/fnc_getModuleDestination.sqf b/addons/zeus/functions/fnc_getModuleDestination.sqf
index b328201d6c..10d7acae9e 100644
--- a/addons/zeus/functions/fnc_getModuleDestination.sqf
+++ b/addons/zeus/functions/fnc_getModuleDestination.sqf
@@ -113,9 +113,9 @@ GVAR(moduleDestination_mapDrawEH) = [((findDisplay 312) displayCtrl 50), "draw",
     } else {
         TRACE_4("cleaning up",_this select 1,GVAR(moduleDestination_displayEHMouse),GVAR(moduleDestination_displayEHKeyboard),GVAR(moduleDestination_mapDrawEH));
         (_this select 1) call CBA_fnc_removePerFrameHandler;
-        (findDisplay 312) displayRemoveEventHandler ["mouseButtonDown", GVAR(moduleDestination_displayEHMouse)];
+        (findDisplay 312) displayRemoveEventHandler ["MouseButtonDown", GVAR(moduleDestination_displayEHMouse)];
         (findDisplay 312) displayRemoveEventHandler ["KeyDown", GVAR(moduleDestination_displayEHKeyboard)];
-        ((findDisplay 312) displayCtrl 50) ctrlRemoveEventHandler ["draw", GVAR(moduleDestination_mapDrawEH)];
+        ((findDisplay 312) displayCtrl 50) ctrlRemoveEventHandler ["Draw", GVAR(moduleDestination_mapDrawEH)];
         GVAR(moduleDestination_displayEHMouse) = nil;
         GVAR(moduleDestination_displayEHKeyboard) = nil;
         GVAR(moduleDestination_mapDrawEH) = nil;
diff --git a/addons/zeus/functions/fnc_moduleCargoParadrop.sqf b/addons/zeus/functions/fnc_moduleCargoParadrop.sqf
index 69d90d310d..2aaffb3796 100644
--- a/addons/zeus/functions/fnc_moduleCargoParadrop.sqf
+++ b/addons/zeus/functions/fnc_moduleCargoParadrop.sqf
@@ -30,13 +30,13 @@ TRACE_4("moduleCargoParadrop placed",_logic,typeOf _vehicle,_pilot,typeOf _pilot
 
 deleteVehicle _logic; // cleanup logic now, we just needed it to get the attached vehicle
 
-if (!(missionNamespace getVariable [QEGVAR(cargo,enable), false])) exitWith {
+if !(missionNamespace getVariable [QEGVAR(cargo,enable), false]) exitWith {
     [LSTRING(RequiresAddon)] call FUNC(showMessage);
 };
 if (isNull _vehicle) exitWith {
     [LSTRING(NothingSelected)] call FUNC(showMessage);
 };
-if (!(_vehicle isKindOf "Air")) exitWith {
+if !(_vehicle isKindOf "Air") exitWith {
     [format ["%1 %2", localize "str_dn_aircraft", localize "str_msg_no_veh_select"]] call FUNC(showMessage);
 };
 if ((!alive _vehicle) || {!alive _pilot}) exitWith {
diff --git a/addons/zeus/functions/fnc_moduleCargoParadropWaypoint.sqf b/addons/zeus/functions/fnc_moduleCargoParadropWaypoint.sqf
index dded460710..6570648499 100644
--- a/addons/zeus/functions/fnc_moduleCargoParadropWaypoint.sqf
+++ b/addons/zeus/functions/fnc_moduleCargoParadropWaypoint.sqf
@@ -22,7 +22,7 @@ TRACE_2("moduleCargoParadropWaypoint",_vehicleGroup,_wpPos);
 private _vehicle = vehicle leader _vehicleGroup;
 private _commander = driver _vehicle;
 private _cargo = _vehicle getVariable [QEGVAR(cargo,loaded), []];
-if (!(_vehicle isKindOf "Air")) exitWith {WARNING_1("not in a air vehicle",typeOf _vehicle); true};
+if !(_vehicle isKindOf "Air") exitWith {WARNING_1("not in a air vehicle",typeOf _vehicle); true};
 if (_cargo isEqualTo []) exitWith {WARNING_1("no cargo",_cargo); true};
 
 private _previousSpeedMode = speedMode _vehicleGroup;
diff --git a/addons/zeus/functions/fnc_moduleHeal.sqf b/addons/zeus/functions/fnc_moduleHeal.sqf
index 9a49375003..4bf0525ea7 100644
--- a/addons/zeus/functions/fnc_moduleHeal.sqf
+++ b/addons/zeus/functions/fnc_moduleHeal.sqf
@@ -43,7 +43,7 @@ switch (false) do {
 };
 
 // Heal validated target
-if (["ace_medical"] call EFUNC(common,isModLoaded)) then {
+if (GETEGVAR(medical,enabled,false)) then {
     TRACE_1("healing with ace_medical",_unit);
     [QEGVAR(medical_treatment,fullHealLocal), [_unit], _unit] call CBA_fnc_targetEvent;
 } else {
diff --git a/addons/zeus/functions/fnc_moduleSetMedic.sqf b/addons/zeus/functions/fnc_moduleSetMedic.sqf
index f66ca9132d..d44dd56e59 100644
--- a/addons/zeus/functions/fnc_moduleSetMedic.sqf
+++ b/addons/zeus/functions/fnc_moduleSetMedic.sqf
@@ -21,7 +21,7 @@ params ["_logic"];
 
 if !(local _logic) exitWith {};
 
-if !(["ace_medical"] call EFUNC(common,isModLoaded)) then {
+if !(GETEGVAR(medical,enabled,false)) then {
     [LSTRING(RequiresAddon)] call FUNC(showMessage);
 } else {
     private _mouseOver = GETMVAR(bis_fnc_curatorObjectPlaced_mouseOver,[""]);
diff --git a/addons/zeus/functions/fnc_moduleSetMedicalFacility.sqf b/addons/zeus/functions/fnc_moduleSetMedicalFacility.sqf
index 1f98212935..b6742a25a4 100644
--- a/addons/zeus/functions/fnc_moduleSetMedicalFacility.sqf
+++ b/addons/zeus/functions/fnc_moduleSetMedicalFacility.sqf
@@ -21,7 +21,7 @@ params ["_logic"];
 
 if !(local _logic) exitWith {};
 
-if !(["ace_medical"] call EFUNC(common,isModLoaded)) then {
+if !(GETEGVAR(medical,enabled,false)) then {
     [LSTRING(RequiresAddon)] call FUNC(showMessage);
 } else {
     private _mouseOver = GETMVAR(bis_fnc_curatorObjectPlaced_mouseOver,[""]);
@@ -40,7 +40,7 @@ if !(["ace_medical"] call EFUNC(common,isModLoaded)) then {
                 if (GETVAR(_unit,EGVAR(captives,isHandcuffed),false)) then {
                     [LSTRING(OnlyNonCaptive)] call FUNC(showMessage);
                 } else {
-                    if (!(GETVAR(_unit,EGVAR(medical,isMedicalFacility),false))) then {
+                    if !(GETVAR(_unit,EGVAR(medical,isMedicalFacility),false)) then {
                         _unit setVariable [QEGVAR(medical,isMedicalFacility), true, true];
                     };
                 };
diff --git a/addons/zeus/functions/fnc_moduleSetMedicalVehicle.sqf b/addons/zeus/functions/fnc_moduleSetMedicalVehicle.sqf
index e8189b377e..26bb3fcfe9 100644
--- a/addons/zeus/functions/fnc_moduleSetMedicalVehicle.sqf
+++ b/addons/zeus/functions/fnc_moduleSetMedicalVehicle.sqf
@@ -21,7 +21,7 @@ params ["_logic"];
 
 if !(local _logic) exitWith {};
 
-if !(["ace_medical"] call EFUNC(common,isModLoaded)) then {
+if !(GETEGVAR(medical,enabled,false)) then {
     [LSTRING(RequiresAddon)] call FUNC(showMessage);
 } else {
     private _mouseOver = GETMVAR(bis_fnc_curatorObjectPlaced_mouseOver,[""]);
diff --git a/addons/zeus/functions/fnc_moduleSuicideBomber.sqf b/addons/zeus/functions/fnc_moduleSuicideBomber.sqf
index 8346eb4266..8425ff1548 100644
--- a/addons/zeus/functions/fnc_moduleSuicideBomber.sqf
+++ b/addons/zeus/functions/fnc_moduleSuicideBomber.sqf
@@ -57,7 +57,7 @@ if (_autoSeek) then {
         LOG("Unit deleted or killed, PFH removed");
     };
 
-    if (!([_unit] call EFUNC(common,isAwake))) exitWith {};
+    if !([_unit] call EFUNC(common,isAwake)) exitWith {};
 
     // Detonation
     private _nearObjects = (_unit nearObjects _activationRadius) select {side _x == _activationSide && {_x != _unit} && {alive _x}};
diff --git a/addons/zeus/functions/fnc_showMessage.sqf b/addons/zeus/functions/fnc_showMessage.sqf
index 8bbd7d510d..53094dbfb3 100644
--- a/addons/zeus/functions/fnc_showMessage.sqf
+++ b/addons/zeus/functions/fnc_showMessage.sqf
@@ -18,7 +18,7 @@
  * Public: Yes
  */
 
-if (!(_this isEqualTypeParams [""])) exitWith {ERROR_1("First arg must be string [%1]",_this);};
+if !(_this isEqualTypeParams [""]) exitWith {ERROR_1("First arg must be string [%1]",_this);};
 
 private _message = _this apply {if ((_x isEqualType "") && {isLocalized _x}) then {localize _x} else {_x}};
 [objNull, format _message] call BIS_fnc_showCuratorFeedbackMessage;
diff --git a/addons/zeus/functions/fnc_ui_globalSetSkill.sqf b/addons/zeus/functions/fnc_ui_globalSetSkill.sqf
index 31f41d76c6..5a7c5fc5e0 100644
--- a/addons/zeus/functions/fnc_ui_globalSetSkill.sqf
+++ b/addons/zeus/functions/fnc_ui_globalSetSkill.sqf
@@ -24,7 +24,7 @@ private _ctrlButtonOK = _display displayCtrl 1; //IDC_OK
 private _logic = GETMVAR(BIS_fnc_initCuratorAttributes_target,objNull);
 TRACE_1("logicObject",_logic);
 
-_control ctrlRemoveAllEventHandlers "setFocus";
+_control ctrlRemoveAllEventHandlers "SetFocus";
 
 //Specific on-load stuff:
 private _fnc_sliderMove = {
@@ -74,5 +74,5 @@ private _fnc_onConfirm = {
     [QGVAR(GlobalSkillAI),GVAR(GlobalSkillAI)] call FUNC(moduleGlobalSetSkill);
 };
 
-_display displayAddEventHandler ["unload", _fnc_onUnload];
-_ctrlButtonOK ctrlAddEventHandler ["buttonclick", _fnc_onConfirm];
+_display displayAddEventHandler ["Unload", _fnc_onUnload];
+_ctrlButtonOK ctrlAddEventHandler ["ButtonClick", _fnc_onConfirm];
diff --git a/addons/zeus/functions/fnc_ui_groupSide.sqf b/addons/zeus/functions/fnc_ui_groupSide.sqf
index 4dff592f62..110e2e302d 100644
--- a/addons/zeus/functions/fnc_ui_groupSide.sqf
+++ b/addons/zeus/functions/fnc_ui_groupSide.sqf
@@ -24,7 +24,7 @@ private _ctrlButtonOK = _display displayCtrl 1; //IDC_OK
 private _logic = GETMVAR(BIS_fnc_initCuratorAttributes_target,objNull);
 TRACE_1("logicObject",_logic);
 
-_control ctrlRemoveAllEventHandlers "setFocus";
+_control ctrlRemoveAllEventHandlers "SetFocus";
 
 //Validate the module target:
 private _unit = effectiveCommander (attachedTo _logic);
@@ -101,7 +101,7 @@ private _fnc_onSelection = {
 
     _ctrl ctrlSetTextColor _color;
 
-    _ctrl ctrlAddEventHandler ["buttonclick", _fnc_onSelection];
+    _ctrl ctrlAddEventHandler ["ButtonClick", _fnc_onSelection];
 } forEach IDCs;
 
 private _fnc_onUnload = {
@@ -129,5 +129,5 @@ private _fnc_onConfirm = {
     deleteVehicle _logic;
 };
 
-_display displayAddEventHandler ["unload", _fnc_onUnload];
-_ctrlButtonOK ctrlAddEventHandler ["buttonClick", _fnc_onConfirm];
+_display displayAddEventHandler ["Unload", _fnc_onUnload];
+_ctrlButtonOK ctrlAddEventHandler ["ButtonClick", _fnc_onConfirm];
diff --git a/addons/zeus/functions/fnc_ui_setEngineer.sqf b/addons/zeus/functions/fnc_ui_setEngineer.sqf
index b2515c311d..3f008403cc 100644
--- a/addons/zeus/functions/fnc_ui_setEngineer.sqf
+++ b/addons/zeus/functions/fnc_ui_setEngineer.sqf
@@ -23,7 +23,7 @@ private _ctrlButtonOK = _display displayCtrl 1; // IDC_OK
 private _logic = GETMVAR(BIS_fnc_initCuratorAttributes_target,objNull);
 TRACE_1("logicObject",_logic);
 
-_control ctrlRemoveAllEventHandlers "setFocus";
+_control ctrlRemoveAllEventHandlers "SetFocus";
 
 // Validate module target
 private _unit = attachedTo _logic;
diff --git a/addons/zeus/functions/fnc_ui_teleportPlayers.sqf b/addons/zeus/functions/fnc_ui_teleportPlayers.sqf
index 1becc04004..b7aab41126 100644
--- a/addons/zeus/functions/fnc_ui_teleportPlayers.sqf
+++ b/addons/zeus/functions/fnc_ui_teleportPlayers.sqf
@@ -23,7 +23,7 @@ private _ctrlButtonOK = _display displayCtrl 1; //IDC_OK
 private _logic = GETMVAR(BIS_fnc_initCuratorAttributes_target,objNull);
 TRACE_1("logicObject",_logic);
 
-_control ctrlRemoveAllEventHandlers "setFocus";
+_control ctrlRemoveAllEventHandlers "SetFocus";
 
 //Specific on-load stuff:
 private _listbox = _display displayCtrl 16189;
@@ -91,5 +91,5 @@ private _fnc_onConfirm = {
 };
 
 _display displayAddEventHandler ["KeyUp", _fnc_onKeyUp];
-_display displayAddEventHandler ["unload", _fnc_onUnload];
-_ctrlButtonOK ctrlAddEventHandler ["buttonclick", _fnc_onConfirm];
+_display displayAddEventHandler ["Unload", _fnc_onUnload];
+_ctrlButtonOK ctrlAddEventHandler ["ButtonClick", _fnc_onConfirm];
diff --git a/addons/zeus/stringtable.xml b/addons/zeus/stringtable.xml
index a1ae4d554e..a6eaaac158 100644
--- a/addons/zeus/stringtable.xml
+++ b/addons/zeus/stringtable.xml
@@ -61,7 +61,7 @@
             <Hungarian>Felemelkedési üzenetek</Hungarian>
             <Russian>Сообщения о вознесении</Russian>
             <Italian>Messaggi di Ascesa</Italian>
-            <Japanese>転生の布告</Japanese>
+            <Japanese>Zeus転生通知</Japanese>
             <Korean>재림 메세지</Korean>
             <Chinesesimp>宙斯上任信息</Chinesesimp>
             <Chinese>宙斯上任訊息</Chinese>
@@ -1500,7 +1500,7 @@
             <English>Fill from top to bottom</English>
             <German>Von oben nach unten befüllen</German>
             <French>Remplir de haut en bas</French>
-            <Japanese>上から下まで占拠</Japanese>
+            <Japanese>上から下へと占拠</Japanese>
             <Italian>Riempi dall'alto al basso</Italian>
             <Chinese>由上而下進行填滿</Chinese>
             <Chinesesimp>由上而下进行填满</Chinesesimp>
@@ -2004,31 +2004,66 @@
             <Korean>+ Shift 키로 강제하기 (동서남북 방향으로만 깔 수 있음)</Korean>
             <French>+MAJ pour forcer (Disponible uniquement sur les alignements N/S ou E/O)</French>
             <German>+SHIFT zum Erzwingen (Kann nur nach N/S oder E/W legen)</German>
-            <Italian>+SHIFT per forzare (Può piazzare solo N/S o E/O</Italian>
+            <Italian>+SHIFT per forzare (Può piazzare solo N/S o E/O)</Italian>
             <Japanese>+SHIFTキー で強制的に敷設 (北/南または東/西方向にのみ配置可能)</Japanese>
             <Russian>+SHIFT на принудительное (может укладываться только на Север/Юг или Восток/Запад)</Russian>
             <Spanish>+SHIFT para forzar (Puede solo colocar en N/S or E/O)</Spanish>
         </Key>
         <Key ID="STR_ACE_Zeus_ModuleSpectator_ForceInterface_Tooltip">
             <English>Forces the spectator interface preventing the player from closing it with the Escape key</English>
+            <Japanese>観戦インターフェイスを強制し、ユーザがEscキーでも閉じられないようにします。</Japanese>
+            <Russian>Активирует интерфейс spectator, не позволяя игроку закрыть его с помощью клавиши Escape.</Russian>
+            <Korean>플레이어가 Esc 키로 관전자 인터페이스를 닫지 못하도록 강제로 관전자 인터페이스를 설정합니다.</Korean>
+            <German>Erzwingt die Zuschauer-Ansicht und verhindert dass der Spieler sie mit der Esc-Taste schließen kann</German>
+            <Italian>Forza l'interfaccia di spettatore, impedendo al giocatore di chiuderla con il tasto Esc</Italian>
         </Key>
         <Key ID="STR_ACE_Zeus_ModuleSpectator_HidePlayer">
             <English>Hide player</English>
+            <Japanese>プレイヤーを隠す</Japanese>
+            <Russian>Скрыть игрока</Russian>
+            <Korean>플레이어 숨기기</Korean>
+            <German>Spieler ausblenden</German>
+            <Italian>Nascondi giocatore</Italian>
         </Key>
         <Key ID="STR_ACE_Zeus_ModuleSpectator_HidePlayer_Tooltip">
             <English>Hides the player by making them invisible, invulnerable, muted, and removing them from their group</English>
+            <Japanese>透明化、無敵化、ミュート、グループからの除外を行いプレーヤーを隠します</Japanese>
+            <Russian>Скрывает игрока, делая его невидимым, неуязвимым, отключая звук и удаляя из группы.</Russian>
+            <Korean>플레이어를 투명, 무적, 음소거화하고 그룹에서 제거하여 숨깁니다.</Korean>
+            <German>Blendet den Spieler aus, macht ihn unsichtbar, unverwundbar, stumm und entfernt ihn von seiner Gruppe</German>
+            <Italian>Nasconde il giocatore, rendendolo invisibile, invulnerabile, muto e lo rimuove dal proprio gruppo</Italian>
         </Key>
         <Key ID="STR_ACE_Zeus_ModuleSpectator_SpectableSides_Tooltip">
             <English>Sets the sides that are available to spectate</English>
+            <Japanese>指定の陣営を観戦可能に設定します</Japanese>
+            <Russian>Устанавливает стороны, доступные для режима spectator</Russian>
+            <Korean>관전 가능한 진영을 설정합니다.</Korean>
+            <German>Bestimmt die Seiten denen man zuschauen kann</German>
+            <Italian>Imposta le fazioni che lo spettatore può osservare</Italian>
         </Key>
         <Key ID="STR_ACE_Zeus_ModuleSpectator_WhiteHot">
             <English>White Hot</English>
+            <Japanese>白=熱源</Japanese>
+            <Russian>Белый</Russian>
+            <Korean>백색 열원</Korean>
+            <German>Weiß-Schwarz</German>
+            <Italian>Bianco-caldo</Italian>
         </Key>
         <Key ID="STR_ACE_Zeus_ModuleSpectator_BlackHot">
             <English>Black Hot</English>
+            <Japanese>黒=熱源</Japanese>
+            <Russian>Чёрный</Russian>
+            <Korean>흑색 열원</Korean>
+            <German>Schwarz-Weiß</German>
+            <Italian>Nero-caldo</Italian>
         </Key>
         <Key ID="STR_ACE_Zeus_ToggleAll">
             <English>Toggle All</English>
+            <Japanese>全てを切り替え</Japanese>
+            <Russian>Выключить все</Russian>
+            <Korean>전부 토글</Korean>
+            <German>Alle wechseln</German>
+            <Italian>Cambia tutti</Italian>
         </Key>
     </Package>
 </Project>
diff --git a/docs/wiki/class-names.md b/docs/wiki/class-names.md
index d8537f0645..4a4f9b032f 100644
--- a/docs/wiki/class-names.md
+++ b/docs/wiki/class-names.md
@@ -240,6 +240,7 @@ ACE_plasmaIV_250 | Plasma IV (250ml) | ACE_ItemCore |
 ACE_salineIV | Saline IV (1000ml) | ACE_ItemCore |
 ACE_salineIV_500 | Saline IV (500ml) | ACE_ItemCore |
 ACE_salineIV_250 | Saline IV (250ml) | ACE_ItemCore |
+ACE_suture | Suture | ACE_ItemCore |
 ACE_surgicalKit | Surgical Kit | ACE_ItemCore |
 ACE_tourniquet | Tourniquet (CAT) | ACE_ItemCore |
 ACE_medicalSupplyCrate | Simple ACE Medical Supply Crate | ammo box |
diff --git a/docs/wiki/development/ace3-config-entries.md b/docs/wiki/development/ace3-config-entries.md
index 9e656ad48c..c1e44430b5 100644
--- a/docs/wiki/development/ace3-config-entries.md
+++ b/docs/wiki/development/ace3-config-entries.md
@@ -140,7 +140,6 @@ ace_isbelt
 ace_attachable
 ace_placeable
 ace_setupobject
-ace_delaytime
 ace_triggers
 ace_magazines_forcemagazinemuzzlevelocity
 ```
diff --git a/docs/wiki/development/coding-guidelines.md b/docs/wiki/development/coding-guidelines.md
index 786a5d74e8..fe9f0bfdf0 100644
--- a/docs/wiki/development/coding-guidelines.md
+++ b/docs/wiki/development/coding-guidelines.md
@@ -381,11 +381,19 @@ However the following is allowed:
 _value = (_array select 0) select 1;
 ```
 
-Any conditions in statements shall always be wrapped around brackets.
+Any conditions in statements shall always be wrapped around brackets. Both uses of the `!` operator below are allowed.
 
 ```sqf
-if (!_value) then {};
 if (_value) then {};
+if (!_value) then {};
+if !(_value) then {};
+```
+
+Use of the `!` operator on the lefthand-side of brackets can be more readable, particularly for more complex conditions or macros:
+
+```sqf
+if !(_value && _otherValue && {_thirdValue call _something}) then {};
+if !(GETEGVAR(addon,globalVariableName,defaultValue)) then {};
 ```
 
 ### 5.6 Magic Numbers
@@ -632,81 +640,6 @@ player addEventHandler ["Fired", FUNC(handleFired)]; // bad
 player addEventHandler ["Fired", {call FUNC(handleFired)}]; // good
 ```
 
-### 7.4 Hashes
-
-When a key value pair is required, make use of the hash implementation from ACE3.
-
-Hashes are a variable type that store key value pairs. They are not implemented natively in SQF, so there are a number of macros and functions for their usage in ACE3. If you are unfamiliar with the idea, they are similar in function to `setVariable`/`getVariable` but do not require an object to use.
-
-The following example is a simple usage using our macros which will be explained further below.
-
-```sqf
-_hash = HASHCREATE;
-HASH_SET(_hash,"key","value");
-if (HASH_HASKEY(_hash,"key")) then {
-    player sideChat format ["val: %1", HASH_GET(_hash,"key"); // will print out "val: value"
-};
-HASH_REM(_hash,"key");
-if (HASH_HASKEY(_hash,"key")) then {
-    // this will never execute because we removed the hash key/val pair "key"
-};
-```
-
-A description of the above macros is below.
-
-| Macro | Use |
-| ------|-------|
-|`HASHCREATE` | Used to create an empty hash. |
-|`HASH_SET(hash,key,val)` | Will set the hash key to that value, a key can be anything, even objects. |
-|`HASH_GET(hash,key)` | Will return the value of that key (or nil if it doesn't exist). |
-|`HASH_HASKEY(hash,key)` | Will return true/false if that key exists in the hash. |
-|`HASH_REM(hash,key)` | Will remove that hash key. |
-
-#### 7.4.1 Hashlists
-
-A hashlist is an extension of a hash. It is a list of hashes! The reason for having this special type of storage container rather than using a normal array is that an array of normal hashes that are similar will duplicate a large amount of data in their storage of keys. A hashlist on the other hand uses a common list of keys and an array of unique value containers. The following will demonstrate its usage.
-
-```sqf
-_defaultKeys = ["key1", "key2", "key3"];
-// create a new hashlist using the above keys as default
-_hashList = HASHLIST_CREATELIST(_defaultKeys);
-
-//lets get a blank hash template out of this hashlist
-_hash = HASHLIST_CREATEHASH(_hashList);
-
-//_hash is now a standard hash...
-HASH_SET(_hash,"key1","1");
-
-//to store it to the list we need to push it to the list
-HASHLIST_PUSH(_hashList, _hash);
-
-//now lets get it out and store it in something else for fun
-//it was pushed to an empty list, so it's index is 0
-_anotherHash = HASHLIST_SELECT(_hashList,0);
-
-// this should print "val: 1"
-player sideChat format["val: %1", HASH_GET(_anotherHash,"key1")];
-
-//Say we need to add a new key to the hashlist
-//that we didn't initialize it with? We can simply
-//set a new key using the standard HASH_SET macro
-HASH_SET(_anotherHash,"anotherKey","another value");
-```
-
-As you can see above working with hashlists are fairly simple, a more in depth explanation of the macros is below.
-
-| Macro  |  Use |
-| -------|---------|
-|`HASHLIST_CREATELIST(keys)` | Creates a new hashlist with the default keys, pass [] for no default keys. |
-|`HASHLIST_CREATEHASH(hashlist)` | Returns a blank hash template from a hashlist. |
-|`HASHLIST_PUSH(hashList, hash)` | Pushes a new hash onto the end of the list. |
-|`HASHLIST_SELECT(hashlist, index)` | Returns the hash at that index in the list. |
-|`HASHLIST_SET(hashlist, index, hash)` | Sets a specific index to that hash. |
-
-##### 7.4.1.1 A note on pass by reference and hashes
-
-Hashes and hashlists are implemented with SQF arrays, and as such they are passed by reference to other functions. Remember to make copies (using the `+` operator) if you intend for the hash or hashlist to be modified with out the need for changing the original value.
-
 ## 8. Performance Considerations
 
 ### 8.1 Adding Elements to Arrays
diff --git a/docs/wiki/feature/hitreactions.md b/docs/wiki/feature/hitreactions.md
index 7d12c1cb12..a84d1c0b78 100644
--- a/docs/wiki/feature/hitreactions.md
+++ b/docs/wiki/feature/hitreactions.md
@@ -18,3 +18,6 @@ version:
 ### 1.1 Falling under fire
 If a unit is shot while running it falls to the ground in a prone position, the area where the shot lands does not matters.
 Note that the shot needs to inflict a certain amount of damage to make the unit fall, a small cut won't make the unit stumble.
+
+### 1.2 Weapon dropping
+If a unit's arm is shot it will cause the gun to be dropped based on the chance set. The default is 0.
diff --git a/docs/wiki/framework/advanced-fatigue-framework.md b/docs/wiki/framework/advanced-fatigue-framework.md
index 93c9aa9b77..9afd9891d7 100644
--- a/docs/wiki/framework/advanced-fatigue-framework.md
+++ b/docs/wiki/framework/advanced-fatigue-framework.md
@@ -13,16 +13,18 @@ version:
 
 ## 1. Global Settings
 
-ACE provides four settings to tweak Advanced Fatigue. Adjust these factors depending on how hard you want your experience to be.
+ACE provides multiple settings to tweak Advanced Fatigue. Adjust these settings depending on how hard you want your experience to be.
 
+- **Enabled:** This allow you to toggle Advanced Fatigue on or off. Mission needs to be restarted if this setting is changed.
+- **Show stamina bar:** Shows/hides the stamina bar.
+- **Fade Stamina bar automatically:** Adjusts transparency of the bar based on stamina status.
 - **Performance factor:** This influences the overall performance of players, malnourished or super soldiers, everything is possible.
 - **Recovery factor:** Do you like looking at the landscape or think breaks are boring? Whatever the case, this influences the length of your stamina breaks.
 - **Load factor:** If you believe a Javelin is the perfect companion for your .50 BMG sniper rifle you probably should tweak this setting.
-- **Terrain factor**: Not everyone is used to mountainous terrain. Tweak this until you feel more at home.
-- **Sway factor**: Influences the amount of weapon sway. Higher means more sway.
-
-Note that while there currently is no restriction on the value of these settings, it's generally recommended to keep them between 0 and 2.
-
+- **Terrain factor:** Not everyone is used to mountainous terrain. Tweak this until you feel more at home.
+- **Sway factor:** Influences the amount of weapon sway. Higher means more sway.
+- **Rested sway factor:** Influences the amount of weapon sway while rested is deployed. Higher means more sway.
+- **Deployed sway factor:** Influences the amount of weapon sway while weapon is deployed. Higher means more sway.
 
 ## 2. Unit Specific Settings
 
diff --git a/docs/wiki/framework/arsenal-framework.md b/docs/wiki/framework/arsenal-framework.md
index 954bbc0a7e..a02dcdf646 100644
--- a/docs/wiki/framework/arsenal-framework.md
+++ b/docs/wiki/framework/arsenal-framework.md
@@ -588,3 +588,12 @@ TAG_my_arsenal_essentials = ["arifle_AK12_F", "LMG_03_F"];
     [ace_arsenal_currentBox, TAG_my_arsenal_essentials] call ace_arsenal_fnc_addVirtualItems
 }] call CBA_fnc_addEventHandler;
 ```
+
+### 10.4 Saving loadouts to profile
+A loadout can be saved to the player's profile using `ace_arsenal_fnc_saveLoadout`.
+
+```sqf
+private _loadout = [ACE_player] call CBA_fnc_getLoadout; // or getUnitLoadout ACE_player
+private _replaceExisting = true; // optional, default: false
+["Current Loadout", _loadout, _replaceExisting] call ace_arsenal_fnc_saveLoadout;
+```
diff --git a/docs/wiki/framework/artillery-tables-framework.md b/docs/wiki/framework/artillery-tables-framework.md
new file mode 100644
index 0000000000..be2adb3331
--- /dev/null
+++ b/docs/wiki/framework/artillery-tables-framework.md
@@ -0,0 +1,38 @@
+---
+layout: wiki
+title: Artillery Tables
+description: Explains the configs for artillery tables.
+group: framework
+parent: wiki
+mod: ace
+version:
+  major: 3
+  minor: 13
+  patch: 0
+---
+
+## 1. Magazine Configs
+
+```cpp
+class CfgMagazines {
+    class yourMag {
+        ace_artillerytables_airFriction = -0.00006; // default value
+        // drag coefficent (when Air Resistance setting is enabled)
+        // can set to 0 to disable all muzzle effects and airFriction
+        // can set to +1 to use the ammo's native airFriction (not common, as most artillery ammo will have none)
+```
+
+## 2. Vehicle Configs
+
+```cpp
+class CfgVehicles {
+    class yourVic {
+        ace_artillerytables_showRangetable = 1; // [0 disabled, 1 enabled] falls back to artilleryScanner
+        // Show rangetable for this vehicle
+
+        ace_artillerytables_showGunLaying = 1; // [0 disabled, 1 enabled, 2 enabled w/ alt elevationMode] falls back to artilleryScanner
+        // Shows gun laying info (elev/azimuth)
+
+        ace_artillerytables_applyCorrections = 1; // [0 disabled, 1 enabled] falls back to artilleryScanner
+        // Apply advanced corrections (when setting enabled)
+```
diff --git a/docs/wiki/framework/events-framework.md b/docs/wiki/framework/events-framework.md
index 860cd90068..5155cf7593 100644
--- a/docs/wiki/framework/events-framework.md
+++ b/docs/wiki/framework/events-framework.md
@@ -30,6 +30,8 @@ The vehicle events will also have the following local variables available `_gunn
 |`ace_firedPlayerVehicle` | [_vehicle, _weapon, _muzzle, _mode, _ammo, _magazine, _projectile] | Local | Listen | ACE_player turret fires |
 |`ace_firedPlayerVehicleNonLocal` | [_vehicle, _weapon, _muzzle, _mode, _ammo, _magazine, _projectile] | Local | Listen | Any other player turret fires |
 |`ace_firedNonPlayerVehicle` | [_vehicle, _weapon, _muzzle, _mode, _ammo, _magazine, _projectile] | Local | Listen | AI turret fires |
+|`ace_versioning_clientCheckDone` | [[_missingAddonsClient, _additionalAddonsClient, _olderVersionsClient, _newerVersionsClient]] | Local | Listen | When PBO checking has finished on a client |
+|`ace_versioning_serverCheckDone` | [[_serverFiles, _serverVersions]] | Local | Listen | When PBO checking has finished on the server |
 
 ### 2.2 Medical (`ace_medical`)
 
diff --git a/docs/wiki/framework/explosives-framework.md b/docs/wiki/framework/explosives-framework.md
index 8abffa9448..dfaf5bdafb 100644
--- a/docs/wiki/framework/explosives-framework.md
+++ b/docs/wiki/framework/explosives-framework.md
@@ -28,7 +28,6 @@ class CfgMagazines {
         ACE_Explosives_Placeable = 1;  // Can be placed
         useAction = 0;  // Disable the vanilla interaction
         ACE_Explosives_SetupObject = "banana_satchel_place";  // The object placed before the explosive is armed
-        ACE_Explosives_DelayTime = 1.5;  // Seconds between trigger activation and explosion
         class ACE_Triggers {  // Trigger configurations
             SupportedTriggers[] = {"Timer", "Command", "MK16_Transmitter", "DeadmanSwitch"};  // Triggers that can be used
             class Timer {
diff --git a/docs/wiki/framework/hitreactions-framework.md b/docs/wiki/framework/hitreactions-framework.md
new file mode 100644
index 0000000000..ca3ff93f5b
--- /dev/null
+++ b/docs/wiki/framework/hitreactions-framework.md
@@ -0,0 +1,32 @@
+---
+layout: wiki
+title: Hit Reactions Framework
+description: Explains how to set-up weapons with ACE3 hit reactions system.
+group: framework
+order: 5
+parent: wiki
+mod: ace
+version:
+  major: 3
+  minor: 18
+  patch: 0
+---
+
+## 1. Config Values
+
+```cpp
+class CfgWeapons {
+    class MyWeapon {
+         ace_hitreactions_undroppable = 1;  // Prevents weapon from being dropped
+    };
+};
+```
+
+## 2. Mission Variables
+
+### 2.1 Safe pickup distance for AI
+
+Allows 3rd party mods to set the distance between AI and the nearest hostile that is considered safe to go pickup a dropped weapon.
+```sqf
+ace_hitreactions_safePickupDistance = 10; // default is 8
+```
diff --git a/docs/wiki/framework/interactionMenu-framework.md b/docs/wiki/framework/interactionMenu-framework.md
index fb66fb3918..ce8bfd87b8 100644
--- a/docs/wiki/framework/interactionMenu-framework.md
+++ b/docs/wiki/framework/interactionMenu-framework.md
@@ -59,6 +59,10 @@ class CfgVehicles {
 | `distance` | Number | External Base Actions Only, Max distance player can be from action point |
 | `position` | String (of code) | External Base Actions Only, Code to return a position in model cords (priority over `selection`) |
 | `selection` | String | External Base Actions Only, A memory point for `selectionPosition` |
+| `doNotCheckLOS` | Number | (1=true) - Ignores blocked LOS to the interaction node even when beyond 1.2m |
+| `showDisabled` | Number | Currently has no effect |
+| `enableInside` | Number | Currently has no effect |
+| `canCollapse` | Number | Currently has no effect |
 
 Actions can be inserted anywhere on the config tree, e.g. hearing's earplugs is a sub action of `ACE_Equipment`:
 
@@ -72,6 +76,25 @@ class CAManBase: Man {
 };
 ```
 
+Interaction exceptions are defined by several components:
+
+| Component | Exception | Description |
+| ---------- | ----------- | ------------------- |
+| `captives` | `"isNotEscorting"` | Can interact while escorting a captive |
+|  | `"isNotHandcuffed"` | Can interact while handcuffed |
+|  | `"isNotSurrendering"` | Can interact while surrendering |
+| `common` | `"isNotDead"` | Can interact while dead |
+|  | `"notOnMap"` | Can interact while in Map |
+|  | `"isNotInside"` | Can interact while inside a vehicle |
+|  | `"isNotInZeus"` | Can interact while in the zeus interface |
+|  | `"isNotUnconscious"` | Can interact while unconscious |
+| `dragging` | `"isNotDragging"` | Can interact while dragging |
+|  | `"isNotCarrying"` | Can interact while carrying |
+| `interaction` | `"isNotSwimming"` | Can interact while swimming/diving |
+|  | `"isNotOnLadder"` | Can interact while climbing a ladder |
+| `refuel` | `"isNotRefueling"` | Can interact while carrying refueling nozzle |
+| `sitting` | `"isNotSitting"` | Can interact while sitting in a chair |
+
 ## 3. Adding actions via scripts
 
 Two steps, creating an action (array) and then adding it to either a class or object.
@@ -110,6 +133,7 @@ Important: `ace_common_fnc_canInteractWith` is not automatically checked and nee
  * 2: Parent path of the new action <ARRAY>
  * 3: Action <ARRAY>
  * 4: Use Inheritance (Default: False) <BOOL><OPTIONAL>
+ * 5: Classes excluded from inheritance (children included) (Default: []) <ARRAY><OPTIONAL>
  */
 ```
 By default this function will not use inheritance, so actions will only be added to the specific class.
@@ -169,6 +193,10 @@ Using `addActionToClass` inheritance:
 _action = ["CheckFuel", "Check Fuel", "", {hint format ["Fuel: %1", fuel _target]}, {true}] call ace_interact_menu_fnc_createAction;
 ["LandVehicle", 0, ["ACE_MainActions"], _action, true] call ace_interact_menu_fnc_addActionToClass;
 
+// Same as above, but children of "MRAP_01_Base" will not have the action
+_action = ["CheckFuel", "Check Fuel", "", {hint format ["Fuel: %1", fuel _target]}, {true}] call ace_interact_menu_fnc_createAction;
+["LandVehicle", 0, ["ACE_MainActions"], _action, true, ["MRAP_01_Base"]] call ace_interact_menu_fnc_addActionToClass;
+
 // Adds action to check external fuel levels on tanks.  Will be a sub action of the previous action.
 _action = ["CheckExtTank","Check External Tank","",{hint format ["Ext Tank: %1", 5]},{true}] call ace_interact_menu_fnc_createAction;
 ["Tank_F", 0, ["ACE_MainActions", "CheckFuel"], _action, true] call ace_interact_menu_fnc_addActionToClass;
diff --git a/docs/wiki/framework/medical-framework.md b/docs/wiki/framework/medical-framework.md
index 00d9133b00..c0e94b5f9e 100644
--- a/docs/wiki/framework/medical-framework.md
+++ b/docs/wiki/framework/medical-framework.md
@@ -241,3 +241,10 @@ The damage elements are sorted in descending order according to how much damage
 Some of ACE Medical's underlying behavior, primarily related to damage handling and the vitals loop, can be fine-tuned by editing `ace_medical_const_` variables, found in [script_macros_medical.hpp](https://github.com/acemod/ACE3/blob/master/addons/medical_engine/script_macros_medical.hpp).
 
 Modification of those values should be done by advanced users only. Values and variable names are subject to change without prior warning. Modifying values mid-mission may lead to undefined behavior. Expect minimal support.
+
+### 5.1 Disable seat locking for unconscious
+ACE will lock the seat of an unconscious or dead unit to prevent automatic unloading. This can be disabled by setting:
+```sqf
+ace_medical_engine_disableSeatLocking = true;     // disable on everything
+ace_medical_engine_disableSeatLocking = ["ship"]; // disable just on boats
+```
diff --git a/docs/wiki/framework/nightvision-framework.md b/docs/wiki/framework/nightvision-framework.md
index 5f91421b8d..939398ee28 100644
--- a/docs/wiki/framework/nightvision-framework.md
+++ b/docs/wiki/framework/nightvision-framework.md
@@ -43,3 +43,10 @@ Additional color presets
 ```cpp
 ace_nightvision_colorPreset[] = {0.0, {0.0, 0.0, 0.0, 0.0}, {1.1, 0.8, 1.9, 0.9}, {1, 1, 6, 0.0}}; // White Phosphor Preset
 ```
+
+## 3. Brightness Limits
+
+```cpp
+ace_nightvision_const_maxBrightness = 0; // Defaults, change at your leisure
+ace_nightvision_const_minBrightness = -6;
+```
diff --git a/docs/wiki/framework/safemode-framework.md b/docs/wiki/framework/safemode-framework.md
new file mode 100644
index 0000000000..540254fdfa
--- /dev/null
+++ b/docs/wiki/framework/safemode-framework.md
@@ -0,0 +1,58 @@
+---
+layout: wiki
+title: Safemode Framework
+description: Explains how to use the weapon safety API.
+group: framework
+order: 5
+parent: wiki
+mod: ace
+version:
+  major: 3
+  minor: 0
+  patch: 0
+---
+
+## 1. Scripting
+
+### 1.1 Setting weapon safety status
+
+`ace_safemode_fnc_setWeaponSafety`
+If you want the state of the currently selected muzzle, either pass the muzzle by name or leave it blank (= `nil`).
+If the unit doesn't have a weapon, its safety can't be locked, but it can be unlocked.
+
+```sqf
+ * Lock or unlock the given weapon based on weapon state.
+ *
+ * Arguments:
+ * 0: Unit <OBJECT>
+ * 1: Weapon <STRING>
+ * 2: State <BOOL>
+ * 3: Show hint <BOOL> (default: true)
+ * 4: Muzzle <STRING> (default: current muzzle of weapon)
+ *
+ * Return Value:
+ * None
+ *
+ * Example:
+ * [ACE_player, currentWeapon ACE_player, true] call ace_safemode_fnc_setWeaponSafety
+```
+
+### 1.2 Getting weapon safety status
+
+`ace_safemode_fnc_getWeaponSafety`
+If you want the state of the currently selected muzzle, either pass the muzzle by name or leave it blank (= `nil`).
+
+```sqf
+ * Getter for weapon safety state.
+ *
+ * Arguments:
+ * 0: Unit <OBJECT>
+ * 1: Weapon <STRING>
+ * 2: Muzzle <STRING> (default: current muzzle of weapon)
+ *
+ * Return Value:
+ * Safety status <BOOL>
+ *
+ * Example:
+ * [ACE_player, currentWeapon ACE_player] call ace_safemode_fnc_getWeaponSafety
+```
diff --git a/docs/wiki/framework/sitting-framework.md b/docs/wiki/framework/sitting-framework.md
index 09f59a9df4..b8f8ff37b0 100644
--- a/docs/wiki/framework/sitting-framework.md
+++ b/docs/wiki/framework/sitting-framework.md
@@ -29,6 +29,7 @@ class CfgVehicles {
         acex_sitting_sitDirection = 180;  // Direction relative to object
         acex_sitting_sitPosition[] = {0, -0.1, -0.45};  // Position relative to object (may behave weird with certain objects)
         acex_sitting_interactPosition[] = {0, -0.1, -0.45};
+        ace_sitting_animations[] = {"ace_sitting_HubSittingChairA_idle1"}; // Overwrite random animation pool
         XEH_ENABLED;  // Enable XEH (only necessary if XEH is not yet enabled for this class or the one this inherits from)
     };
 };
diff --git a/docs/wiki/framework/vehicledamage-framework.md b/docs/wiki/framework/vehicledamage-framework.md
index 0d4268bf5e..04137e9c73 100644
--- a/docs/wiki/framework/vehicledamage-framework.md
+++ b/docs/wiki/framework/vehicledamage-framework.md
@@ -65,23 +65,29 @@ Default: 0.2
 
 #### 1.1.8 `ace_vehicle_damage_canHaveFireRing`
 
-Whether or not this vehicle can spawn `ring-of-fire` effect (Boolean value: 0 or 1)
+Whether or not this vehicle can spawn a `ring-of-fire` effect (Boolean value: 0 or 1)
 
 Default: 0
 
-#### 1.1.9 `ace_vehicle_damage_slatHitpoints`
+#### 1.1.9 `ace_cookoff_canHaveFireJet`
+
+Whether or not this vehicle can spawn a `jet` effect (Boolean value: 0 or 1)
+
+Default: 0
+
+#### 1.1.10 `ace_vehicle_damage_slatHitpoints`
 
 An array of all hitpoints that are defined to be SLAT. String array
 
 Default: {}
 
-#### 1.1.10 `ace_vehicle_damage_eraHitpoints`
+#### 1.1.11 `ace_vehicle_damage_eraHitpoints`
 
 An array of all hitpoints that are defined to be ERA. String array
 
 Default: {}
 
-#### 1.1.11 `ace_vehicle_damage_turret`
+#### 1.1.12 `ace_vehicle_damage_turret`
 
 String for turret classname to spawn when catastrophically destroyed. Turret will pop-off and this is the class spawned