diff --git a/addons/map/MapGpsUI.hpp b/addons/map/MapGpsUI.hpp
index f6caec29c9..e21b8db0a1 100644
--- a/addons/map/MapGpsUI.hpp
+++ b/addons/map/MapGpsUI.hpp
@@ -19,8 +19,8 @@ class RscTitles {
     duration = 3600;
     fadein = 0;
     fadeout = 0;
-    // onLoad = QUOTE(uiNamespace setVariable [ARR_2(QGVAR(ui_mapGpsDisplay), _this select 0)];); @todo cbaify this 
-    onLoad = "uiNamespace setVariable ['ACE_map_ui_mapGpsDisplay', _this select 0];";
+    // onLoad = QUOTE(uiNamespace setVariable [ARR_2(QGVAR(ui_mapGpsDisplay), _this select 0)];); 
+    onLoad = "uiNamespace setVariable ['ACE_map_ui_mapGpsDisplay', _this select 0];";  //@todo cbaify this 
     //onUnLoad = "_this call onRscLoad";
     class controls {
       class back:RscPicture {
diff --git a/addons/map/XEH_postInitClient.sqf b/addons/map/XEH_postInitClient.sqf
index a151ceee66..24b906e61c 100644
--- a/addons/map/XEH_postInitClient.sqf
+++ b/addons/map/XEH_postInitClient.sqf
@@ -20,7 +20,7 @@ GVAR(drawing_lineMarkers) = [];
 GVAR(drawing_drawColor) = "ColorBlack";
 GVAR(drawing_controls) = [36732, 36733, 36734, 36735, 36736, 36737];
 
-//This is a one and done spawn, probably ok??
+//Probably need this spawn, because CBA_fnc_addPerFrameHandler doesn't work durring breifing.
 [] spawn {
 	_fnc_installMapEvents = {
 		_d = _this;
diff --git a/addons/map/functions/fnc_addLineMarker.sqf b/addons/map/functions/fnc_addLineMarker.sqf
index f94f506a86..24446c18a6 100644
--- a/addons/map/functions/fnc_addLineMarker.sqf
+++ b/addons/map/functions/fnc_addLineMarker.sqf
@@ -15,12 +15,10 @@
 
 #include "script_component.hpp"
 
-systemChat "new global marker";
-
- _name     = _this select 0;
- _startPos = _this select 1;
- _difPos   = (_this select 2) vectorDiff _startPos ;
- _color    = _this select 3;
+_name     = _this select 0;
+_startPos = _this select 1;
+_difPos   = (_this select 2) vectorDiff _startPos ;
+_color    = _this select 3;
 
 _marker = createMarkerLocal [_name, _startPos];
 _name setMarkerShapeLocal "RECTANGLE";
diff --git a/addons/map/functions/fnc_handleKeyDown.sqf b/addons/map/functions/fnc_handleKeyDown.sqf
index bb8b84bb5c..0dfc4d895e 100644
--- a/addons/map/functions/fnc_handleKeyDown.sqf
+++ b/addons/map/functions/fnc_handleKeyDown.sqf
@@ -38,7 +38,7 @@ if (_code == DIK_ESCAPE) exitWith {
 
 if (_code == DIK_DELETE) exitWith {
   if (GVAR(drawing_isDrawing)) then {
-     call FUNC(cancelDrawing);
+    call FUNC(cancelDrawing);
     _handled = true;
   } else {
 
@@ -60,16 +60,12 @@ if (_code == DIK_DELETE) exitWith {
       if (_lambdaLong >= 0 && _lambdaLong <= _magDiffVector && _lambdaTrasAbs <= 5) exitWith {
         // Delete the line marker
         if (GVAR(drawing_syncMarkers)) then {
-          // [[_x select 0], QFUNC(removeLineMarker), 2] call EFUNC(common,execRemoteFnc);
-		  systemChat "global";
-          ["drawing_removeLineMarker", [_x select 0]] call ace_common_fnc_globalEvent;
+          ["drawing_removeLineMarker", [_x select 0]] call EFUNC(common,globalEvent);
         } else {
-			systemChat "local";
           deleteMarkerLocal (_x select 0);
           GVAR(drawing_lineMarkers) = GVAR(drawing_lineMarkers) - [_x];
         };
         _handled = true;
-
       };
     } forEach GVAR(drawing_lineMarkers);
   };
diff --git a/addons/map/functions/fnc_handleMouseButton.sqf b/addons/map/functions/fnc_handleMouseButton.sqf
index 5fdfd3890d..0a1309d456 100644
--- a/addons/map/functions/fnc_handleMouseButton.sqf
+++ b/addons/map/functions/fnc_handleMouseButton.sqf
@@ -49,14 +49,12 @@ if (_dir == 1) exitWith {
   if (GVAR(drawing_isDrawing)) exitWith {
     // Already drawing -> Add tempLineMarker to permanent list
     if (GVAR(drawing_syncMarkers)) then {
-	systemChat "global";
       deleteMarkerLocal (GVAR(drawing_tempLineMarker) select 0);
       // [GVAR(drawing_tempLineMarker), "FUNC(addLineMarker)", 2] call EFUNC(common,execRemoteFnc);
-       ["drawing_addLineMarker", GVAR(drawing_tempLineMarker)] call EFUNC(common,globalEvent);
+      ["drawing_addLineMarker", GVAR(drawing_tempLineMarker)] call EFUNC(common,globalEvent);
       // Log who drew on the briefing screen
       (text format ["[ACE] Server: Player %1 drew on the briefing screen", name player]) call EFUNC(common,serverLog);
     } else {
-		systemChat "local";
       GVAR(drawing_tempLineMarker) call FUNC(updateLineMarker);
       GVAR(drawing_lineMarkers) pushBack (+GVAR(drawing_tempLineMarker));
     };
diff --git a/addons/map/functions/fnc_mapStateUpdater.sqf b/addons/map/functions/fnc_mapStateUpdater.sqf
index cbbcb46393..efc5efb956 100644
--- a/addons/map/functions/fnc_mapStateUpdater.sqf
+++ b/addons/map/functions/fnc_mapStateUpdater.sqf
@@ -31,6 +31,7 @@ if (GVAR(mapVisableLastFrame) && (!visibleMap)) then {
 
 //When Map is Opened:
 if ((!GVAR(mapVisableLastFrame)) && (visibleMap)) then {
+  //todo:  "mapOpened" Event????
   GVAR(mapVisableLastFrame) = true;
   // Show and update map tools if required
   [] call FUNC(updateMapToolMarkers);
diff --git a/addons/map/script_component.hpp b/addons/map/script_component.hpp
index 6bfe108de2..0c8f7429ab 100644
--- a/addons/map/script_component.hpp
+++ b/addons/map/script_component.hpp
@@ -14,4 +14,4 @@
 
 #define MARKERNAME_MAPTOOL_FIXED "ACE_MapToolFixed"
 #define MARKERNAME_MAPTOOL_ROTATINGNORMAL "ACE_MapToolRotatingNormal"
-#define MARKERNAME_MAPTOOL_ROTATINGSMALL "ACE_MapToolRotatingSmall"
\ No newline at end of file
+#define MARKERNAME_MAPTOOL_ROTATINGSMALL "ACE_MapToolRotatingSmall"