diff --git a/addons/briefingtime/XEH_preInit.sqf b/addons/briefingtime/XEH_preInit.sqf
index 6e5cc2e..392ff27 100644
--- a/addons/briefingtime/XEH_preInit.sqf
+++ b/addons/briefingtime/XEH_preInit.sqf
@@ -14,7 +14,7 @@ PREP_RECOMPILE_END;
     1, // 1: all clients share the same setting, 2: setting can't be overwritten (optional, default: 0) <ARRAY>
     {}, // Script to execute when setting is changed. (optional) <CODE>
     true //Setting will be marked as needing mission restart after being changed. (optional, default false) <BOOL>
-] call CBA_Settings_fnc_init;
+] call CBA_fnc_addSetting;
 
 [
     QGVAR(valueSettings),
@@ -28,6 +28,6 @@ PREP_RECOMPILE_END;
         GVAR(value) = round _value * 60;
     },
     true
-] call CBA_Settings_fnc_init;
+] call CBA_fnc_addSetting;
 
 ADDON = true;
\ No newline at end of file
diff --git a/addons/briefingtime/script_component.hpp b/addons/briefingtime/script_component.hpp
index 22d07ed..0478228 100644
--- a/addons/briefingtime/script_component.hpp
+++ b/addons/briefingtime/script_component.hpp
@@ -2,7 +2,7 @@
 #define COMPONENT_BEAUTIFIED BriefingTime
 #include "\x\tunuti\addons\main\script_mod.hpp"
 
-#define DEBUG_MODE_FULL
+//#define DEBUG_MODE_FULL
 //#define DISABLE_COMPILE_CACHE
 
 #ifdef DEBUG_ENABLED_BRIEFINGTIME
diff --git a/addons/main/script_component.hpp b/addons/main/script_component.hpp
index cabaf0d..105d296 100644
--- a/addons/main/script_component.hpp
+++ b/addons/main/script_component.hpp
@@ -1,7 +1,7 @@
 #define COMPONENT main
 #include "\x\tunuti\addons\main\script_mod.hpp"
 
-#define DEBUG_MODE_FULL
+//#define DEBUG_MODE_FULL
 //#define DISABLE_COMPILE_CACHE
 
 #ifdef DEBUG_ENABLED_MAIN
diff --git a/addons/main/script_version.hpp b/addons/main/script_version.hpp
index ce5c813..3f2dbc5 100644
--- a/addons/main/script_version.hpp
+++ b/addons/main/script_version.hpp
@@ -1,4 +1,4 @@
 #define MAJOR 1
 #define MINOR 4
-#define PATCH 1
+#define PATCH 2
 #define BUILD 0
\ No newline at end of file
diff --git a/addons/planningmode/XEH_preInit.sqf b/addons/planningmode/XEH_preInit.sqf
index aaaf78b..9ce463b 100644
--- a/addons/planningmode/XEH_preInit.sqf
+++ b/addons/planningmode/XEH_preInit.sqf
@@ -14,7 +14,7 @@ PREP_RECOMPILE_END;
     1,
     {},
     true
-] call CBA_Settings_fnc_init;
+] call CBA_fnc_addSetting;
 
 [
     QGVAR(sideChatIsDisabledDefault),
@@ -25,7 +25,7 @@ PREP_RECOMPILE_END;
     1,
     {},
     true
-] call CBA_Settings_fnc_init;
+] call CBA_fnc_addSetting;
 
 [
     QGVAR(enableBriefingText),
@@ -36,6 +36,6 @@ PREP_RECOMPILE_END;
     1,
     {},
     true
-] call CBA_Settings_fnc_init;
+] call CBA_fnc_addSetting;
 
 ADDON = true;
\ No newline at end of file
diff --git a/addons/planningmode/script_component.hpp b/addons/planningmode/script_component.hpp
index 49690e8..acddb8a 100644
--- a/addons/planningmode/script_component.hpp
+++ b/addons/planningmode/script_component.hpp
@@ -2,7 +2,7 @@
 #define COMPONENT_BEAUTIFIED PlanningMode
 #include "\x\tunuti\addons\main\script_mod.hpp"
 
-#define DEBUG_MODE_FULL
+//#define DEBUG_MODE_FULL
 //#define DISABLE_COMPILE_CACHE
 
 #ifdef DEBUG_ENABLED_PLANNINGMODE
