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_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 b732f033f9..d91129b025 100644
--- a/addons/advanced_throwing/XEH_postInit.sqf
+++ b/addons/advanced_throwing/XEH_postInit.sqf
@@ -13,7 +13,7 @@ GVAR(tempWindInfo) = false;
 // 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/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/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/stringtable.xml b/addons/arsenal/stringtable.xml
index cf858ec24d..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>
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/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/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/stringtable.xml b/addons/cargo/stringtable.xml
index 4e8d707f61..8e16f50090 100644
--- a/addons/cargo/stringtable.xml
+++ b/addons/cargo/stringtable.xml
@@ -506,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>
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/common/XEH_PREP.hpp b/addons/common/XEH_PREP.hpp
index 5a2893eeaf..3a5838a230 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);
@@ -103,6 +104,7 @@ PREP(getWeaponAzimuthAndInclination);
 PREP(getWeaponIndex);
 PREP(getWeaponState);
 PREP(getWeight);
+PREP(getWheelHitPointsWithSelections);
 PREP(getWindDirection);
 PREP(getZoom);
 PREP(goKneeling);
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/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_addPlayerEH.sqf b/addons/common/functions/fnc_addPlayerEH.sqf
index 81d030fb62..c20fde9da1 100644
--- a/addons/common/functions/fnc_addPlayerEH.sqf
+++ b/addons/common/functions/fnc_addPlayerEH.sqf
@@ -2,12 +2,14 @@
 /*
  * 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: false)
+ * 3: Ignore Virtual Units (spectators, virtual zeus, uav RC) <BOOL> (default: true)
  *
  * Return Value:
  * None
@@ -15,9 +17,9 @@
  * Example:
  * ["example", "FiredNear", {systemChat str _this}] call ace_common_fnc_addPlayerEH
  *
- * Public: Yes
+ * Public: No
 */
