diff --git a/addons/markers/XEH_preInit.sqf b/addons/markers/XEH_preInit.sqf
index efe44f145e..abf28d6e8b 100644
--- a/addons/markers/XEH_preInit.sqf
+++ b/addons/markers/XEH_preInit.sqf
@@ -6,6 +6,8 @@ PREP_RECOMPILE_START;
 #include "XEH_PREP.hpp"
 PREP_RECOMPILE_END;
 
+#include "initSettings.sqf"
+
 // init marker types
 if (isNil QGVAR(MarkersCache)) then {
     GVAR(MarkersCache) = [];
@@ -54,28 +56,4 @@ if (isNil QGVAR(MarkerColorsCache)) then {
 //Server Sync JIP markers:
 [QGVAR(sendMarkersJIP), FUNC(sendMarkersJIP)] call CBA_fnc_addEventHandler;
 
-// settings
-[
-    QGVAR(moveRestriction), "LIST",
-    [LSTRING(MoveRestriction), LSTRING(MoveRestriction_Description)],
-    format ["ACE %1", localize ELSTRING(map,Module_DisplayName)],
-    [
-        [
-            MOVE_RESTRICTION_NOBODY,
-            MOVE_RESTRICTION_ALL,
-            MOVE_RESTRICTION_ADMINS,
-            MOVE_RESTRICTION_GROUP_LEADERS,
-            MOVE_RESTRICTION_GROUP_LEADERS_ADMINS
-        ],
-        [
-            LSTRING(MoveRestriction_Nobody),
-            LSTRING(MoveRestriction_All),
-            LSTRING(MoveRestriction_Admins),
-            LSTRING(MoveRestriction_GroupLeaders),
-            LSTRING(MoveRestriction_GroupLeadersAndAdmins)
-        ],
-        1
-    ]
-] call cba_settings_fnc_init;
-
 ADDON = true;
diff --git a/addons/markers/functions/fnc_movePFH.sqf b/addons/markers/functions/fnc_movePFH.sqf
index 4b83d63756..6167b820af 100644
--- a/addons/markers/functions/fnc_movePFH.sqf
+++ b/addons/markers/functions/fnc_movePFH.sqf
@@ -16,7 +16,7 @@
  */
 #include "script_component.hpp"
 
-(_this select 0) params ["_marker", "_ctrlMap", "_originalPos", "_originalAlpha", "_mapGesturesEnabled"];
+(_this select 0) params ["_marker", "_ctrlMap", "_originalPos", "_originalAlpha"];
 
 if (isNull _ctrlMap || !GVAR(moving)) exitWith {
     (_this select 1) call CBA_fnc_removePerFrameHandler;
diff --git a/addons/markers/functions/fnc_onMouseButtonDown.sqf b/addons/markers/functions/fnc_onMouseButtonDown.sqf
index e389ff6637..dee5cab7ed 100644
--- a/addons/markers/functions/fnc_onMouseButtonDown.sqf
+++ b/addons/markers/functions/fnc_onMouseButtonDown.sqf
@@ -15,7 +15,7 @@
  * None
  *
  * Example:
- * [CONTROL, 2, 0, 0, true, false, false] call ace_markers_fnc_onMouseButtonDownMap
+ * [CONTROL, 2, 0, 0, true, false, false] call ace_markers_fnc_onMouseButtonDown
  *
  * Public: No
  */
@@ -37,5 +37,5 @@ if (_type == "marker" && {_marker find "_USER_DEFINED" != -1 && {call FUNC(canMo
 
     GVAR(moving) = true;
     _marker setMarkerAlphaLocal 0.5;
-    [FUNC(movePFH), 0, [_marker, _ctrlMap, _originalPos, _originalAlpha, _mapGesturesEnabled]] call CBA_fnc_addPerFrameHandler;
+    [FUNC(movePFH), 0, [_marker, _ctrlMap, _originalPos, _originalAlpha]] call CBA_fnc_addPerFrameHandler;
 };
diff --git a/addons/markers/functions/fnc_onMouseButtonUp.sqf b/addons/markers/functions/fnc_onMouseButtonUp.sqf
index 3df6b8d55e..62b4cd5af7 100644
--- a/addons/markers/functions/fnc_onMouseButtonUp.sqf
+++ b/addons/markers/functions/fnc_onMouseButtonUp.sqf
@@ -15,7 +15,7 @@
  * None
  *
  * Example:
- * [CONTROL, 2] call ace_markers_fnc_onMouseButtonUpMap
+ * [CONTROL, 2] call ace_markers_fnc_onMouseButtonUp
  *
  * Public: No
  */
diff --git a/addons/markers/initSettings.sqf b/addons/markers/initSettings.sqf
new file mode 100644
index 0000000000..d317d663ea
--- /dev/null
+++ b/addons/markers/initSettings.sqf
@@ -0,0 +1,22 @@
+[
+    QGVAR(moveRestriction), "LIST",
+    [LSTRING(MoveRestriction), LSTRING(MoveRestriction_Description)],
+    format ["ACE %1", localize ELSTRING(map,Module_DisplayName)],
+    [
+        [
+            MOVE_RESTRICTION_NOBODY,
+            MOVE_RESTRICTION_ALL,
+            MOVE_RESTRICTION_ADMINS,
+            MOVE_RESTRICTION_GROUP_LEADERS,
+            MOVE_RESTRICTION_GROUP_LEADERS_ADMINS
+        ],
+        [
+            LSTRING(MoveRestriction_Nobody),
+            LSTRING(MoveRestriction_All),
+            LSTRING(MoveRestriction_Admins),
+            LSTRING(MoveRestriction_GroupLeaders),
+            LSTRING(MoveRestriction_GroupLeadersAndAdmins)
+        ],
+        1
+    ]
+] call cba_settings_fnc_init;