diff --git a/addons/radiochannels/XEH_preInit.sqf b/addons/radiochannels/XEH_preInit.sqf
index e269198..6eef49c 100644
--- a/addons/radiochannels/XEH_preInit.sqf
+++ b/addons/radiochannels/XEH_preInit.sqf
@@ -14,7 +14,7 @@ PREP_RECOMPILE_END;
     1, // 1: all clients share the same setting, 2: setting can't be overwritten (optional, default: 0) <ARRAY>
     {}, // Script to execute when setting is changed. (optional) <CODE>
     true //Setting will be marked as needing mission restart after being changed. (optional, default false) <BOOL>
-] call CBA_Settings_fnc_init;
+] call CBA_fnc_addSetting;
 
 [
     QGVAR(enableAutoSetup),
@@ -25,7 +25,7 @@ PREP_RECOMPILE_END;
     0,
     {},
     true
-] call CBA_Settings_fnc_init;
+] call CBA_fnc_addSetting;
 
 [
     QGVAR(enableAutoSetup),
@@ -36,7 +36,7 @@ PREP_RECOMPILE_END;
     0,
     {},
     false
-] call CBA_Settings_fnc_init;
+] call CBA_fnc_addSetting;
 
 [
     QGVAR(commandElementID),
@@ -47,7 +47,7 @@ PREP_RECOMPILE_END;
     1,
     {},
     true
-] call CBA_Settings_fnc_init;
+] call CBA_fnc_addSetting;
 
 [
     QGVAR(trimNames),
@@ -58,7 +58,7 @@ PREP_RECOMPILE_END;
     1,
     {},
     true
-] call CBA_Settings_fnc_init;
+] call CBA_fnc_addSetting;
 
 [
     QGVAR(additional_LR_west),
@@ -69,7 +69,7 @@ PREP_RECOMPILE_END;
     1,
     { GVAR(additional_LR_west) = (_this splitString ",")},
     true
-] call CBA_Settings_fnc_init;
+] call CBA_fnc_addSetting;
 
 [
     QGVAR(additional_LR_east),
@@ -80,7 +80,7 @@ PREP_RECOMPILE_END;
     1,
     { GVAR(additional_LR_east) = (_this splitString ",")},
     true
-] call CBA_Settings_fnc_init;
+] call CBA_fnc_addSetting;
 
 [
     QGVAR(additional_LR_independent),
@@ -91,6 +91,6 @@ PREP_RECOMPILE_END;
     1,
     { GVAR(additional_LR_independent) = (_this splitString ",")},
     true
-] call CBA_Settings_fnc_init;
+] call CBA_fnc_addSetting;
 
 ADDON = true;
\ No newline at end of file
diff --git a/addons/radiochannels/script_component.hpp b/addons/radiochannels/script_component.hpp
index c1fcd76..7c5fac9 100644
--- a/addons/radiochannels/script_component.hpp
+++ b/addons/radiochannels/script_component.hpp
@@ -2,7 +2,7 @@
 #define COMPONENT_BEAUTIFIED RadioChannels
 #include "\x\tunuti\addons\main\script_mod.hpp"
 
-#define DEBUG_MODE_FULL
+//#define DEBUG_MODE_FULL
 //#define DISABLE_COMPILE_CACHE
 
 #ifdef DEBUG_ENABLED_RADIOCHANNELS
diff --git a/addons/startmarkers/XEH_preInit.sqf b/addons/startmarkers/XEH_preInit.sqf
index af007f9..7bc6900 100644
--- a/addons/startmarkers/XEH_preInit.sqf
+++ b/addons/startmarkers/XEH_preInit.sqf
@@ -19,7 +19,7 @@ GVAR(vehicleMarkers) = [];
     1, // 1: all clients share the same setting, 2: setting can't be overwritten (optional, default: 0) <ARRAY>
     {}, // Script to execute when setting is changed. (optional) <CODE>
     true //Setting will be marked as needing mission restart after being changed. (optional, default false) <BOOL>
-] call CBA_Settings_fnc_init;
+] call CBA_fnc_addSetting;
 
 [
     QGVAR(showAI), 
@@ -30,7 +30,7 @@ GVAR(vehicleMarkers) = [];
     1,
     {},
     true
-] call CBA_Settings_fnc_init;
+] call CBA_fnc_addSetting;
 
 [
     QGVAR(showUnmanned), 
@@ -41,7 +41,7 @@ GVAR(vehicleMarkers) = [];
     1,
     {},
     true
-] call CBA_Settings_fnc_init;
+] call CBA_fnc_addSetting;
 
 [
     QGVAR(commandElementID), 
@@ -52,7 +52,7 @@ GVAR(vehicleMarkers) = [];
     1,
     {},
     true
-] call CBA_Settings_fnc_init;
+] call CBA_fnc_addSetting;
 
 ////////////////
 //StartMarkers//