-params [["_key", "", [""]], ["_type", "", [""]], ["_code", {}, [{}]], ["_ignoreVirtual", false, [false]]];
+params [["_key", "", [""]], ["_type", "", [""]], ["_code", {}, [{}]], ["_ignoreVirtual", true, [true]]];
 TRACE_3("addPlayerEH",_key,_type,_ignoreVirtual);
 
 if (isNil QGVAR(playerEventsHash)) then { // first-run init
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_errorMessage.sqf b/addons/common/functions/fnc_errorMessage.sqf
index 72344299f3..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_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_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_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_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 96ad037cc1..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>
@@ -1896,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">
@@ -1918,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_weapons/compat_cup_weapons_csw/stringtable.xml b/addons/compat_cup_weapons/compat_cup_weapons_csw/stringtable.xml
index 112c335638..ea16be2905 100644
--- a/addons/compat_cup_weapons/compat_cup_weapons_csw/stringtable.xml
+++ b/addons/compat_cup_weapons/compat_cup_weapons_csw/stringtable.xml
@@ -8,6 +8,7 @@
             <Korean>[CSW] AGS-30 벨트</Korean>
             <German>[CSW] AGS30 Gurt</German>
             <Spanish>[CSW] Cinta de AGS30</Spanish>
+            <Italian>[CSW] Nastro AGS30</Italian>
         </Key>
         <Key ID="STR_ACE_Compat_CUP_Weapons_CSW_mag_MK19_displayName">
             <English>[CSW] MK19 Belt</English>
@@ -16,6 +17,7 @@
             <Korean>[CSW] Mk.19 벨트</Korean>
             <German>[CSW] MK19 Gurt</German>
             <Spanish>[CSW] Cinta de MK19</Spanish>
+            <Italian>[CSW] Nastro MK19</Italian>
         </Key>
         <Key ID="STR_ACE_Compat_CUP_Weapons_CSW_mag_TOW_displayName">
             <English>[CSW] TOW Tube</English>
@@ -24,6 +26,7 @@
             <Korean>[CSW] TOW 튜브</Korean>
             <German>[CSW] TOW Rohr</German>
             <Spanish>[CSW] Tubo de TOW</Spanish>
+            <Italian>[CSW] Tubo TOW</Italian>
         </Key>
         <Key ID="STR_ACE_Compat_CUP_Weapons_CSW_mag_TOW2_displayName">
             <English>[CSW] TOW2 Tube</English>
@@ -32,6 +35,7 @@
             <Korean>[CSW] TOW2 튜브</Korean>
             <German>[CSW] TOW2 Rohr</German>
             <Spanish>[CSW] Tubo de TOW2</Spanish>
+            <Italian>[CSW] Tubo TOW2</Italian>
         </Key>
         <Key ID="STR_ACE_Compat_CUP_Weapons_CSW_mag_PG9_displayName">
             <English>[CSW] PG-9 Round</English>
@@ -40,6 +44,7 @@
             <Korean>[CSW] PG-9 대전차고폭탄</Korean>
             <German>[CSW] PG-9 Rakete</German>
             <Spanish>[CSW] Carga de PG-9</Spanish>
+            <Italian>[CSW] Razzo PG-9</Italian>
         </Key>
         <Key ID="STR_ACE_Compat_CUP_Weapons_CSW_mag_OG9_displayName">
             <English>[CSW] OG-9 Round</English>
@@ -48,6 +53,7 @@
             <Korean>[CSW] OG-9 고폭파편탄</Korean>
             <German>[CSW] OG-9 Rakete</German>
             <Spanish>[CSW] Carga de OG-9</Spanish>
+            <Italian>[CSW] Razzo OG-9</Italian>
         </Key>
         <Key ID="STR_ACE_Compat_CUP_Weapons_CSW_mag_M1HE_displayName">
             <English>[CSW] M1 HE</English>
@@ -57,6 +63,7 @@
             <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>
@@ -66,6 +73,7 @@
             <French>[CSW] M84 Fumigène</French>
             <German>[CSW] M84 Rauch</German>
             <Spanish>[CSW] Humo M84</Spanish>
+            <Italian>[CSW] M84 Fumogeno</Italian>
         </Key>
         <Key ID="STR_ACE_Compat_CUP_Weapons_CSW_mag_M60A2_displayName">
             <English>[CSW] M60A2 WP</English>
@@ -75,6 +83,7 @@
             <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>
@@ -84,6 +93,7 @@
             <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>
@@ -93,6 +103,7 @@
             <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>
@@ -102,6 +113,7 @@
             <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>
@@ -111,6 +123,7 @@
             <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>
@@ -120,6 +133,7 @@
             <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>
@@ -129,6 +143,7 @@
             <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>
@@ -138,6 +153,7 @@
             <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>
@@ -147,6 +163,7 @@
             <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 e1afbe21c8..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,6 +48,7 @@
         <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>
@@ -68,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>
@@ -90,6 +91,7 @@
         <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>
diff --git a/addons/compat_rf/compat_rf_realisticnames/CfgVehicles.hpp b/addons/compat_rf/compat_rf_realisticnames/CfgVehicles.hpp
index 016a569c50..2983525ec8 100644
--- a/addons/compat_rf/compat_rf_realisticnames/CfgVehicles.hpp
+++ b/addons/compat_rf/compat_rf_realisticnames/CfgVehicles.hpp
@@ -19,36 +19,54 @@ class CfgVehicles {
         displayName = SUBCSTRING(heli_light_03_unarmed_Name);
     };
 
-    class Heli_EC_01A_base_RF;
-    class Heli_EC_01A_military_base_RF: Heli_EC_01A_base_RF {
-        displayName = SUBCSTRING(ec_01a_military_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_Name);
+        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_Name);
+        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_Name);
+        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_Name);
+        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_Name);
+        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 {
diff --git a/addons/compat_rf/compat_rf_realisticnames/stringtable.xml b/addons/compat_rf/compat_rf_realisticnames/stringtable.xml
index a31221294c..03d5003a62 100644
--- a/addons/compat_rf/compat_rf_realisticnames/stringtable.xml
+++ b/addons/compat_rf/compat_rf_realisticnames/stringtable.xml
@@ -4,294 +4,547 @@
         <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>ヘラ H6 (タン)</Japanese>
+            <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>ヘラ H6 (オリーブ)</Japanese>
+            <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>ヘラ H6 (ブラック)</Japanese>
+            <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>ヘラ H6 (AAF迷彩)</Japanese>
+            <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>ヘラ H6 (ゴールド)</Japanese>
+            <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</English>
-            <Japanese>AW159 ワイルドキャット</Japanese>
+            <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 (Unarmed)</English>
-            <Japanese>AW159 ワイルドキャット (非武装)</Japanese>
-        </Key>
-        <Key ID="STR_ACE_Compat_RF_RealisticNames_ec_01a_military_Name">
-            <English>H225M Super Cougar HADR</English>
-            <Japanese>H225M シュペル クーガー HADR</Japanese>
+            <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>H225M Super Cougar Transport</English>
-            <Japanese>H225M シュペル クーガー 輸送</Japanese>
+            <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_Name">
-            <English>H225 Super Puma Transport</English>
-            <Japanese>H225 シュペル ピューマ 輸送</Japanese>
+        <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_Name">
-            <English>H225 Super Puma VIP</English>
-            <Japanese>H225 シュペル ピューマ VIP</Japanese>
+        <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_02_Name">
+        <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_03_Name">
-            <English>H225M Super Cougar CSAR</English>
-            <Japanese>H225M シュペル クーガー CSAR</Japanese>
+        <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_04_Name">
+        <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 シュペル ピューマ SAR</Japanese>
+            <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</English>
-            <Japanese>AMOS</Japanese>
+            <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_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/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/config.cpp b/addons/compat_rhs_usf3/config.cpp
index 1e67b1e007..73b4723b2c 100644
--- a/addons/compat_rhs_usf3/config.cpp
+++ b/addons/compat_rhs_usf3/config.cpp
@@ -19,7 +19,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_sog/functions/fnc_woundsHandlerIncendiary.sqf b/addons/compat_sog/functions/fnc_woundsHandlerIncendiary.sqf
index 75ee243f08..6d3b7a8678 100644
--- a/addons/compat_sog/functions/fnc_woundsHandlerIncendiary.sqf
+++ b/addons/compat_sog/functions/fnc_woundsHandlerIncendiary.sqf
@@ -18,8 +18,6 @@
  * Public: No
  */
 
-#define BURN_THRESHOLD 1
-
 params ["_unit", "_damages"];
 TRACE_2("woundsHandlerIncendiary",_unit,_damages);
 
@@ -32,9 +30,7 @@ private _fireDamage = 0;
 private _intensity = linearConversion [0, 20, _fireDamage, 0, 10, true];
 TRACE_2("",_intensity,_fireDamage);
 
-if (_intensity > BURN_THRESHOLD) then {
-    TRACE_2("Setting unit ablaze",_intensity,BURN_THRESHOLD);
-    ["ace_fire_burn", [_unit, _intensity]] call CBA_fnc_globalEvent;
-};
+// Let fire handle if unit is set ablaze or not
+[QEGVAR(fire,burn), [_unit, _intensity]] call CBA_fnc_localEvent;
 
 _this // return
diff --git a/addons/compat_spe/functions/fnc_woundsHandlerIncendiary.sqf b/addons/compat_spe/functions/fnc_woundsHandlerIncendiary.sqf
index aa282e9be8..d2b0cb165c 100644
--- a/addons/compat_spe/functions/fnc_woundsHandlerIncendiary.sqf
+++ b/addons/compat_spe/functions/fnc_woundsHandlerIncendiary.sqf
@@ -18,8 +18,6 @@
  * Public: No
  */
 
-#define BURN_THRESHOLD 1
-
 params ["_unit", "_damages"];
 TRACE_2("woundsHandlerIncendiary",_unit,_damages);
 
@@ -32,9 +30,7 @@ private _fireDamage = 0;
 private _intensity = linearConversion [0, 20, _fireDamage, 0, 10, true];
 TRACE_2("",_intensity,_fireDamage);
 
-if (_intensity > BURN_THRESHOLD) then {
-    TRACE_2("Setting unit ablaze",_intensity,BURN_THRESHOLD);
-    ["ace_fire_burn", [_unit, _intensity]] call CBA_fnc_globalEvent;
-};
+// Let fire handle if unit is set ablaze or not
+[QEGVAR(fire,burn), [_unit, _intensity]] call CBA_fnc_localEvent;
 
 _this // return
diff --git a/addons/compat_ws/compat_ws_realisticnames/stringtable.xml b/addons/compat_ws/compat_ws_realisticnames/stringtable.xml
index 30b53b7926..606bbb7932 100644
--- a/addons/compat_ws/compat_ws_realisticnames/stringtable.xml
+++ b/addons/compat_ws/compat_ws_realisticnames/stringtable.xml
@@ -259,10 +259,16 @@
         <Key ID="STR_ACE_Compat_WS_RealisticNames_SLR_Para_Name">
             <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 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>
@@ -459,154 +465,268 @@
         <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/functions/fnc_cookOffServer.sqf b/addons/cookoff/functions/fnc_cookOffServer.sqf
index 303555ba28..05111d7e69 100644
--- a/addons/cookoff/functions/fnc_cookOffServer.sqf
+++ b/addons/cookoff/functions/fnc_cookOffServer.sqf
@@ -175,7 +175,7 @@ if (_delayBetweenSmokeAndFire) then {
             if (["ace_fire"] call EFUNC(common,isModLoaded)) then {
                 // Use current intensity, in case GVAR(cookoffDuration) is very large and only 1 flameout stage happens
                 {
-                    [QEGVAR(fire,burn), [_x, _intensity * 1.5, _instigator]] call CBA_fnc_globalEvent;
+                    [QEGVAR(fire,burn), [_x, _intensity * 1.5, _instigator], _x] call CBA_fnc_targetEvent;
                 } forEach (crew _vehicle);
             };
 
diff --git a/addons/cookoff/stringtable.xml b/addons/cookoff/stringtable.xml
index 205b8d2b4d..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>
@@ -20,35 +20,53 @@
             <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>
@@ -65,7 +83,7 @@
             <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>
@@ -75,18 +93,24 @@
             <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>
@@ -100,16 +124,25 @@
             <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>
@@ -119,7 +152,7 @@
             <Italian>Abilita rimozione munizioni dopo l'esplosione</Italian>
             <Polish>Włącz/Wyłącz usuwanie amunicji podczas samozapłonu</Polish>
             <Chinesesimp>启用/禁用殉爆过程中的弹药移除功能</Chinesesimp>
-            <Korean>쿡오프시 탄약 제거 활성화/비활성화</Korean>
+            <Korean>유폭 시 탄약 제거 활성화/비활성화</Korean>
             <Russian>Вкл. удаление боеприпасов из-за детонации</Russian>
             <Spanish>Habilita/Deshabilita ka eliminación de munición durante la detonación inducida por calor</Spanish>
         </Key>
@@ -129,6 +162,8 @@
             <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/functions/fnc_assemble_canDeployWeapon.sqf b/addons/csw/functions/fnc_assemble_canDeployWeapon.sqf
index 57f2ce2bc8..65dd81cc41 100644
--- a/addons/csw/functions/fnc_assemble_canDeployWeapon.sqf
+++ b/addons/csw/functions/fnc_assemble_canDeployWeapon.sqf
@@ -5,7 +5,7 @@
  *
  * Arguments:
  * 0: Target Tripod <OBJECT>
- * 0: Player <OBJECT>
+ * 1: Player <OBJECT>
  *
  * Return Value:
  * Wether or not you can deploy the weapon <BOOL>
@@ -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..0d508bfa89 100644
--- a/addons/csw/functions/fnc_assemble_canPickupWeapon.sqf
+++ b/addons/csw/functions/fnc_assemble_canPickupWeapon.sqf
@@ -19,7 +19,5 @@ params ["_staticWeapon"];
 
 // 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???
 
-_assemblyMode && {alive _staticWeapon} && {_notCrewed || _deadCrew}
+_assemblyMode && {alive _staticWeapon} && {((crew _staticWeapon) 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..29cc4b5876 100644
--- a/addons/csw/functions/fnc_assemble_deployTripod.sqf
+++ b/addons/csw/functions/fnc_assemble_deployTripod.sqf
@@ -19,16 +19,20 @@
     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");
 
@@ -36,9 +40,24 @@
         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);
+    [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..974bf03431 100644
--- a/addons/csw/functions/fnc_assemble_deployWeapon.sqf
+++ b/addons/csw/functions/fnc_assemble_deployWeapon.sqf
@@ -4,39 +4,51 @@
  * Deploys the current CSW
  *
  * Arguments:
- * 0: Unit <OBJECT>
+ * 0: Target <OBJECT>
+ * 1: Unit <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_pickupTripod.sqf b/addons/csw/functions/fnc_assemble_pickupTripod.sqf
index 176718f015..0996c0f3d3 100644
--- a/addons/csw/functions/fnc_assemble_pickupTripod.sqf
+++ b/addons/csw/functions/fnc_assemble_pickupTripod.sqf
@@ -11,7 +11,7 @@
  * 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..468f385efa 100644
--- a/addons/csw/functions/fnc_assemble_pickupWeapon.sqf
+++ b/addons/csw/functions/fnc_assemble_pickupWeapon.sqf
@@ -5,12 +5,13 @@
  *
  * Arguments:
  * 0: Static Weapon <OBJECT>
+ * 1: Unit <OBJECT>
  *
  * Return Value:
  * None
  *
  * Example:
- * [weapon] call ace_csw_fnc_assemble_pickupWeapon
+ * [cursorObject, player] call ace_csw_fnc_assemble_pickupWeapon
  *
  * Public: No
  */
@@ -43,11 +44,10 @@
         _args params ["_staticWeapon", "_player", "_carryWeaponClassname", "_turretClassname", "_onDisassembleFunc"];
         TRACE_4("disassemble finish",_staticWeapon,_player,_carryWeaponClassname,_turretClassname);
 
-        private _weaponPos = getPosATL _staticWeapon;
-        _weaponPos set [2, (_weaponPos select 2) + 0.1];
+        private _weaponPos = (getPosATL _staticWeapon) vectorAdd [0, 0, 0.1];
         private _weaponDir = getDir _staticWeapon;
 
-        private _carryWeaponMag = "";
+        private _carryWeaponMag = [];
         private _carryWeaponMags = compatibleMagazines _carryWeaponClassname;
         LOG("remove ammo");
         {
@@ -55,9 +55,9 @@
             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 {
@@ -80,25 +80,40 @@
         };
 
         [{
-            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");
+
+        // 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 {
+                _staticWeapon deleteVehicleCrew _x;
+            } else {
+                moveOut _x;
+            };
+        } forEach (crew _staticWeapon);
+
         deleteVehicle _staticWeapon;
 
         LOG("end");
@@ -107,7 +122,8 @@
     private _condition = {
         params ["_args"];
         _args params ["_staticWeapon"];
-        ((crew _staticWeapon) isEqualTo []) && (alive _staticWeapon)
+
+        _staticWeapon call FUNC(assemble_canPickupWeapon)
     };
 
     [TIME_PROGRESSBAR(_pickupTime), [_staticWeapon, _player, _carryWeaponClassname, _turretClassname, _onDisassembleFunc], _onFinish, {}, LLSTRING(DisassembleCSW_progressBar), _condition] call EFUNC(common,progressBar);
diff --git a/addons/csw/functions/fnc_canPickupTripod.sqf b/addons/csw/functions/fnc_canPickupTripod.sqf
index 0a9f0f5f90..2ec3b065da 100644
--- a/addons/csw/functions/fnc_canPickupTripod.sqf
+++ b/addons/csw/functions/fnc_canPickupTripod.sqf
@@ -5,7 +5,7 @@
  *
  * Arguments:
  * 0: Tripod <OBJECT>
- * 1: Unit <OBJECT>
+ * 1: Unit (not used) <OBJECT>
  *
  * Return Value:
  * Can pickup <BOOL>
@@ -16,6 +16,6 @@
  * 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_reload_handleAddTurretMag.sqf b/addons/csw/functions/fnc_reload_handleAddTurretMag.sqf
index e5aa51d342..d7af22d319 100644
--- a/addons/csw/functions/fnc_reload_handleAddTurretMag.sqf
+++ b/addons/csw/functions/fnc_reload_handleAddTurretMag.sqf
@@ -25,7 +25,7 @@ params ["_vehicle", "_turret", "_magSource", "_carryMag", "_ammoReceived", ["_re
 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..51036b525a 100644
--- a/addons/csw/functions/fnc_reload_handleRemoveTurretMag.sqf
+++ b/addons/csw/functions/fnc_reload_handleRemoveTurretMag.sqf
@@ -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_staticWeaponInit_unloadExtraMags.sqf b/addons/csw/functions/fnc_staticWeaponInit_unloadExtraMags.sqf
index 23155ead0b..98200840a3 100644
--- a/addons/csw/functions/fnc_staticWeaponInit_unloadExtraMags.sqf
+++ b/addons/csw/functions/fnc_staticWeaponInit_unloadExtraMags.sqf
@@ -68,14 +68,38 @@ TRACE_1("Remove all loaded magazines",_magsToRemove);
     };
 } 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 = _staticWeapon getVariable [QGVAR(secondaryWeaponMagazines), []];
+
+if (_secondaryWeaponMagazines isNotEqualTo []) then {
+    // Check if the static weapon can take magazines
+    private _turret = (allTurrets _staticWeapon) param [0, []];
+    private _compatibleMagazinesTurret = flatten ((_staticWeapon weaponsTurret _turret) apply {compatibleMagazines _x});
+    private _container = objNull;
+
+    {
+        private _vehicleMag = [_staticWeapon, _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 {
+            _staticWeapon addMagazineTurret [_vehicleMag, _turret, _x select 1];
+        } else {
+            // Find a suitable container to place items in if necessary
+            if (isNull _container) then {
+                _container = (nearestObjects [_staticWeapon, ["GroundWeaponHolder"], 10]) param [0, objNull];
+
+                // Create ammo storage container
+                if (isNull _container) then {
+                    _container = createVehicle ["GroundWeaponHolder", getPosATL _staticWeapon, [], 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;
+
+    _staticWeapon setVariable [QGVAR(secondaryWeaponMagazines), nil, true];
 };
 
 if (_storeExtraMagazines) then {
diff --git a/addons/csw/stringtable.xml b/addons/csw/stringtable.xml
index 7c241a8a51..da794376ab 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>
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/XEH_PREP.hpp b/addons/dogtags/XEH_PREP.hpp
index 5917600139..a34a04a982 100644
--- a/addons/dogtags/XEH_PREP.hpp
+++ b/addons/dogtags/XEH_PREP.hpp
@@ -5,10 +5,8 @@ PREP(bloodType);
 PREP(canCheckDogtag);
 PREP(canTakeDogtag);
 PREP(checkDogtag);
-PREP(checkDogtagItem);
 PREP(getDogtagData);
 PREP(getDogtagItem);
-PREP(sendDogtagData);
 PREP(showDogtag);
 PREP(ssn);
 PREP(takeDogtag);
diff --git a/addons/dogtags/XEH_postInit.sqf b/addons/dogtags/XEH_postInit.sqf
index d9c35dc172..6e676671ae 100644
--- a/addons/dogtags/XEH_postInit.sqf
+++ b/addons/dogtags/XEH_postInit.sqf
@@ -1,13 +1,34 @@
 #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;
 
-// Add actions and event handlers only if ace_medical is loaded
+if (hasInterface || isServer) then {
+    [QGVAR(broadcastDogtagInfo), {
+        GVAR(dogtagsData) set _this;
+    }] 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;
+    } else {
+        // To be here, hasInterface must be true
+        [QGVAR(requestSyncDogtagDataJIP), clientOwner] call CBA_fnc_serverEvent;
+    };
+};
+
+// 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",
@@ -44,7 +65,7 @@ if (["ace_medical"] call EFUNC(common,isModLoaded)) then {
             };
         }] 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 {
@@ -54,8 +75,6 @@ if (["ace_arsenal"] call EFUNC(common,isModLoaded)) then {
         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 = [];
@@ -64,15 +83,37 @@ if (["ace_arsenal"] call EFUNC(common,isModLoaded)) then {
                 _item = _rightPanel lnbData [_i, 0];
 
                 if (_item isKindOf ["ACE_dogtag", _cfgWeapons]) then {
-                    _dogtagData = _allDogtagsData param [_allDogtags find _item, []];
+                    private _name = (GVAR(dogtagsData) getOrDefault [_item, []]) param [0, ""];
 
-                    // If data doesn't exist, put name as "unknown"
-                    _rightPanel lnbSetText [[_i, 1], [LLSTRING(itemName), ": ", _dogtagData param [0, LELSTRING(common,unknown)]] joinString ""];
+                    // 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;
+
 // Disable dogtags for civilians
 "CIV_F" call FUNC(disableFactionDogtags);
diff --git a/addons/dogtags/XEH_preInit.sqf b/addons/dogtags/XEH_preInit.sqf
index f5fcb406b1..482551de0a 100644
--- a/addons/dogtags/XEH_preInit.sqf
+++ b/addons/dogtags/XEH_preInit.sqf
@@ -8,4 +8,12 @@ PREP_RECOMPILE_END;
 
 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..b41cce1be8 100644
--- a/addons/dogtags/functions/fnc_addDogtagActions.sqf
+++ b/addons/dogtags/functions/fnc_addDogtagActions.sqf
@@ -27,7 +27,9 @@ private _fnc_getActions = {
             private _displayName = getText (_config >> "displayName");
             private _picture = getText (_config >> "picture");
 
-            private _action = [_x, _displayName, _picture, FUNC(checkDogtagItem), {true}, {}, _x] call EFUNC(interact_menu,createAction);
+            private _action = [_x, _displayName, _picture, {
+                [GVAR(dogtagsData) getOrDefault [_this select 2, []]] call FUNC(showDogtag);
+            }, {true}, {}, _x] call EFUNC(interact_menu,createAction);
             _actions pushBack [_action, [], _player];
         };
     } forEach (_player call EFUNC(common,uniqueItems));
diff --git a/addons/dogtags/functions/fnc_addDogtagItem.sqf b/addons/dogtags/functions/fnc_addDogtagItem.sqf
index 970bb1926e..6979299db3 100644
--- a/addons/dogtags/functions/fnc_addDogtagItem.sqf
+++ b/addons/dogtags/functions/fnc_addDogtagItem.sqf
@@ -20,10 +20,17 @@ params ["_item", "_dogtagData"];
 
 if (_item == "") exitWith {};
 
-[ace_player, _item] call CBA_fnc_addItem;
+// Verify that the unit has inventory space, otherwise drop the dogtag on the ground
+[ace_player, _item, true] call CBA_fnc_addItem;
 
-_dogtagData params ["_nickName"];
-private _displayText = format [localize LSTRING(takeDogtagSuccess), _nickName];
+_dogtagData params ["_name"];
+
+// If data doesn't exist or body has no name, set name as "unknown"
+if (_name == "") then {
+    _name = LELSTRING(common,unknown);
+};
+
+private _displayText = format [localize LSTRING(takeDogtagSuccess), _name];
 
 // display message
 [{
diff --git a/addons/dogtags/functions/fnc_canCheckDogtag.sqf b/addons/dogtags/functions/fnc_canCheckDogtag.sqf
index bec3ef0dfa..98d437cbac 100644
--- a/addons/dogtags/functions/fnc_canCheckDogtag.sqf
+++ b/addons/dogtags/functions/fnc_canCheckDogtag.sqf
@@ -23,4 +23,4 @@ if (isNull _target) 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 c482d74c1c..5f0a6d1afe 100644
--- a/addons/dogtags/functions/fnc_canTakeDogtag.sqf
+++ b/addons/dogtags/functions/fnc_canTakeDogtag.sqf
@@ -23,4 +23,4 @@ if (isNull _target) 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)) && {_player canAdd ["ACE_dogtag_1", 1/*, true*/]} // Todo: Uncomment in 2.18
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_getDogtagItem.sqf b/addons/dogtags/functions/fnc_getDogtagItem.sqf
index 04112bcc94..e5f05eb19b 100644
--- a/addons/dogtags/functions/fnc_getDogtagItem.sqf
+++ b/addons/dogtags/functions/fnc_getDogtagItem.sqf
@@ -21,19 +21,14 @@ 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;
-
-missionNamespace setVariable [QGVAR(allDogtags), _allDogtags];
-missionNamespace setVariable [QGVAR(allDogtagDatas), _allDogtagDatas];
+private _item = format ["ACE_dogtag_%1", GVAR(idCounter)];
 
 [QGVAR(addDogtagItem), [_item, _dogTagData], [_player]] call CBA_fnc_targetEvent;
+
+// Broadcast data globally, so that clients can use it where needed
+[QGVAR(broadcastDogtagInfo), [_item, _dogTagData]] call CBA_fnc_globalEvent;
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..9e01bfc3cd 100644
--- a/addons/dogtags/functions/fnc_showDogtag.sqf
+++ b/addons/dogtags/functions/fnc_showDogtag.sqf
@@ -31,5 +31,11 @@ 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/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_dropObject.sqf b/addons/dragging/functions/fnc_dropObject.sqf
index 10cfda1703..4115f28820 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);
 };
 
diff --git a/addons/dragging/functions/fnc_dropObject_carry.sqf b/addons/dragging/functions/fnc_dropObject_carry.sqf
index 184b1755c0..ff6324e0f3 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);
     };
 
@@ -116,7 +116,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/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/functions/fnc_addDetonateActions.sqf b/addons/explosives/functions/fnc_addDetonateActions.sqf
index ea4b87128a..d950278c35 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), ""] != ""}}
@@ -144,7 +144,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/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/fieldmanual/stringtable.xml b/addons/fieldmanual/stringtable.xml
index 78b7ad6fe8..12e34d0e34 100644
--- a/addons/fieldmanual/stringtable.xml
+++ b/addons/fieldmanual/stringtable.xml
@@ -312,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">
@@ -388,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">
@@ -425,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">
@@ -860,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/CfgSounds.hpp b/addons/fire/CfgSounds.hpp
index b83ce9b91a..76fb0e64f7 100644
--- a/addons/fire/CfgSounds.hpp
+++ b/addons/fire/CfgSounds.hpp
@@ -1,10 +1,10 @@
 // weird ass concatenation syntax. PBO Project complains otherwise...
 #define CONCAT(a,b) a####b
 #define CREATE_SCREAM(no)\
-class GVAR(DOUBLES(scream,no)) { \
-    name = QUOTE(GVAR(CONCAT(scream,no)));\
-    sound[] = {QUOTE(PATHTOF(CONCAT(sounds\scream,no).ogg)), QUOTE(db+8), 1};\
-    titles[] = {}; \
+class GVAR(DOUBLES(scream,no)) {\
+    name = QGVAR(CONCAT(scream,no));\
+    sound[] = {QPATHTOF(CONCAT(sounds\scream,no).ogg), QUOTE(db+8), 1};\
+    titles[] = {};\
 }
 
 class CfgSounds {
diff --git a/addons/fire/CfgVehicles.hpp b/addons/fire/CfgVehicles.hpp
new file mode 100644
index 0000000000..0ed16faff7
--- /dev/null
+++ b/addons/fire/CfgVehicles.hpp
@@ -0,0 +1,7 @@
+class CfgVehicles {
+    class Static;
+    class GVAR(logic): Static {
+        scope = 1;
+        displayName = "";
+    };
+};
diff --git a/addons/fire/XEH_PREP.hpp b/addons/fire/XEH_PREP.hpp
index 8b2e8f6bd1..a352cdf2aa 100644
--- a/addons/fire/XEH_PREP.hpp
+++ b/addons/fire/XEH_PREP.hpp
@@ -1,9 +1,10 @@
 PREP(burn);
-PREP(isBurning);
+PREP(burnEffects);
 PREP(burnIndicator);
 PREP(burnReaction);
+PREP(burnSimulation);
 PREP(fireManagerPFH);
-
+PREP(isBurning);
+PREP(medical_canPatDown);
 PREP(medical_progress);
 PREP(medical_success);
-PREP(medical_canPatDown);
diff --git a/addons/fire/XEH_postInit.sqf b/addons/fire/XEH_postInit.sqf
index 571c0033d9..641b74fffe 100644
--- a/addons/fire/XEH_postInit.sqf
+++ b/addons/fire/XEH_postInit.sqf
@@ -1,37 +1,89 @@
 #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
+
+    // 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;
 
-["ace_settingsInitialized", {
+if (!isServer) exitWith {};
+
+["CBA_settingsInitialized", {
     TRACE_1("settingsInit",GVAR(enabled));
+
     if (!GVAR(enabled)) exitWith {};
 
-    if (isServer) then {
-        [QGVAR(addFireSource), {
-            params ["_source", "_radius", "_intensity", "_key", ["_condition", { true }], ["_conditionArgs", []]];
-            private _fireLogic = createVehicle ["ACE_LogicDummy", [0, 0, 0], [], 0, "NONE"];
-            if (_source isEqualType objNull) then {
-                _fireLogic attachTo [_source];
-            } else {
-                _fireLogic setPosASL _source;
-            };
+    GVAR(fireSources) = createHashMap;
 
-            [GVAR(fireSources), _key, [_fireLogic, _radius, _intensity, _condition, _conditionArgs]] call CBA_fnc_hashSet;
-        }] call CBA_fnc_addEventHandler;
+    [QGVAR(addFireSource), {
+        params [
+            ["_source", objNull, [objNull, []]],
+            ["_radius", 0, [0]],
+            ["_intensity", 0, [0]],
+            ["_key", ""],
+            ["_condition", {true}, [{}]],
+            ["_conditionArgs", []]
+        ];
 
-        [QGVAR(removeFireSource), {
-            params ["_key"];
-            [GVAR(fireSources), _key] call CBA_fnc_hashRem;
-        }] call CBA_fnc_addEventHandler;
+        private _isObject = _source isEqualType objNull;
 
-        [LINKFUNC(fireManagerPFH), FIRE_MANAGER_PFH_DELAY, []] call CBA_fnc_addPerFrameHandler;
-        GVAR(fireSources) = [[], nil] call CBA_fnc_hashCreate;
-    };
+        // Check if the source is valid
+        if !(_isObject || {_source isEqualTypeParams [0, 0, 0]}) exitWith {};
+
+        if (_isObject && {isNull _source}) exitWith {};
+        if (_radius == 0 || _intensity == 0) exitWith {};
+        if (_key isEqualTo "") exitWith {}; // key can be many types
+
+        // hashValue supports more types than hashmaps do by default, but not all (e.g. locations)
+        private _hashedKey = hashValue _key;
+
+        if (isNil "_hashedKey") exitWith {
+            ERROR_2("Unsupported key type used: %1 - %2",_key,typeName _key);
+        };
+
+        // If a position is passed, create a static object at said position
+        private _sourcePos = if (_isObject) then {
+            getPosATL _source
+        } else {
+            ASLToATL _source
+        };
+
+        private _fireLogic = createVehicle [QGVAR(logic), _sourcePos, [], 0, "CAN_COLLIDE"];
+
+        // If an object was passed, attach logic to the object
+        if (_isObject) then {
+            _fireLogic attachTo [_source];
+        };
+
+        // To avoid issues, remove existing entries first before overwriting
+        if (_hashedKey in GVAR(fireSources)) then {
+            [QGVAR(removeFireSource), _key] call CBA_fnc_localEvent;
+        };
+
+        GVAR(fireSources) set [_hashedKey, [_fireLogic, _radius, _intensity, _condition, _conditionArgs]];
+    }] call CBA_fnc_addEventHandler;
+
+    [QGVAR(removeFireSource), {
+        params ["_key"];
+
+        private _hashedKey = hashValue _key;
+
+        if (isNil "_hashedKey") exitWith {
+            ERROR_2("Unsupported key type used: %1 - %2",_key,typeName _key);
+        };
+
+        (GVAR(fireSources) deleteAt _hashedKey) params [["_fireLogic", objNull]];
+
+        detach _fireLogic;
+        deleteVehicle _fireLogic;
+    }] call CBA_fnc_addEventHandler;
+
+    [LINKFUNC(fireManagerPFH), FIRE_MANAGER_PFH_DELAY, []] call CBA_fnc_addPerFrameHandler;
 }] call CBA_fnc_addEventHandler;
diff --git a/addons/fire/config.cpp b/addons/fire/config.cpp
index da8cd0091c..df2eb5cb79 100644
--- a/addons/fire/config.cpp
+++ b/addons/fire/config.cpp
@@ -24,6 +24,7 @@ class CfgPatches {
 
 #include "CfgEventHandlers.hpp"
 #include "CfgSounds.hpp"
+#include "CfgVehicles.hpp"
 #include "ACE_Medical_Treatment_Actions.hpp"
 #include "RscTitles.hpp"
 
diff --git a/addons/fire/functions/fnc_burn.sqf b/addons/fire/functions/fnc_burn.sqf
index 1d829dfc45..1cf0fc6759 100644
--- a/addons/fire/functions/fnc_burn.sqf
+++ b/addons/fire/functions/fnc_burn.sqf
@@ -1,13 +1,12 @@
 #include "..\script_component.hpp"
 /*
- * Author: tcvm
- * Makes object catch fire. Only call from events. Local effects only.
- * Arbitrary values to ignite people. Assumed maximum is "10".
+ * Author: johnb43
+ * Makes a unit catch fire. Only call from targeted events, is applied globally.
  *
  * Arguments:
- * 0: Vehicle <OBJECT>
- * 1: Intensity of fire <NUMBER>
- * 2: Instigator of fire <OBJECT> (default: objNull)
+ * 0: Unit <OBJECT>
+ * 1: Fire intensity <NUMBER>
+ * 2: Fire instigator <OBJECT> (default: objNull)
  *
  * Return Value:
  * None
@@ -18,322 +17,62 @@
  * Public: No
  */
 
-#define INTENSITY_LOSS 0.03
-#define INTENSITY_UPDATE 3
-#define BURN_PROPOGATE_UPDATE 1
-#define BURN_PROPOGATE_DISTANCE 2
-#define BURN_PROPOGATE_COUNTER_MAX 5
-
-params ["_unit", "_intensity", ["_instigator", objNull]];
+if (!EGVAR(common,settingsInitFinished)) exitWith {
+    EGVAR(common,runAtSettingsInitialized) pushBack [LINKFUNC(burn), _this];
+};
 
 if (!GVAR(enabled)) exitWith {};
 
-private _isBurning = [_unit] call FUNC(isBurning);
-if (_isBurning) exitWith {};
+params ["_unit", "_intensity", ["_instigator", objNull]];
+TRACE_3("burn",_unit,_intensity,_instigator);
 
-[{
-    // looped function
-    (_this getVariable "params") params ["_unit", "", "_instigator"];
-    private _unitPos = getPosASL _unit;
+if (BURN_MIN_INTENSITY > _intensity) exitWith {
+    TRACE_3("intensity is too low",_unit,_intensity,BURN_MIN_INTENSITY);
+};
 
-    _intensity = _unit getVariable [QGVAR(intensity), 0];
+// Check if unit is remote (objNull is remote)
+if (!local _unit) exitWith {
+    TRACE_1("unit is null or not local",_unit);
+};
 
-    if (surfaceIsWater _unitPos && {(_unitPos#2) < 1}) then {
-        _intensity = 0;
+// Check if the unit can burn (takes care of spectators and curators)
+if (getNumber (configOf _unit >> "isPlayableLogic") == 1 || {!(_unit isKindOf "CAManBase")}) exitWith {
+    TRACE_1("unit is virtual or not a man",_unit);
+};
+
+// If unit is invulnerable, don't burn the unit
+if !(isDamageAllowed _unit && {_unit getVariable [QEGVAR(medical,allowDamage), true]}) exitWith {
+    TRACE_1("unit is invulnerable",_unit);
+};
+
+private _eyePos = eyePos _unit;
+
+// Check if unit is mostly submerged in water
+if (surfaceIsWater _eyePos && {(_eyePos select 2) < 0.1}) exitWith {
+    TRACE_1("unit is in water",_unit);
+};
+
+// If unit is already burning, update intensity, but don't add another PFH
+if (_unit call FUNC(isBurning)) exitWith {
+    // Only allow intensity to be increased
+    if (_intensity <= (_unit getVariable [QGVAR(intensity), 0])) exitWith {
+        TRACE_2("unit already burning, no intensity update",_unit,_intensity);
     };
 
-    _fireParticle setDropInterval (0.01 max linearConversion [BURN_MAX_INTENSITY, BURN_MIN_INTENSITY, _intensity, 0.03, 0.1, false]);
-    _fireParticle setParticleParams [
-        ["\A3\data_f\ParticleEffects\Universal\Universal", 16, 10, 32], // sprite sheet values
-        "", // animation name
-        "Billboard", // particle type
-        1, // timer period
-        0.7, // lifetime
-        "destructionEffect2", // position
-        [0, 0, 1], // move velocity
-        0, // rotation velocity
-        10, // weight
-        7.9, // volume
-        1, // rubbing
-        [0.3, 0.3], // size
-        [
-            [1, 1, 1, -0],
-            [1, 1, 1, -1],
-            [1, 1, 1, -1],
-            [1, 1, 1, -1],
-            [1, 1, 1, -0]
-        ], // colour
-        [0.5, 1], // animation speed
-        1, // random dir period
-        0, // random dir intensity
-        "", // on timer script
-        "", // before destroy script
-        _unit, // particle source
-        0,
-        false,
-        0,
-        [[0.8, 0.6, 0.2, 1]] // emissive color
-    ];
-    _fireParticle setParticleRandom [
-        0.04 * _intensity, // life time
-        [0.05, 0.05, 2], // position
-        [0.05 * _intensity, 0.05 * _intensity, 0.05 * _intensity], // move velocity
-        0, // rotation velocity
-        0.06 * _intensity, // size
-        [0, 0, 0, 0], // color
-        0, // random direction period
-        0 // random direction intensity
-    ];
+    TRACE_2("unit already burning, updating intensity",_unit,_intensity);
 
-    _smokeParticle setParticleCircle [0, [0, 0, 0]];
-    _smokeParticle setParticleRandom [
-        0, // life time
-        [0.25, 0.25, 0], // position
-        [0.2, 0.2, 0], // move velocity
-        0, // rotation velocity
-        0.25, // size
-        [0, 0, 0, 0.1], // color
-        0, // random direction period
-        0 // random direction intensity
-    ];
-    _smokeParticle setParticleParams [
-        ["\A3\data_f\ParticleEffects\Universal\Universal", 16, 7, 48], // sprite sheet values
-        "", // animation name
-        "Billboard", // particle type
-        1, // timer period
-        8, // lifetime
-        [0, 0, 1.1], // position
-        [0, 0, 1], // move velocity
-        0, // rotation velocity
-        10, // weight
-        7.9, // volume
-        0.066, // rubbing
-        [1, 3, 6], // size
-        [
-            [0.5, 0.5, 0.5, 0.15],
-            [0.75, 0.75, 0.75, 0.075],
-            [1, 1, 1, 0]
-        ], // colour
-        [0.125], // animation speed
-        1, // random dir period
-        0, // random dir intensity
-        "", // on timer script
-        "", // before destroy script
-        _unit // particle source
-    ];
-    _smokeParticle setDropInterval 0.15;
+    _unit setVariable [QGVAR(intensity), _intensity, true];
+};
 
-    _fireLight setLightBrightness ((_intensity * 3) / 10);
-    _lightFlare setLightBrightness (_intensity / 30);
+TRACE_2("setting unit ablaze",_unit,_intensity);
 
-    private _distanceToUnit = (_unit distance ace_player);
-    _fireLight setLightAttenuation [1, 10 max (5 min (10 - _intensity)), 0, 15];
-    _lightFlare setLightFlareSize (_intensity * (3 / 4)) * FLARE_SIZE_MODIFIER;
+_unit setVariable [QGVAR(intensity), _intensity, true];
 
-    if (!GVAR(enableFlare)) then {
-        _lightFlare setLightFlareSize 0;
-    };
+// Fire simulation (fire sources are handled differently)
+[QGVAR(burnSimulation), [_unit, _instigator], _unit] call CBA_fnc_targetEvent;
 
-    // always keep flare visible to perceiving unit as long as it isnt the player
-    if (_unit isNotEqualTo ace_player) then {
-        private _relativeAttachPoint = [0, 0, 0.3];
-        if (_distanceToUnit > 1.5) then {
-            _relativeAttachPoint = (vectorNormalized (_unit worldToModelVisual (getPos ace_player))) vectorMultiply linearConversion [5, 30, _distanceToUnit, 0.5, 1.5];
-            _relativeAttachPoint set [2, 0.3 + ((_unit selectionPosition "pelvis") select 2)];
-        };
-        _lightFlare attachTo [_unit, _relativeAttachPoint];
-    };
+// Spawn effects for unit
+private _burnEffectsJipID = [QGVAR(burnEffects), _unit] call CBA_fnc_globalEventJIP;
+[_burnEffectsJipID, _unit] call CBA_fnc_removeGlobalEventJIP;
 
-    if (!isGamePaused) then {
-        // If the unit goes to spectator alive _unit == true and they will be on fire and still take damage
-        // Only workaround I could think of, kinda clunky
-        if (_isThisUnitAlive) then {
-            _isThisUnitAlive = (alive _unit) && { getNumber ((configOf _unit) >> "isPlayableLogic") != 1 };
-        };
-
-        // propagate fire
-        if ((CBA_missionTime - _lastPropogateUpdate) >= BURN_PROPOGATE_UPDATE) then {
-            _lastPropogateUpdate = CBA_missionTime;
-            if !([ace_player] call FUNC(isBurning)) then {
-                if ((vehicle _unit) isEqualTo (vehicle ace_player)) then {
-                    if (0.5 > random 1) then {
-                        [QGVAR(burn), [ace_player, _intensity * (7 / 8), _instigator]] call CBA_fnc_globalEvent;
-                    };
-                } else {
-                    if ((ace_player isKindOf "Man") && {_unit isNotEqualTo ace_player} && {isDamageAllowed ace_player && {ace_player getVariable [QEGVAR(medical,allowDamage), true]}}) then {
-                        private _burnCounter = _unit getVariable [QGVAR(burnCounter), 0];
-                        if (_distanceToUnit < BURN_PROPOGATE_DISTANCE) then {
-                            if (_burnCounter < BURN_PROPOGATE_COUNTER_MAX) then {
-                                _burnCounter = _burnCounter + 1;
-                            } else {
-                                [QGVAR(burn), [ace_player, _intensity * (3 / 4), _instigator]] call CBA_fnc_globalEvent;
-                            };
-                        } else {
-                            _burnCounter = 0;
-                        };
-                        _unit setVariable [QGVAR(burnCounter), _burnCounter];
-                    };
-                };
-            };
-        };
-
-        // update intensity/fire reactions
-        if ((CBA_missionTime - _lastIntensityUpdate) >= INTENSITY_UPDATE) then {
-            _lastIntensityUpdate = CBA_missionTime;
-            _intensity = _intensity - INTENSITY_LOSS - (rain / 10);
-            if (local _unit) then {
-                if (_isThisUnitAlive) then {
-                    if !(IS_UNCONSCIOUS(_unit)) then {
-                        if !(isPlayer _unit) then {
-                            private _sdr = _unit getVariable [QGVAR(stopDropRoll), false];
-                            if ((_unit isEqualTo vehicle _unit) && (_sdr || ({ 0.05 > random 1 }))) then {
-                                _unit setVariable [QGVAR(stopDropRoll), true];
-                                if !(_sdr) then {
-                                    TRACE_1("stop,drop,roll!",_unit);
-                                    _unit setUnitPos "DOWN";
-                                    doStop _unit;
-                                };
-                                // queue up a bunch of animations
-                                for "_i" from 0 to 2 do {
-                                    [_unit, selectRandom ["amovppnemstpsnonwnondnon_amovppnemevasnonwnondl", "amovppnemstpsnonwnondnon_amovppnemevasnonwnondr"], 0] call EFUNC(common,doAnimation);
-                                };
-                                _intensity = _intensity - (1 / _intensity);
-                            } else {
-                                private _group = (group _unit);
-                                private _vehicle = vehicle _unit;
-
-                                if (_vehicle != _unit) then {
-                                    TRACE_1("Ejecting",_unit);
-                                    _unit leaveVehicle _vehicle;
-                                    unassignVehicle _unit;
-                                    _unit action ["eject",_vehicle];
-                                };
-                                _unit disableAI "TARGET";
-                                _unit disableAI "AUTOTARGET";
-
-                                // Run away
-                                if (leader _group != _unit) then {
-                                    [_unit] join grpNull;
-                                };
-                                _unit doMove ((getPosATL _unit) getPos [20 + random 35, floor (random 360)]);
-                                _unit setSpeedMode "FULL";
-                                _unit setSuppression 1;
-                            };
-                        } else {
-                            if ((animationState _unit) in PRONE_ROLLING_ANIMS) then {
-                                // decrease intensity of burn
-                                _intensity = _intensity * INTENSITY_DECREASE_MULT_ROLLING;
-                            };
-                        };
-
-                        [_unit] call FUNC(burnReaction);
-                    };
-
-                    // Common burn areas are the hands and face https://www.ncbi.nlm.nih.gov/pubmed/16899341/
-                    private _woundSelection = ["Head", "Body", "LeftArm", "RightArm", "LeftLeg", "RightLeg"] selectRandomWeighted [0.77, 0.5, 0.8, 0.8, 0.3, 0.3];
-                    if (GET_PAIN_PERCEIVED(_unit) < (PAIN_UNCONSCIOUS + random 0.2)) then {
-                        // keep pain around unconciousness limit to allow for more fun interactions
-                        [_unit, _intensity / BURN_MAX_INTENSITY, _woundSelection, "burn", _instigator] call EFUNC(medical,addDamageToUnit);
-                    } else {
-                        [_unit, 0.15, _woundSelection, "burn", _instigator] call EFUNC(medical,addDamageToUnit);
-                    };
-                };
-                _unit setVariable [QGVAR(intensity), _intensity, true]; // globally sync intensity across all clients to make sure simulation is deterministic
-            };
-        };
-
-        private _burnIndicatorPFH = _unit getVariable [QGVAR(burnUIPFH), -1];
-        if (_unit isEqualTo ace_player && { _isThisUnitAlive } && { _burnIndicatorPFH < 0 }) then {
-            _burnIndicatorPFH = [LINKFUNC(burnIndicator), 1, _unit] call CBA_fnc_addPerFrameHandler;
-            _unit setVariable [QGVAR(burnUIPFH), _burnIndicatorPFH];
-        };
-    };
-}, 0, [_unit, _intensity, _instigator], {
-    TRACE_1("burn init",GVAR(enableFlare));
-    // init function
-    private _params = _this getVariable "params";
-    _params params ["_unit", "_startingIntensity"];
-
-    _intensity = _startingIntensity;
-    private _unitPos = getPos _unit;
-
-    _fireParticle = "#particlesource" createVehicleLocal _unitPos;
-    _fireParticle attachTo [_unit, [0, 0, 0]];
-    _fireParticle setDropInterval 0.03;
-
-    _smokeParticle = "#particlesource" createVehicleLocal _unitPos;
-
-    _fireLight = "#lightpoint" createVehicleLocal _unitPos;
-    _fireLight setLightIntensity 0;
-    _fireLight setLightAmbient [0.8, 0.6, 0.2];
-    _fireLight setLightColor [1, 0.5, 0.4];
-    _fireLight attachTo [_unit, [0, 0, 0]];
-    _fireLight setLightDayLight false;
-
-    _lightFlare = "#lightpoint" createVehicleLocal _unitPos;
-    _lightFlare setLightIntensity 0;
-    _lightFlare setLightColor [1, 0.8, 0.8];
-    _lightFlare setLightUseFlare true;
-    _lightFlare setLightFlareMaxDistance 100;
-    _lightFlare setLightFlareSize 0;
-
-    if (_unit isNotEqualTo ace_player) then {
-        private _relativeAttachPoint = (vectorNormalized (_unit worldToModelVisual (getPos ace_player))) vectorMultiply 1;
-        _relativeAttachPoint set [2, 0.5];
-        _lightFlare attachTo [_unit, _relativeAttachPoint];
-    } else {
-        _lightFlare attachTo [_unit, [0, 0, 0.3]];
-    };
-
-    if (isServer) then {
-        _fireSound = createSoundSource ["Sound_Fire", _unitPos, [], 0];
-        _fireSound attachTo [_unit, [0, 0, 0], "Head"];
-    };
-
-    _unit setVariable [QGVAR(burning), true];
-    _unit setVariable [QGVAR(intensity), _intensity];
-    _unit setVariable [QGVAR(burnUIPFH), -1];
-
-    if (local _unit) then {
-        if (_unit isEqualTo ace_player) then {
-            private _burnIndicatorPFH = [LINKFUNC(burnIndicator), 1, _unit] call CBA_fnc_addPerFrameHandler;
-            _unit setVariable [QGVAR(burnUIPFH), _burnIndicatorPFH];
-        };
-
-        [_unit, false] call FUNC(burnReaction);
-    };
-
-    _lastIntensityUpdate = 0;
-    _lastPropogateUpdate = 0;
-
-    _isThisUnitAlive = true;
-}, {
-    (_this getVariable "params") params ["_unit"];
-
-    // deinit function
-    deleteVehicle _fireParticle;
-    deleteVehicle _smokeParticle;
-    deleteVehicle _fireLight;
-    deleteVehicle _lightFlare;
-    deleteVehicle _fireSound;
-
-    if (local _unit) then {
-        if (!isPlayer _unit) then {
-            _unit setUnitPos "AUTO";
-            _unit setVariable [QGVAR(stopDropRoll), false];
-        };
-    };
-    _unit setVariable [QGVAR(burning), false];
-    _unit setVariable [QGVAR(burnCounter), 0];
-}, {
-    // run condition
-    true
-}, {
-    // exit condition
-    (_this getVariable "params") params ["_unit"];
-
-    private _unitAlive = (alive _unit) && { getNumber ((configOf _unit) >> "isPlayableLogic") != 1 };
-    private _unitIsUnit = { (_unit != vehicle _unit) && { isNull vehicle _unit } };
-
-    !_unitAlive || _unitIsUnit || { _intensity <= BURN_MIN_INTENSITY } || { !([_unit] call FUNC(isBurning)) }
-}, ["_intensity", "_fireParticle", "_smokeParticle", "_fireLight", "_fireSound", "_lightFlare", "_lastIntensityUpdate", "_lastPropogateUpdate", "_isThisUnitAlive"]] call CBA_fnc_createPerFrameHandlerObject;
+_unit setVariable [QGVAR(jipID), _burnEffectsJipID, true];
diff --git a/addons/fire/functions/fnc_burnEffects.sqf b/addons/fire/functions/fnc_burnEffects.sqf
new file mode 100644
index 0000000000..4dadda8526
--- /dev/null
+++ b/addons/fire/functions/fnc_burnEffects.sqf
@@ -0,0 +1,191 @@
+#include "..\script_component.hpp"
+/*
+ * Author: tcvm, johnb43
+ * Spawns particle effects for a burning unit.
+ *
+ * Arguments:
+ * 0: Unit <OBJECT>
+ *
+ * Return Value:
+ * None
+ *
+ * Example:
+ * player call ace_fire_fnc_burnEffects
+ *
+ * Public: No
+ */
+
+params ["_unit"];
+
+// Spawn particles
+private _unitPos = getPos _unit;
+private _fireParticle = objNull;
+private _smokeParticle = objNull;
+private _fireLight = objNull;
+private _lightFlare = objNull;
+
+if (hasInterface) then {
+    _fireParticle = createVehicleLocal ["#particlesource", _unitPos, [], 0, "CAN_COLLIDE"];
+    _fireParticle attachTo [_unit];
+    _fireParticle setDropInterval 0.03;
+
+    _smokeParticle = createVehicleLocal ["#particlesource", _unitPos, [], 0, "CAN_COLLIDE"];
+
+    _fireLight = createVehicleLocal ["#lightpoint", _unitPos, [], 0, "CAN_COLLIDE"];
+    _fireLight setLightIntensity 0;
+    _fireLight setLightAmbient [0.8, 0.6, 0.2];
+    _fireLight setLightColor [1, 0.5, 0.4];
+    _fireLight attachTo [_unit];
+    _fireLight setLightDayLight false;
+
+    _lightFlare = createVehicleLocal ["#lightpoint", _unitPos, [], 0, "CAN_COLLIDE"];
+    _lightFlare setLightIntensity 0;
+    _lightFlare setLightColor [1, 0.8, 0.8];
+    _lightFlare setLightUseFlare true;
+    _lightFlare setLightFlareMaxDistance 100;
+    _lightFlare setLightFlareSize 0;
+
+    if (_unit != ACE_player) then {
+        private _relativeAttachPoint = vectorNormalized (_unit worldToModelVisual (getPos ACE_player));
+        _relativeAttachPoint set [2, 0.5];
+        _lightFlare attachTo [_unit, _relativeAttachPoint];
+    } else {
+        _lightFlare attachTo [_unit, [0, 0, 0.3]];
+    };
+};
+
+private _fireSound = objNull;
+
+if (isServer) then {
+    _fireSound = createSoundSource ["Sound_Fire", _unitPos, [], 0];
+    _fireSound attachTo [_unit, [0, 0, 0], "Head"];
+};
+
+[{
+    params ["_args", "_pfhID"];
+    _args params ["_unit", "_fireParticle", "_smokeParticle", "_fireLight", "_lightFlare", "_fireSound"];
+
+    if (isNull _unit || {!(_unit call FUNC(isBurning))}) exitWith {
+        _pfhID call CBA_fnc_removePerFrameHandler;
+
+        deleteVehicle _fireParticle;
+        deleteVehicle _smokeParticle;
+        deleteVehicle _fireLight;
+        deleteVehicle _lightFlare;
+        deleteVehicle _fireSound;
+    };
+
+    // Display burn indicators
+    if (_unit == ACE_player && {alive _unit} && {isNil {_unit getVariable QGVAR(burnUIPFH)}}) then { // This accounts for player remote controlled a new unit
+        private _burnIndicatorPFH = [LINKFUNC(burnIndicator), 1, _unit] call CBA_fnc_addPerFrameHandler;
+        _unit setVariable [QGVAR(burnUIPFH), _burnIndicatorPFH];
+    };
+
+    if (!hasInterface) exitWith {};
+
+    private _intensity = _unit getVariable [QGVAR(intensity), 0];
+
+    _fireParticle setDropInterval (0.01 max linearConversion [BURN_MAX_INTENSITY, BURN_MIN_INTENSITY, _intensity, 0.03, 0.1, false]);
+    _fireParticle setParticleParams [
+        ["\A3\data_f\ParticleEffects\Universal\Universal", 16, 10, 32], // sprite sheet values
+        "", // animation name
+        "Billboard", // particle type
+        1, // timer period
+        0.7, // lifetime
+        "destructionEffect2", // position
+        [0, 0, 1], // move velocity
+        0, // rotation velocity
+        10, // weight
+        7.9, // volume
+        1, // rubbing
+        [0.3, 0.3], // size
+        [
+            [1, 1, 1, -0],
+            [1, 1, 1, -1],
+            [1, 1, 1, -1],
+            [1, 1, 1, -1],
+            [1, 1, 1, -0]
+        ], // colour
+        [0.5, 1], // animation speed
+        1, // random dir period
+        0, // random dir intensity
+        "", // on timer script
+        "", // before destroy script
+        _unit, // particle source
+        0,
+        false,
+        0,
+        [[0.8, 0.6, 0.2, 1]] // emissive color
+    ];
+    _fireParticle setParticleRandom [
+        0.04 * _intensity, // life time
+        [0.05, 0.05, 2], // position
+        [0.05, 0.05, 0.05] vectorMultiply _intensity, // move velocity
+        0, // rotation velocity
+        0.06 * _intensity, // size
+        [0, 0, 0, 0], // color
+        0, // random direction period
+        0 // random direction intensity
+    ];
+
+    _smokeParticle setDropInterval 0.15;
+    _smokeParticle setParticleCircle [0, [0, 0, 0]];
+    _smokeParticle setParticleParams [
+        ["\A3\data_f\ParticleEffects\Universal\Universal", 16, 7, 48], // sprite sheet values
+        "", // animation name
+        "Billboard", // particle type
+        1, // timer period
+        8, // lifetime
+        [0, 0, 1.1], // position
+        [0, 0, 1], // move velocity
+        0, // rotation velocity
+        10, // weight
+        7.9, // volume
+        0.066, // rubbing
+        [1, 3, 6], // size
+        [
+            [0.5, 0.5, 0.5, 0.15],
+            [0.75, 0.75, 0.75, 0.075],
+            [1, 1, 1, 0]
+        ], // colour
+        [0.125], // animation speed
+        1, // random dir period
+        0, // random dir intensity
+        "", // on timer script
+        "", // before destroy script
+        _unit // particle source
+    ];
+    _smokeParticle setParticleRandom [
+        0, // life time
+        [0.25, 0.25, 0], // position
+        [0.2, 0.2, 0], // move velocity
+        0, // rotation velocity
+        0.25, // size
+        [0, 0, 0, 0.1], // color
+        0, // random direction period
+        0 // random direction intensity
+    ];
+
+    _fireLight setLightBrightness ((_intensity * 3) / 10);
+    _fireLight setLightAttenuation [1, 10 max (5 min (10 - _intensity)), 0, 15];
+
+    _lightFlare setLightBrightness (_intensity / 30);
+    _lightFlare setLightFlareSize (_intensity * (3 / 4)) * FLARE_SIZE_MODIFIER;
+
+    if (!GVAR(enableFlare)) then {
+        _lightFlare setLightFlareSize 0;
+    };
+
+    // Always keep flare visible to perceiving unit as long as it isn't the player
+    if (_unit != ACE_player) then {
+        private _distanceToUnit = _unit distance ACE_player;
+        private _relativeAttachPoint = [0, 0, 0.3];
+
+        if (_distanceToUnit > 1.5) then {
+            _relativeAttachPoint = (vectorNormalized (_unit worldToModelVisual (getPos ACE_player))) vectorMultiply linearConversion [5, 30, _distanceToUnit, 0.5, 1.5];
+            _relativeAttachPoint set [2, 0.3 + ((_unit selectionPosition "pelvis") select 2)];
+        };
+
+        _lightFlare attachTo [_unit, _relativeAttachPoint];
+    };
+}, 0, [_unit, _fireParticle, _smokeParticle, _fireLight, _lightFlare, _fireSound]] call CBA_fnc_addPerFrameHandler;
diff --git a/addons/fire/functions/fnc_burnIndicator.sqf b/addons/fire/functions/fnc_burnIndicator.sqf
index 13db8862c9..5dbc1a8cbf 100644
--- a/addons/fire/functions/fnc_burnIndicator.sqf
+++ b/addons/fire/functions/fnc_burnIndicator.sqf
@@ -11,26 +11,30 @@
  * None
  *
  * Example:
- * [player, 4] call ace_fire_fnc_burnIndicator
+ * [player, _pfhID] call ace_fire_fnc_burnIndicator
  *
  * Public: No
  */
 
-params ["_unit", "_pfhHandle"];
+params ["_unit", "_pfhID"];
 
-if !(IS_UNCONSCIOUS(_unit)) then {
-    private _iteration = _unit getVariable [QGVAR(indicatorIteration), 0];
-    if (_iteration == 0) then {
-        QGVAR(indicatorLayer) cutRsc [QGVAR(onFire1), "PLAIN"];
-        _iteration = 1;
-    } else {
-        QGVAR(indicatorLayer) cutRsc [QGVAR(onFire2), "PLAIN"];
-        _iteration = 0;
-    };
-    _unit setVariable [QGVAR(indicatorIteration), _iteration];
+if (!alive _unit || {!(_unit call FUNC(isBurning))}) exitWith {
+    _pfhID call CBA_fnc_removePerFrameHandler;
+
+    _unit setVariable [QGVAR(burnUIPFH), nil];
 };
 
-if (!([_unit] call FUNC(isBurning)) || { !alive _unit }) then {
-    [_pfhHandle] call CBA_fnc_removePerFrameHandler;
-    _unit setVariable [QGVAR(burnUIPFH), -1];
+// Don't show burn overlay if unconscious or dead
+if !(_unit call EFUNC(common,isAwake)) exitWith {};
+
+private _iteration = _unit getVariable [QGVAR(indicatorIteration), 0];
+
+if (_iteration == 0) then {
+    QGVAR(indicatorLayer) cutRsc [QGVAR(onFire1), "PLAIN"];
+    _iteration = 1;
+} else {
+    QGVAR(indicatorLayer) cutRsc [QGVAR(onFire2), "PLAIN"];
+    _iteration = 0;
 };
+
+_unit setVariable [QGVAR(indicatorIteration), _iteration];
diff --git a/addons/fire/functions/fnc_burnReaction.sqf b/addons/fire/functions/fnc_burnReaction.sqf
index 748fbbd60e..5a9b75d48c 100644
--- a/addons/fire/functions/fnc_burnReaction.sqf
+++ b/addons/fire/functions/fnc_burnReaction.sqf
@@ -5,7 +5,6 @@
  *
  * Arguments:
  * 0: Unit <OBJECT>
- * 1: Should unit throw its current weapon <BOOL>
  *
  * Return Value:
  * None
@@ -13,19 +12,15 @@
  * Public: No
  */
 
-params ["_unit", ["_throwWeapon", true]];
+params ["_unit"];
 
 if (
-    _throwWeapon
-    && {GVAR(dropWeapon) > 0}
-    && {_unit in _unit && {(currentWeapon _unit) isNotEqualTo ""}}
-    && {!isPlayer _unit || GVAR(dropWeapon) >= 2}
+    GVAR(dropWeapon) > 0 &&
+    {isNull objectParent _unit} &&
+    {(currentWeapon _unit) != ""} &&
+    {!isPlayer _unit || GVAR(dropWeapon) == 2}
 ) then {
-    [_unit] call EFUNC(common,throwWeapon);
+    _unit call EFUNC(common,throwWeapon);
 };
 
-if (_unit isKindOf "CAManBase") then {
-    private _soundID = floor (1 + random 15);
-    private _sound = format [QGVAR(scream_%1), _soundID];
-    [QGVAR(playScream), [_sound, _unit]] call CBA_fnc_globalEvent;
-};
+[QGVAR(playScream), [format [QGVAR(scream_%1), floor (1 + random 15)], _unit]] call CBA_fnc_globalEvent;
diff --git a/addons/fire/functions/fnc_burnSimulation.sqf b/addons/fire/functions/fnc_burnSimulation.sqf
new file mode 100644
index 0000000000..b50afab5dc
--- /dev/null
+++ b/addons/fire/functions/fnc_burnSimulation.sqf
@@ -0,0 +1,167 @@
+#include "..\script_component.hpp"
+/*
+ * Author: tcvm, johnb43
+ * Simulates fire intensity over time on burning units.
+ * Arbitrary values to ignite people. Assumed maximum is "10".
+ *
+ * Arguments:
+ * 0: Unit <OBJECT>
+ * 1: Instigator <OBJECT>
+ *
+ * Return Value:
+ * None
+ *
+ * Example:
+ * [player, player] call ace_fire_fnc_burnSimulation
+ *
+ * Public: No
+ */
+
+params ["_unit", "_instigator"];
+
+[{
+    params ["_args", "_pfhID"];
+    _args params ["_unit", "_instigator"];
+
+    if (isNull _unit) exitWith {
+        TRACE_1("unit is null",_unit);
+
+        _pfhID call CBA_fnc_removePerFrameHandler;
+    };
+
+    // Locality has changed
+    if (!local _unit) exitWith {
+        TRACE_1("unit is no longer local",_unit);
+
+        _pfhID call CBA_fnc_removePerFrameHandler;
+
+        [QGVAR(burnSimulation), [_unit, _instigator], _unit] call CBA_fnc_targetEvent;
+    };
+
+    // 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]})} ||
+        {private _eyePos = eyePos _unit; surfaceIsWater _eyePos && {(_eyePos select 2) < 0.1}}
+    ) exitWith {
+        TRACE_3("unit is no longer burning, invulnerable or in water",_unit,_unit call FUNC(isBurning),isDamageAllowed _unit && {_unit getVariable [ARR_2(QEGVAR(medical,allowDamage),true)]});
+
+        // Remove global effects
+        (_unit getVariable [QGVAR(jipID), ""]) call CBA_fnc_removeGlobalEventJIP;
+
+        // Update globally that the unit isn't burning anymore
+        _unit setVariable [QGVAR(intensity), nil, true];
+
+        _pfhID call CBA_fnc_removePerFrameHandler;
+
+        if (!isNil {_unit getVariable QGVAR(stopDropRoll)} && {!isPlayer _unit}) then {
+            _unit setUnitPos "AUTO";
+
+            _unit setVariable [QGVAR(stopDropRoll), nil, true];
+        };
+    };
+
+    if (isGamePaused) exitWith {};
+
+    private _intensity = _unit getVariable [QGVAR(intensity), 0];
+
+    // Propagate fire to other units (alive or dead) if it's intense
+    if (_intensity >= BURN_THRESHOLD_INTENSE) then {
+        TRACE_2("check for other units",_unit,_intensity);
+
+        {
+            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 {
+                continue;
+            };
+
+            [QGVAR(burn), [_x, _adjustedIntensity, _instigator], _x] call CBA_fnc_targetEvent;
+
+            TRACE_3("propagate fire",_x,_intensity,_adjustedIntensity);
+        } forEach nearestObjects [_unit, ["CAManBase"], BURN_PROPAGATE_DISTANCE];
+    };
+
+    // Update intensity/fire reactions
+    if (CBA_missionTime >= _unit getVariable [QGVAR(intensityUpdate), 0]) then {
+        TRACE_2("update intensity",_unit,_intensity);
+
+        _unit setVariable [QGVAR(intensityUpdate), CBA_missionTime + INTENSITY_UPDATE];
+
+        _intensity = _intensity - INTENSITY_LOSS - (rain / 10);
+
+        if (_unit call EFUNC(common,isAwake)) 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;
+
+                if (isNull _vehicle && {_sdr || {0.05 > random 1}}) then {
+                    _unit setVariable [QGVAR(stopDropRoll), true, true];
+
+                    if (!_sdr) then {
+                        TRACE_1("stop, drop, roll!",_unit);
+
+                        _unit setUnitPos "DOWN";
+                        doStop _unit;
+                    };
+
+                    // Queue up a bunch of animations
+                    for "_i" from 0 to 2 do {
+                        [_unit, selectRandom ["amovppnemstpsnonwnondnon_amovppnemevasnonwnondl", "amovppnemstpsnonwnondnon_amovppnemevasnonwnondr"], 0] call EFUNC(common,doAnimation);
+                    };
+
+                    _intensity = _intensity - (1 / _intensity);
+                } else {
+                    // Make the unit leave the vehicle
+                    if (_vehicle != _unit) then {
+                        TRACE_1("Ejecting",_unit);
+
+                        _unit leaveVehicle _vehicle;
+                        unassignVehicle _unit;
+
+                        _unit action ["Eject", _vehicle];
+                    };
+
+                    _unit disableAI "TARGET";
+                    _unit disableAI "AUTOTARGET";
+
+                    // Run away, erraticly
+                    if (leader group _unit != _unit) then {
+                        [_unit] join grpNull;
+                    };
+
+                    _unit doMove ((getPosATL _unit) getPos [20 + random 35, floor (random 360)]);
+                    _unit setSpeedMode "FULL";
+                    _unit setSuppression 1;
+                };
+            };
+
+            // 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];
+        };
+
+        // 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 fa8e7fb789..924279e3c8 100644
--- a/addons/fire/functions/fnc_fireManagerPFH.sqf
+++ b/addons/fire/functions/fnc_fireManagerPFH.sqf
@@ -1,43 +1,48 @@
 #include "..\script_component.hpp"
 /*
- * Author: tcvm
- * Handles various fire objects and determines if local units deserves to get burned.
- * Used to handle external burning objects, not used internally because internal methods are more performant.
+ * Author: tcvm, johnb43
+ * Handles various objects on fire and determines if units close to objects deserve to get burned.
  *
  * Arguments:
- * 0: Unit on fire <OBJECT>
- * 1: PFH Handle <NUMBER>
+ * None
  *
  * Return Value:
  * None
  *
  * Example:
- * [ace_fire_fnc_fireManagerPFH, 0.25, [_unit]] call CBA_fnc_addPerFrameHandler
+ * ace_fire_fnc_fireManagerPFH call CBA_fnc_addPerFrameHandler
  *
  * Public: No
  */
 
-params ["_args", "_handle"];
+{
+    _y params ["_fireLogic", "_radius", "_intensity", "_condition", "_conditionArgs"];
+    TRACE_2("fireManagerPFH loop",_x,_y);
 
-[GVAR(fireSources), {
-    _value params ["", "", "", "_condition", "_conditionArgs"];
-    _conditionArgs call _condition;
-}] call CBA_fnc_hashFilter;
+    // Remove when condition is no longer valid
+    if !(_conditionArgs call _condition) then {
+        TRACE_2("condition no longer valid, deleting",_x,_y);
 
-[GVAR(fireSources), {
-    _value params ["_source", "_radius", "_intensity"];
-    private _attachedObject = attachedTo _source;
-    private _sourcePos = getPosATL _source;
-    if (_attachedObject isNotEqualTo objNull) then {
-        _sourcePos = getPosATL _attachedObject;
+        detach _fireLogic;
+        deleteVehicle _fireLogic;
+
+        GVAR(fireSources) deleteAt _x;
+
+        continue;
     };
 
-    private _nearEntities = _sourcePos nearEntities ["Man", _radius];
+    // Burn units (alive or dead) close to the fire
     {
-        private _burning = [_x] call FUNC(isBurning);
-        if !(_burning) then {
-            private _distancePercent = 1 - ((_sourcePos distance _x) / _radius);
-            [QGVAR(burn), [_x, _intensity * _distancePercent]] call CBA_fnc_globalEvent;
+        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 {
+            continue;
         };
-    } forEach _nearEntities;
-}] call CBA_fnc_hashEachPair;
+
+        [QGVAR(burn), [_x, _adjustedIntensity], _x] call CBA_fnc_targetEvent;
+
+        TRACE_3("propagate fire",_x,_intensity,_adjustedIntensity);
+    } forEach nearestObjects [_fireLogic, ["CAManBase"], _radius];
+} forEach GVAR(fireSources);
diff --git a/addons/fire/functions/fnc_isBurning.sqf b/addons/fire/functions/fnc_isBurning.sqf
index 7cc06dc01d..04a57c29e6 100644
--- a/addons/fire/functions/fnc_isBurning.sqf
+++ b/addons/fire/functions/fnc_isBurning.sqf
@@ -1,10 +1,10 @@
 #include "..\script_component.hpp"
 /*
  * Author: commy2
- * Check if object is burning.
+ * Check if an object is burning.
  *
  * Arguments:
- * 0: Vehicle <OBJECT>
+ * 0: Object <OBJECT>
  *
  * Return Value:
  * None
@@ -15,6 +15,6 @@
  * Public: Yes
  */
 
-params [["_unit", objNull, [objNull]]];
+params [["_object", objNull, [objNull]]];
 
-_unit getVariable [QGVAR(burning), false]
+(_object getVariable [QGVAR(intensity), 0]) > BURN_MIN_INTENSITY
diff --git a/addons/fire/functions/fnc_medical_canPatDown.sqf b/addons/fire/functions/fnc_medical_canPatDown.sqf
index b7efc262b2..758b83b922 100644
--- a/addons/fire/functions/fnc_medical_canPatDown.sqf
+++ b/addons/fire/functions/fnc_medical_canPatDown.sqf
@@ -18,4 +18,4 @@
 
 params ["", "_patient"];
 
-[_patient] call FUNC(isBurning)
+_patient call FUNC(isBurning)
diff --git a/addons/fire/functions/fnc_medical_progress.sqf b/addons/fire/functions/fnc_medical_progress.sqf
index 07d99958d6..fd64b5c27d 100644
--- a/addons/fire/functions/fnc_medical_progress.sqf
+++ b/addons/fire/functions/fnc_medical_progress.sqf
@@ -5,8 +5,8 @@
  *
  * Arguments:
  * 0: Arguments <ARRAY>
- *   0: Medic <OBJECT>
- *   1: Patient <OBJECT>
+ * - 0: Medic (not used) <OBJECT>
+ * - 1: Patient <OBJECT>
  *
  * Return Value:
  * Continue pat down <BOOL>
@@ -18,6 +18,6 @@
  */
 
 params ["_args"];
-_args params ["_medic", "_patient"];
+_args params ["", "_patient"];
 
-[_patient] call FUNC(isBurning)
+_patient call FUNC(isBurning)
diff --git a/addons/fire/functions/fnc_medical_success.sqf b/addons/fire/functions/fnc_medical_success.sqf
index 78e119a8fa..ca569e1280 100644
--- a/addons/fire/functions/fnc_medical_success.sqf
+++ b/addons/fire/functions/fnc_medical_success.sqf
@@ -2,10 +2,13 @@
 /*
  * Author: tcvm
  * Decreases burning intensity on successful medical action.
+ * The medical action is looped until the user stops the interaction or the unit is no longer burning.
  *
  * Arguments:
  * 0: Medic <OBJECT>
  * 1: Patient <OBJECT>
+ * 2: Body Part <STRING>
+ * 3: Treatment <STRING>
  *
  * Return Value:
  * None
@@ -20,17 +23,21 @@ params ["_medic", "_patient", "_bodyPart", "_classname"];
 
 private _intensity = _patient getVariable [QGVAR(intensity), 0];
 _intensity = _intensity * INTENSITY_DECREASE_MULT_PAT_DOWN;
+
 _patient setVariable [QGVAR(intensity), _intensity, true];
 
-if (_intensity > BURN_MIN_INTENSITY) then {
-    TRACE_1("patient still burning, looping",_this);
-
-    if (EGVAR(medical_gui,pendingReopen)) then {
-        LOG("temporarily blocking medical menu reopen");
-
-        EGVAR(medical_gui,pendingReopen) = false;
-        [{EGVAR(medical_gui,pendingReopen) = true}] call CBA_fnc_execNextFrame;
-    };
-
-    [_medic, _patient, _bodyPart, _classname] call EFUNC(medical_treatment,treatment);
+// If the unit is still burning, loop the medical action
+if !(_patient call FUNC(isBurning)) exitWith {
+    TRACE_1("patient no longer burning, quitting",_this);
 };
+
+TRACE_1("patient still burning, looping",_this);
+
+if (EGVAR(medical_gui,pendingReopen)) then {
+    TRACE_1("temporarily blocking medical menu reopen",_this);
+
+    EGVAR(medical_gui,pendingReopen) = false;
+    [{EGVAR(medical_gui,pendingReopen) = true}] call CBA_fnc_execNextFrame;
+};
+
+[_medic, _patient, _bodyPart, _classname] call EFUNC(medical_treatment,treatment);
diff --git a/addons/fire/initSettings.inc.sqf b/addons/fire/initSettings.inc.sqf
index 97963f3e32..edcd51a8a7 100644
--- a/addons/fire/initSettings.inc.sqf
+++ b/addons/fire/initSettings.inc.sqf
@@ -1,40 +1,40 @@
 [
-    QGVAR(enabled), "CHECKBOX",
+    QGVAR(enabled),
+    "CHECKBOX",
     [ELSTRING(common,Enabled), LSTRING(Setting_Description)],
     LSTRING(Category_DisplayName),
-    true, // default value
-    true, // isGlobal
+    true,
+    1,
     {[QGVAR(fireEnabled), _this] call EFUNC(common,cbaSettings_settingChanged)},
     true // Needs mission restart
 ] call CBA_fnc_addSetting;
 
 [
-    QGVAR(enableFlare), "CHECKBOX",
+    QGVAR(enableFlare),
+    "CHECKBOX",
     [LSTRING(Setting_FlareEnable), LSTRING(Setting_FlareDescription)],
     LSTRING(Category_DisplayName),
-    false, // default value
-    true, // isGlobal
-    {[QGVAR(flareEnabled), _this] call EFUNC(common,cbaSettings_settingChanged)},
-    true // Needs mission restart
+    false,
+    1
 ] call CBA_fnc_addSetting;
 
 [
-    QGVAR(dropWeapon), "LIST",
+    QGVAR(dropWeapon),
+    "LIST",
     [LSTRING(Setting_DropWeapon), LSTRING(Setting_DropWeapon_Description)],
     LSTRING(Category_DisplayName),
     [
-        [0,1,2],
-        [localize "STR_A3_OPTIONS_DISABLED", ELSTRING(common,aiOnly), ELSTRING(common,playersAndAI)],
+        [0, 1, 2],
+        ["STR_A3_OPTIONS_DISABLED", ELSTRING(common,aiOnly), ELSTRING(common,playersAndAI)],
         1
     ],
-    true // isGlobal
+    1
 ] call CBA_fnc_addSetting;
 
 [
-    QGVAR(enableScreams), "CHECKBOX",
+    QGVAR(enableScreams),
+    "CHECKBOX",
     [LSTRING(Setting_EnableScreams), LSTRING(Setting_EnableScreams_Description)],
     LSTRING(Category_DisplayName),
-    true,
-    false // isGlobal
+    true
 ] call CBA_fnc_addSetting;
-
diff --git a/addons/fire/script_component.hpp b/addons/fire/script_component.hpp
index 86ef159aae..ebb0002ff6 100644
--- a/addons/fire/script_component.hpp
+++ b/addons/fire/script_component.hpp
@@ -31,9 +31,14 @@
     "amovppnemstpsoptwbindnon_amovppnemevasoptwbindr"\
 ]
 
-
 #define BURN_MAX_INTENSITY 10
 #define BURN_MIN_INTENSITY 1
 
 #define INTENSITY_DECREASE_MULT_PAT_DOWN 0.8
 #define INTENSITY_DECREASE_MULT_ROLLING INTENSITY_DECREASE_MULT_PAT_DOWN
+
+#define INTENSITY_LOSS 0.02
+#define INTENSITY_UPDATE 2
+#define BURN_PROPAGATE_UPDATE 1
+#define BURN_PROPAGATE_DISTANCE 2
+#define BURN_THRESHOLD_INTENSE 3
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/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 53931c3fda..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;
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 6feaff3a69..06ceebc6b4 100644
--- a/addons/grenades/XEH_PREP.hpp
+++ b/addons/grenades/XEH_PREP.hpp
@@ -1,3 +1,4 @@
+PREP(addChangeFuseItemContextMenuOptions);
 PREP(damageEngineAndWheels);
 PREP(flare);
 PREP(flashbangExplosionEH);
@@ -5,4 +6,3 @@ 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 312e22fa6e..c13bc81b43 100644
--- a/addons/grenades/XEH_postInit.sqf
+++ b/addons/grenades/XEH_postInit.sqf
@@ -1,6 +1,7 @@
 // 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;
@@ -16,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
index fa0032e87e..ab95ecbe6a 100644
--- a/addons/grenades/functions/fnc_damageEngineAndWheels.sqf
+++ b/addons/grenades/functions/fnc_damageEngineAndWheels.sqf
@@ -17,38 +17,22 @@
  */
 
 params ["_vehicle", "_position"];
-TRACE_1("damageWheelsAndEngine",_vehicle);
+TRACE_2("damageWheelsAndEngine",_vehicle,_position);
 
 // Vehicle needs to be local and vulnerable
 if !(local _vehicle && {isDamageAllowed _vehicle}) exitWith {};
 
-// Burn tires
-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
-};
-
-private _config = configOf _vehicle >> "HitPoints";
-
 {
-    private _wheelSelection = getText (_config >> _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];
-        };
+    // 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 (getAllHitPointsDamage _vehicle param [0, []]);
+} forEach ((_vehicle call EFUNC(common,getWheelHitPointsWithSelections)) select 1);
 
 // Burn car engines only
 if (_vehicle isKindOf "Wheeled_APC_F") exitWith {};
 
-private _engineSelection = getText (_config >> "HitEngine" >> "name");
+private _engineSelection = getText (configOf _vehicle >> "HitPoints" >> "HitEngine" >> "name");
 private _enginePosition = _vehicle modelToWorld (_vehicle selectionPosition _engineSelection);
 
 if (_position distance _enginePosition < EFFECT_SIZE * 2) then {
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 f0c2effac3..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
@@ -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,19 +151,20 @@ _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, {
         params ["_endTime", "_projectile"];
 
         // If incendiary no longer exists, exit
         if (isNull _projectile) exitWith {
-            false
+            false // return
         };
 
         // Need to get the position every time, as grenade might have been moved
@@ -181,37 +183,38 @@ if (isServer) then {
     {deleteVehicle _x} forEach _this;
 }, [_fire, _smoke, _light, _sound], _timeToLive] call CBA_fnc_waitAndExecute;
 
-// --- damage
+// Damage
 {
-    if (local _x && {isDamageAllowed _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);
+
+    // 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}});
 
 {
     // Damage vehicles (locality is checked in FUNC(damageEngineAndWheels))
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 ba673d0f33..e49fa21ca9 100644
--- a/addons/grenades/script_component.hpp
+++ b/addons/grenades/script_component.hpp
@@ -16,11 +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 1a571093f8..b0630e3a43 100644
--- a/addons/grenades/stringtable.xml
+++ b/addons/grenades/stringtable.xml
@@ -107,6 +107,9 @@
             <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>
@@ -154,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/hearing/stringtable.xml b/addons/hearing/stringtable.xml
index 5b7c3da063..9aba1ab56b 100644
--- a/addons/hearing/stringtable.xml
+++ b/addons/hearing/stringtable.xml
@@ -381,6 +381,7 @@
             <Japanese>重火器を装備したユニットのみ</Japanese>
             <Spanish>Sólo unidades con armas pesadas</Spanish>
             <Italian>Solo a unità con armi pesanti</Italian>
+            <Korean>중화기를 가진 유닛만 해당</Korean>
         </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/stringtable.xml b/addons/hitreactions/stringtable.xml
index 421f806e32..ff541ad6a3 100644
--- a/addons/hitreactions/stringtable.xml
+++ b/addons/hitreactions/stringtable.xml
@@ -21,11 +21,17 @@
             <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>
         </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>
         </Key>
     </Package>
 </Project>
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_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/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/stringtable.xml b/addons/interaction/stringtable.xml
index 41861dcb31..38c86f5f99 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>
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 5b2f8f9de8..64b9ee764d 100644
--- a/addons/killtracker/stringtable.xml
+++ b/addons/killtracker/stringtable.xml
@@ -6,7 +6,7 @@
             <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>
@@ -30,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>
@@ -44,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>
@@ -58,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>
@@ -102,7 +102,7 @@
             <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>
@@ -113,11 +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_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/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_gestures/functions/fnc_addGroupColorMapping.sqf b/addons/map_gestures/functions/fnc_addGroupColorMapping.sqf
index d7d1bd3305..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) set [toLower _group, [_leadColor, _unitColor]];
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/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/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_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/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_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..3f816aa39b 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,7 +217,7 @@
             <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>
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_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/stringtable.xml b/addons/medical_treatment/stringtable.xml
index 8b8cc640eb..383048626a 100644
--- a/addons/medical_treatment/stringtable.xml
+++ b/addons/medical_treatment/stringtable.xml
@@ -73,13 +73,17 @@
             <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>
             <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>
@@ -369,7 +373,7 @@
             <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>
@@ -465,7 +469,7 @@
             <Italian>Permetti Epinefrina</Italian>
             <Czech>Povolit epinefrin</Czech>
             <Portuguese>Permitir Epinefrina</Portuguese>
-            <Russian>Разрешить Адреналин</Russian>
+            <Russian>Доступ к Адреналину</Russian>
             <Japanese>アドレナリンの許可</Japanese>
             <Korean>에피네프린 사용 허가</Korean>
             <Chinesesimp>允许使用肾上腺素</Chinesesimp>
@@ -522,7 +526,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>
@@ -684,7 +688,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>
@@ -768,7 +772,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>
@@ -859,7 +863,7 @@
             <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>
@@ -887,7 +891,7 @@
             <Spanish>Permitir cavar tumbas</Spanish>
             <French>Autoriser le creusement de tombes</French>
             <Japanese>墓掘りを許可</Japanese>
-            <Russian>Разрешить рытье могил</Russian>
+            <Russian>Рытье могил</Russian>
         </Key>
         <Key ID="STR_ACE_Medical_Treatment_AllowGraveDigging_Description">
             <English>Enables digging graves to dispose of corpses.</English>
@@ -920,7 +924,7 @@
             <Korean>무덤 마커 생성</Korean>
             <French>Créer des pierres tombales</French>
             <Japanese>墓標を作成</Japanese>
-            <Russian>Создайте надгробные знаки</Russian>
+            <Russian>Надгробные знаки</Russian>
         </Key>
         <Key ID="STR_ACE_Medical_Treatment_GraveDiggingMarker_Description">
             <English>Enables the creation of grave markers when digging graves.</English>
@@ -943,7 +947,7 @@
             <Chinesesimp>允许静脉输液</Chinesesimp>
             <Japanese>IV 輸液の制限</Japanese>
             <Czech>Povolit IV transfuzi</Czech>
-            <Russian>Разрешить внутривенное переливание</Russian>
+            <Russian>Доступ к внутривенному переливанию</Russian>
             <Spanish>Permitir transfusión de IV</Spanish>
             <Korean>수액용기 사용 허가</Korean>
         </Key>
@@ -966,7 +970,7 @@
             <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>
@@ -978,7 +982,7 @@
             <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>
@@ -3682,7 +3686,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>
@@ -3935,7 +3939,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>
@@ -4019,7 +4023,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>
@@ -4135,7 +4139,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>
@@ -4152,7 +4156,7 @@
             <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>
@@ -4161,6 +4165,9 @@
             <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>
@@ -4178,6 +4185,9 @@
             <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>
@@ -4195,6 +4205,9 @@
             <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>
@@ -4976,7 +4989,7 @@
             <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>
         </Key>
         <Key ID="STR_ACE_Medical_Treatment_bandageEffectiveness_Description">
@@ -5010,7 +5023,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>
@@ -5043,7 +5056,7 @@
         <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>
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/microdagr/stringtable.xml b/addons/microdagr/stringtable.xml
index 786cb15b95..c9bd546afc 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>
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..d721b0e4ae 100644
--- a/addons/mk6mortar/functions/fnc_handlePlayerVehicleChanged.sqf
+++ b/addons/mk6mortar/functions/fnc_handlePlayerVehicleChanged.sqf
@@ -19,7 +19,7 @@
 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");
diff --git a/addons/mk6mortar/stringtable.xml b/addons/mk6mortar/stringtable.xml
index 4195579998..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>
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/nightvision/XEH_postInit.sqf b/addons/nightvision/XEH_postInit.sqf
index 9bfee4d166..5a1aa19b82 100644
--- a/addons/nightvision/XEH_postInit.sqf
+++ b/addons/nightvision/XEH_postInit.sqf
@@ -61,7 +61,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 +73,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/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/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/stringtable.xml b/addons/overheating/stringtable.xml
index ef20ae9e81..d5e8ad7ca8 100644
--- a/addons/overheating/stringtable.xml
+++ b/addons/overheating/stringtable.xml
@@ -714,7 +714,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>
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/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 833c83db94..af864f64df 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>
@@ -47,7 +47,7 @@
             <Hungarian>XM312 (Magasított)</Hungarian>
             <Italian>XM312 (Alto)</Italian>
             <Japanese>XM312 (ハイマウント)</Japanese>
-            <Korean>XM312 (높음)</Korean>
+            <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>
@@ -98,7 +98,7 @@
             <Hungarian>XM307 (Magasított)</Hungarian>
             <Italian>XM307 (Alto)</Italian>
             <Japanese>XM307 (ハイマウント)</Japanese>
-            <Korean>XM307 (높음)</Korean>
+            <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>
@@ -703,6 +703,9 @@
             <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>
@@ -1666,12 +1669,18 @@
             <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>
@@ -3079,18 +3088,27 @@
             <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>
@@ -3650,7 +3668,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>
@@ -3666,7 +3684,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>
@@ -3714,7 +3732,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>
@@ -3826,7 +3844,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>
@@ -3842,7 +3860,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>
@@ -3881,18 +3899,27 @@
             <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>
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/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..2f0c6c60c1 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>
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..526b2d506b 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))};
     {
diff --git a/addons/repair/functions/fnc_repair_failure.sqf b/addons/repair/functions/fnc_repair_failure.sqf
index c305c90b6b..f9de2a8ae6 100644
--- a/addons/repair/functions/fnc_repair_failure.sqf
+++ b/addons/repair/functions/fnc_repair_failure.sqf
@@ -65,7 +65,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..6248082779 100644
--- a/addons/repair/functions/fnc_repair_success.sqf
+++ b/addons/repair/functions/fnc_repair_success.sqf
@@ -60,7 +60,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/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/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/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/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/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/ui/XEH_clientInit.sqf b/addons/ui/XEH_clientInit.sqf
index 2c8cd3e4b4..d9d3fa5717 100644
--- a/addons/ui/XEH_clientInit.sqf
+++ b/addons/ui/XEH_clientInit.sqf
@@ -47,4 +47,4 @@ GVAR(elementsSet) = createHashMap;
     }] call CBA_fnc_addEventHandler;
 }] call CBA_fnc_addEventHandler;
 
-[QUOTE(ADDON), "AnimChanged", LINKFUNC(onAnimChanged)] call EFUNC(common,addPlayerEH);
+[QUOTE(ADDON), "AnimChanged", LINKFUNC(onAnimChanged), true] call EFUNC(common,addPlayerEH);
diff --git a/addons/ui/stringtable.xml b/addons/ui/stringtable.xml
index 562abe2765..2578f58c6d 100644
--- a/addons/ui/stringtable.xml
+++ b/addons/ui/stringtable.xml
@@ -645,7 +645,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 +659,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>
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_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_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/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..b247967fe1 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>
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/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/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/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/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_moduleBurn.sqf b/addons/zeus/functions/fnc_moduleBurn.sqf
index 4cf2017b67..9fb3b085af 100644
--- a/addons/zeus/functions/fnc_moduleBurn.sqf
+++ b/addons/zeus/functions/fnc_moduleBurn.sqf
@@ -17,26 +17,22 @@
 
 params ["_logic"];
 
-if !(local _logic) exitWith {};
+if (!local _logic) exitWith {};
 
 private _unit = attachedTo _logic;
 deleteVehicle _logic;
 
 switch (false) do {
-    case !(isNull _unit): {
+    case (!isNull _unit): {
         [LSTRING(NothingSelected)] call FUNC(showMessage);
     };
-    case (_unit isKindOf "CAManBase"): {
+    case (_unit isKindOf "CAManBase" && {getNumber (configOf _unit >> "isPlayableLogic") == 0}): {
         [LSTRING(OnlyInfantry)] call FUNC(showMessage);
     };
-    case (alive _unit): {
-        [LSTRING(OnlyAlive)] call FUNC(showMessage);
-    };
     case (["ace_fire"] call EFUNC(common,isModLoaded)): {
         [LSTRING(RequiresAddon)] call FUNC(showMessage);
     };
     default {
-        [QEGVAR(fire,burn), [_unit, 5]] call CBA_fnc_globalEvent;
+        [QEGVAR(fire,burn), [_unit, 5], _unit] call CBA_fnc_targetEvent;
     };
 };
-
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/stringtable.xml b/addons/zeus/stringtable.xml
index e871ef85ef..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>
@@ -2004,45 +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>
+            <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/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/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/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/fire-framework.md b/docs/wiki/framework/fire-framework.md
index 7994036ece..147710384c 100644
--- a/docs/wiki/framework/fire-framework.md
+++ b/docs/wiki/framework/fire-framework.md
@@ -26,8 +26,8 @@ Use `CBA_fnc_serverEvent` to use the following features. Events are defined only
 | 0  | Source of flame | Object/Position ASL | Required |
 | 1  | Radius of fire | Number | Required |
 | 2  | Intensity of fire (1, 10] | Number | Required |
-| 3  | Fire source ID | Any | Required |
-| 4  | Condition to stop fire | Code | Optional (default: `{ true }`) |
+| 3  | Fire source ID | Array/Boolean/Code/Config/Group/Namespace/NaN/Number/Object/Side/String | Required |
+| 4  | Condition to stop fire | Code | Optional (default: `{true}`) |
 | 5  | Arguments to pass to condition | Any | Optional (default: `[]`) |
 
 ### 1.2 Removing fire source
@@ -36,8 +36,7 @@ Use `CBA_fnc_serverEvent` to use the following features. Events are defined only
 
 |    | Arguments | Type | Optional (default value) |
 |----| --------- | ---- | ------------------------ |
-| 0  | Fire source ID | Any  | Required |
-
+| 0  | Fire source ID | Array/Boolean/Code/Config/Group/Namespace/NaN/Number/Object/Side/String  | Required |
 
 ## 2. Variables
 
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