diff --git a/addons/medical_ai/XEH_postInit.sqf b/addons/medical_ai/XEH_postInit.sqf
index 0b225c7f0b0..518d5404784 100644
--- a/addons/medical_ai/XEH_postInit.sqf
+++ b/addons/medical_ai/XEH_postInit.sqf
@@ -2,6 +2,7 @@
 
 ["CBA_settingsInitialized", {
     TRACE_1("settingsInitialized",GVAR(enabledFor));
+
     if (GVAR(enabledFor) == 0) exitWith {}; // 0: disabled
     if ((GVAR(enabledFor) == 1) && {!isServer} && {hasInterface}) exitWith {}; // 1: Don't Run on non-hc Clients
 
@@ -20,5 +21,4 @@
     }] call CBA_fnc_addClassEventHandler;
 
     #include "stateMachine.inc.sqf"
-
 }] call CBA_fnc_addEventHandler;
diff --git a/addons/medical_ai/XEH_preInit.sqf b/addons/medical_ai/XEH_preInit.sqf
index 5725d1e119e..8cdc2ee6ad8 100644
--- a/addons/medical_ai/XEH_preInit.sqf
+++ b/addons/medical_ai/XEH_preInit.sqf
@@ -13,6 +13,6 @@ if (isNil QGVAR(timeSafe_shoot)) then { GVAR(timeSafe_shoot) = 30; };
 if (isNil QGVAR(timeSafe_hit)) then { GVAR(timeSafe_hit) = 30; };
 if (isNil QGVAR(timeSafe_suppressed)) then { GVAR(timeSafe_suppressed) = 30; };
 
-GVAR(itemHash) = uinamespace getVariable QGVAR(itemHash);
+GVAR(itemHash) = uiNamespace getVariable QGVAR(itemHash);
 
 ADDON = true;
diff --git a/addons/medical_ai/functions/fnc_canRequestMedic.sqf b/addons/medical_ai/functions/fnc_canRequestMedic.sqf
index 685bd57f540..5064e1a7321 100644
--- a/addons/medical_ai/functions/fnc_canRequestMedic.sqf
+++ b/addons/medical_ai/functions/fnc_canRequestMedic.sqf
@@ -4,13 +4,13 @@
  * Checks if there is a medic available in the unit's group.
  *
  * Arguments:
- * None
+ * Unit <OBJECT>
  *
  * Return Value:
  * Can request medic <BOOL>
  *
  * Example:
- * player call ACE_medical_ai_fnc_canRequestMedic
+ * player call ace_medical_ai_fnc_canRequestMedic
  *
  * Public: No
  */
diff --git a/addons/medical_ai/functions/fnc_healSelf.sqf b/addons/medical_ai/functions/fnc_healSelf.sqf
index 5747637995e..60f2b837124 100644
--- a/addons/medical_ai/functions/fnc_healSelf.sqf
+++ b/addons/medical_ai/functions/fnc_healSelf.sqf
@@ -4,13 +4,13 @@
  * Makes the unit heal itself.
  *
  * Arguments:
- * None
+ * Unit <OBJECT>
  *
  * Return Value:
  * None
  *
  * Example:
- * call ACE_medical_ai_fnc_healSelf
+ * cursorObject call ace_medical_ai_fnc_healSelf
  *
  * Public: No
  */
diff --git a/addons/medical_ai/functions/fnc_healUnit.sqf b/addons/medical_ai/functions/fnc_healUnit.sqf
index ad867d25700..4f941efc0a7 100644
--- a/addons/medical_ai/functions/fnc_healUnit.sqf
+++ b/addons/medical_ai/functions/fnc_healUnit.sqf
@@ -4,16 +4,17 @@
  * Makes a medic heal the next unit that needs treatment.
  *
  * Arguments:
- * None
+ * Unit <OBJECT>
  *
  * Return Value:
  * None
  *
  * Example:
- * call ACE_medical_ai_fnc_healUnit
+ * cursorObject call ace_medical_ai_fnc_healUnit
  *
  * Public: No
  */
+
 // Player will have to do this manually of course
 if ([_this] call EFUNC(common,isPlayer)) exitWith {};
 // Can't heal other units when unconscious
diff --git a/addons/medical_ai/functions/fnc_healingLogic.sqf b/addons/medical_ai/functions/fnc_healingLogic.sqf
index fa35b49284d..aff69d78659 100644
--- a/addons/medical_ai/functions/fnc_healingLogic.sqf
+++ b/addons/medical_ai/functions/fnc_healingLogic.sqf
@@ -11,7 +11,7 @@
  * Nothing
  *
  * Example:
- * [a, b] call ACE_medical_ai_fnc_healingLogic
+ * [cursorObject, cursorObject] call ace_medical_ai_fnc_healingLogic
  *
  * Public: No
  */
diff --git a/addons/medical_ai/functions/fnc_isInjured.sqf b/addons/medical_ai/functions/fnc_isInjured.sqf
index a163a4c808b..51ae37caaee 100644
--- a/addons/medical_ai/functions/fnc_isInjured.sqf
+++ b/addons/medical_ai/functions/fnc_isInjured.sqf
@@ -10,7 +10,7 @@
  * Does unit need treatment <BOOL>
  *
  * Example:
- * player call ACE_medical_ai_fnc_isInjured
+ * cursorObject call ace_medical_ai_fnc_isInjured
  *
  * Public: No
  */
diff --git a/addons/medical_ai/functions/fnc_isSafe.sqf b/addons/medical_ai/functions/fnc_isSafe.sqf
index 04da058ce0c..21d59a15d63 100644
--- a/addons/medical_ai/functions/fnc_isSafe.sqf
+++ b/addons/medical_ai/functions/fnc_isSafe.sqf
@@ -10,7 +10,7 @@
  * Is unit safe enough <BOOL>
  *
  * Example:
- * call ACE_medical_ai_fnc_isSafe
+ * cursorObject call ace_medical_ai_fnc_isSafe
  *
  * Public: No
  */
diff --git a/addons/medical_ai/functions/fnc_itemCheck.sqf b/addons/medical_ai/functions/fnc_itemCheck.sqf
index 6d91594ce47..320ae62410c 100644
--- a/addons/medical_ai/functions/fnc_itemCheck.sqf
+++ b/addons/medical_ai/functions/fnc_itemCheck.sqf
@@ -1,7 +1,7 @@
 #include "..\script_component.hpp"
 /*
  * Author: PabstMirror
- * Checks if AI healer has items
+ * Checks if AI healer has items.
  *
  * Arguments:
  * 0: Healer <OBJECT>
@@ -13,7 +13,7 @@
  * 2: Treatment <STRING> (Optional)
  *
  * Example:
- * [cursorObject, "@bandage"] call ACE_medical_ai_fnc_itemCheck
+ * [cursorObject, "@bandage"] call ace_medical_ai_fnc_itemCheck
  *
  * Public: No
  */
diff --git a/addons/medical_ai/functions/fnc_playTreatmentAnim.sqf b/addons/medical_ai/functions/fnc_playTreatmentAnim.sqf
index b8e77aab43e..cb142f02880 100644
--- a/addons/medical_ai/functions/fnc_playTreatmentAnim.sqf
+++ b/addons/medical_ai/functions/fnc_playTreatmentAnim.sqf
@@ -12,10 +12,11 @@
  * None
  *
  * Example:
- * [bob, true, true] call ACE_medical_ai_fnc_playTreatmentAnim
+ * [cursorObject, true, true] call ace_medical_ai_fnc_playTreatmentAnim
  *
  * Public: No
  */
+
 params ["_unit", "_actionName", "_isSelfTreatment"];
 TRACE_3("playTreatmentAnim",_unit,_actionName,_isSelfTreatment);
 
diff --git a/addons/medical_ai/functions/fnc_requestMedic.sqf b/addons/medical_ai/functions/fnc_requestMedic.sqf
index 9e59181204d..0ea2584fbf2 100644
--- a/addons/medical_ai/functions/fnc_requestMedic.sqf
+++ b/addons/medical_ai/functions/fnc_requestMedic.sqf
@@ -4,13 +4,13 @@
  * Sends a request to the units assigned medic to heal it.
  *
  * Arguments:
- * None
+ * Unit <OBJECT>
  *
  * Return Value:
  * None
  *
  * Example:
- * call ACE_medical_ai_fnc_requestMedic
+ * cursorObject call ace_medical_ai_fnc_requestMedic
  *
  * Public: No
  */
diff --git a/addons/medical_ai/functions/fnc_wasRequested.sqf b/addons/medical_ai/functions/fnc_wasRequested.sqf
index 3b6c1cf0592..ffb9aa37808 100644
--- a/addons/medical_ai/functions/fnc_wasRequested.sqf
+++ b/addons/medical_ai/functions/fnc_wasRequested.sqf
@@ -4,13 +4,13 @@
  * Checks if the unit was requested to treat another unit.
  *
  * Arguments:
- * None
+ * Unit <OBJECT>
  *
  * Return Value:
  * Was requested <BOOL>
  *
  * Example:
- * call ACE_medical_ai_fnc_wasRequested
+ * cursorObject call ace_medical_ai_fnc_wasRequested
  *
  * Public: No
  */