@@ -72,7 +72,7 @@ GVAR(vehicleMarkers) = [];
         GVAR(prepTime) = (["Afi_safeStart_duration", _value ] call BIS_fnc_getParamValue) * 60; 
     },
     true
-] call CBA_Settings_fnc_init;
+] call CBA_fnc_addSetting;
 
 [
     QGVAR(allowMarkersWest), 
@@ -88,7 +88,7 @@ GVAR(vehicleMarkers) = [];
         };
     },
     true
-] call CBA_Settings_fnc_init;
+] call CBA_fnc_addSetting;
 
 [
     QGVAR(allowMarkerEast), 
@@ -104,7 +104,7 @@ GVAR(vehicleMarkers) = [];
         };
     },
     true
-] call CBA_Settings_fnc_init;
+] call CBA_fnc_addSetting;
 
 [
     QGVAR(allowMarkerInd), 
@@ -120,7 +120,7 @@ GVAR(vehicleMarkers) = [];
         };
     },
     true
-] call CBA_Settings_fnc_init;
+] call CBA_fnc_addSetting;
 
 [
     QGVAR(allowMarkerCivilian), 
@@ -136,7 +136,7 @@ GVAR(vehicleMarkers) = [];
         };
     },
     true
-] call CBA_Settings_fnc_init;
+] call CBA_fnc_addSetting;
 
 ///////
 //BFT//
@@ -150,7 +150,7 @@ GVAR(vehicleMarkers) = [];
     1,
     {},
     true
-] call CBA_Settings_fnc_init;
+] call CBA_fnc_addSetting;
 
 [
     QGVAR(bftAlwaysOn), 
@@ -161,7 +161,7 @@ GVAR(vehicleMarkers) = [];
     1,
     {},
     true
-] call CBA_Settings_fnc_init;
+] call CBA_fnc_addSetting;
 
 [
     QGVAR(addAllVehicles), 
@@ -172,7 +172,7 @@ GVAR(vehicleMarkers) = [];
     1,
     {},
     true
-] call CBA_Settings_fnc_init;
+] call CBA_fnc_addSetting;
 
 [
     QGVAR(updateInterval), 
@@ -186,7 +186,7 @@ GVAR(vehicleMarkers) = [];
         GVAR(updateInterval) = round _value;
     },
     true
-] call CBA_Settings_fnc_init;
+] call CBA_fnc_addSetting;
 
 [
     QGVAR(bftItemsSettings), 
@@ -202,7 +202,7 @@ GVAR(vehicleMarkers) = [];
         GVAR(bftItems) = _value;
     },
     true
-] call CBA_Settings_fnc_init;
+] call CBA_fnc_addSetting;
 
 [
     QGVAR(allowBftWest), 
@@ -218,7 +218,7 @@ GVAR(vehicleMarkers) = [];
         };
     },
     true
-] call CBA_Settings_fnc_init;
+] call CBA_fnc_addSetting;
 
 [
     QGVAR(allowBftEast), 
@@ -234,7 +234,7 @@ GVAR(vehicleMarkers) = [];
         };
     },
     true
-] call CBA_Settings_fnc_init;
+] call CBA_fnc_addSetting;
 
 [
     QGVAR(allowBftInd), 
@@ -250,7 +250,7 @@ GVAR(vehicleMarkers) = [];
         };
     },
     true
-] call CBA_Settings_fnc_init;
+] call CBA_fnc_addSetting;
 
 [
     QGVAR(allowBftCivilian), 
@@ -266,7 +266,7 @@ GVAR(vehicleMarkers) = [];
         };
     },
     true
-] call CBA_Settings_fnc_init;
+] call CBA_fnc_addSetting;
 
 [
     QGVAR(lostContactTime), 
@@ -280,7 +280,7 @@ GVAR(vehicleMarkers) = [];
         GVAR(deleteMarkerTime) = round _value;
     },
     true
-] call CBA_Settings_fnc_init;
+] call CBA_fnc_addSetting;
 
 [
     QGVAR(enableDeleteMarker), 
@@ -291,7 +291,7 @@ GVAR(vehicleMarkers) = [];
     1,
     {},
     true
-] call CBA_Settings_fnc_init;
+] call CBA_fnc_addSetting;
 
 [
     QGVAR(deleteMarkerTime), 
@@ -305,7 +305,7 @@ GVAR(vehicleMarkers) = [];
         GVAR(deleteMarkerTime) = round _value;
     },
     true
-] call CBA_Settings_fnc_init;
+] call CBA_fnc_addSetting;
 
 ["hint", {
     hint (_this select 0);
diff --git a/addons/startmarkers/script_component.hpp b/addons/startmarkers/script_component.hpp
index 1413f40..154993c 100644
--- a/addons/startmarkers/script_component.hpp
+++ b/addons/startmarkers/script_component.hpp
@@ -2,7 +2,7 @@
 #define COMPONENT_BEAUTIFIED StartMarkers
 #include "\x\tunuti\addons\main\script_mod.hpp"
 
-#define DEBUG_MODE_FULL
+//#define DEBUG_MODE_FULL
 //#define DISABLE_COMPILE_CACHE
 
 #ifdef DEBUG_ENABLED_STARTMARKERS
diff --git a/addons/unconinfo/XEH_preInit.sqf b/addons/unconinfo/XEH_preInit.sqf
index 46f99f7..2c43070 100644
--- a/addons/unconinfo/XEH_preInit.sqf
+++ b/addons/unconinfo/XEH_preInit.sqf
@@ -14,7 +14,7 @@ PREP_RECOMPILE_END;
     1,
     {},
     true
-] call CBA_Settings_fnc_init;
+] call CBA_fnc_addSetting;
 
 [
     QGVAR(enableMoan),
@@ -25,7 +25,7 @@ PREP_RECOMPILE_END;
     1,
     {},
     true
-] call CBA_Settings_fnc_init;
+] call CBA_fnc_addSetting;
 
 [
     QGVAR(enableShowEpinephrine),
@@ -36,7 +36,7 @@ PREP_RECOMPILE_END;
     1,
     {},
     true
-] call CBA_Settings_fnc_init;
+] call CBA_fnc_addSetting;
 
 [
     QGVAR(enableShowBleeding),
@@ -47,7 +47,7 @@ PREP_RECOMPILE_END;
     1,
     {},
     true
-] call CBA_Settings_fnc_init;
+] call CBA_fnc_addSetting;
 
 [
     QGVAR(enableShowCardiacArrest),
@@ -58,7 +58,7 @@ PREP_RECOMPILE_END;
     1,
     {},
     true
-] call CBA_Settings_fnc_init;
+] call CBA_fnc_addSetting;
 
 [
     QGVAR(enableShowHeartRate),
@@ -69,7 +69,7 @@ PREP_RECOMPILE_END;
     1,
     {},
     true
-] call CBA_Settings_fnc_init;
+] call CBA_fnc_addSetting;
 
 [
     QGVAR(enableShowStableVitals),
@@ -80,7 +80,7 @@ PREP_RECOMPILE_END;
     1,
     {},
     true
-] call CBA_Settings_fnc_init;
+] call CBA_fnc_addSetting;
 
 [
     QGVAR(enableShowIfTreated),
@@ -91,7 +91,7 @@ PREP_RECOMPILE_END;
     1,
     {},
     true
-] call CBA_Settings_fnc_init;
+] call CBA_fnc_addSetting;
 
 [
     QGVAR(enableShowDetailedTreatment),
@@ -102,7 +102,7 @@ PREP_RECOMPILE_END;
     1,
     {},
     true
-] call CBA_Settings_fnc_init;
+] call CBA_fnc_addSetting;
 
 [
     QGVAR(enableShowIfTreatedConcious),
@@ -113,7 +113,7 @@ PREP_RECOMPILE_END;
     1,
     {},
     true
-] call CBA_Settings_fnc_init;
+] call CBA_fnc_addSetting;
 
 [
     QGVAR(allowNearestUnit),
@@ -124,7 +124,7 @@ PREP_RECOMPILE_END;
     1,
     {},
     true
-] call CBA_Settings_fnc_init;
+] call CBA_fnc_addSetting;
 
 [
     QGVAR(allowNearestUnitDistanceShown),
@@ -135,7 +135,7 @@ PREP_RECOMPILE_END;
     1,
     {},
     true
-] call CBA_Settings_fnc_init;
+] call CBA_fnc_addSetting;
 
 [
     QGVAR(unconinfoNearestUnitDistance), 
@@ -150,7 +150,7 @@ PREP_RECOMPILE_END;
         GVAR(unconinfoNearestUnitDistance) = _value; 
     },
     true
-] call CBA_Settings_fnc_init;
+] call CBA_fnc_addSetting;
 
 [
     QGVAR(noFriendliesNearbyText), 
@@ -161,7 +161,7 @@ PREP_RECOMPILE_END;
     1,
     {},
     true
-] call CBA_Settings_fnc_init;
+] call CBA_fnc_addSetting;
 
 [
     QGVAR(updateInterval), 
@@ -176,7 +176,7 @@ PREP_RECOMPILE_END;
         GVAR(updateInterval) = _value; 
     },
     true
-] call CBA_Settings_fnc_init;
+] call CBA_fnc_addSetting;
 
 [
     QGVAR(detailedTreatmentDelay), 
@@ -191,7 +191,7 @@ PREP_RECOMPILE_END;
         GVAR(detailedTreatmentDelay) = _value; 
     },
     true
-] call CBA_Settings_fnc_init;
+] call CBA_fnc_addSetting;
 
 [
     QGVAR(delayForUnconInfoTexts), 
@@ -206,6 +206,6 @@ PREP_RECOMPILE_END;
         GVAR(delayForUnconInfoTexts) = _value; 
     },
     true
-] call CBA_Settings_fnc_init;
+] call CBA_fnc_addSetting;
 
 ADDON = true;
\ No newline at end of file
diff --git a/addons/utilities/XEH_preInit.sqf b/addons/utilities/XEH_preInit.sqf
index 84c20a2..bea4e17 100644
--- a/addons/utilities/XEH_preInit.sqf
+++ b/addons/utilities/XEH_preInit.sqf
@@ -14,7 +14,7 @@ PREP_RECOMPILE_END;
     1, // 1: all clients share the same setting, 2: setting can't be overwritten (optional, default: 0) <ARRAY>
     {}, // Script to execute when setting is changed. (optional) <CODE>
     true //Setting will be marked as needing mission restart after being changed. (optional, default false) <BOOL>
-] call CBA_Settings_fnc_init;
+] call CBA_fnc_addSetting;
 
 [
     QGVAR(loadScreenTime),
@@ -28,7 +28,7 @@ PREP_RECOMPILE_END;
         GVAR(loadScreenTime) = round _value;
     },
     true
-] call CBA_Settings_fnc_init;
+] call CBA_fnc_addSetting;
 
 [
     QGVAR(loadScreenText),
@@ -39,7 +39,7 @@ PREP_RECOMPILE_END;
     1,
     {  },
     true
-] call CBA_Settings_fnc_init;
+] call CBA_fnc_addSetting;
 
 [
     QGVAR(rulesHintEnable),
@@ -50,7 +50,7 @@ PREP_RECOMPILE_END;
     1,
     {},
     true
-] call CBA_Settings_fnc_init;
+] call CBA_fnc_addSetting;
 
 [
     QGVAR(rulesTitleText),
@@ -61,7 +61,7 @@ PREP_RECOMPILE_END;
     1,
     {  },
     true
-] call CBA_Settings_fnc_init;
+] call CBA_fnc_addSetting;
 
 [
     QGVAR(rulesMessageText),
@@ -72,7 +72,7 @@ PREP_RECOMPILE_END;
     1,
     { GVAR(rulesMessageText) = call compile _this},
     true
-] call CBA_Settings_fnc_init;
+] call CBA_fnc_addSetting;
 
 [
     QGVAR(enableSpectatorStats),
@@ -83,6 +83,6 @@ PREP_RECOMPILE_END;
     1,
     {},
     true
-] call CBA_Settings_fnc_init;
+] call CBA_fnc_addSetting;
 
 ADDON = true;
\ No newline at end of file
diff --git a/addons/utilities/script_component.hpp b/addons/utilities/script_component.hpp
index d3cd5d0..bf2b738 100644
--- a/addons/utilities/script_component.hpp
+++ b/addons/utilities/script_component.hpp
@@ -2,7 +2,7 @@
 #define COMPONENT_BEAUTIFIED Utilities
 #include "\x\tunuti\addons\main\script_mod.hpp"
 
-#define DEBUG_MODE_FULL
+//#define DEBUG_MODE_FULL
 //#define DISABLE_COMPILE_CACHE
 
 #ifdef DEBUG_ENABLED_UTILITIES