diff --git a/.hemtt/project.toml b/.hemtt/project.toml
index da98589..143d1ed 100644
--- a/.hemtt/project.toml
+++ b/.hemtt/project.toml
@@ -70,8 +70,6 @@ parameters = [
   "-filePatching",
 ]
 
-executable = "/home/valmo/games/SteamLibrary/steamapps/common/Proton 8.0/proton run '/home/valmo/games/SteamLibrary/steamapps/common/Arma 3/arma3_x64.exe'"
-
 [binarize]
 exclude = [
   "*.jpg"
diff --git a/addons/client/functions/fnc_convertClientLocation.sqf b/addons/client/functions/fnc_convertClientLocation.sqf
index 8b3a4eb..8f97a14 100644
--- a/addons/client/functions/fnc_convertClientLocation.sqf
+++ b/addons/client/functions/fnc_convertClientLocation.sqf
@@ -74,6 +74,9 @@ switch (toLower worldName) do {
 	case "kunduz_valley": {
 		_realLocation = _position call armatak_fnc_convert_to_kunduz_valley;
 	};
+	case "tanoa": {
+		_realLocation = _position call armatak_fnc_convert_to_tanoa;
+	};
 	default {
 		_warning = format ["<t color='#FF8021'>ARMATAK</t><br/> %1", "Unsupported Map"];
 		[[_warning, 1.5]] call CBA_fnc_notify;
diff --git a/addons/main/functions/api/fn_send_drone_cot.sqf b/addons/main/functions/api/fn_send_drone_cot.sqf
index f160cb5..bed999e 100644
--- a/addons/main/functions/api/fn_send_drone_cot.sqf
+++ b/addons/main/functions/api/fn_send_drone_cot.sqf
@@ -5,7 +5,7 @@
 params["_drone"];
 
 private _atak_role = "a-f-A";
-private _atak_callsign = [_unit] call armatak_fnc_extract_unit_callsign;
+private _atak_callsign = [_drone] call armatak_fnc_extract_unit_callsign;
 
 switch (side _drone) do {
 	case "WEST": {
diff --git a/addons/main/functions/extract_data/fn_extract_group_role.sqf b/addons/main/functions/extract_data/fn_extract_group_role.sqf
index 5175159..b99f47a 100644
--- a/addons/main/functions/extract_data/fn_extract_group_role.sqf
+++ b/addons/main/functions/extract_data/fn_extract_group_role.sqf
@@ -1,9 +1,10 @@
 params["_unit"];
 
+_group = group _unit;
 _group_roles = ["Team Member", "Team Lead", "HQ", "Sniper", "Medic", "Forward Observer", "RTO", "K9"];
 _group_role = "Team Member";
 
-if (["SpecialOperative", (configFile >> "CfgVehicles" >> typeOf _unit >> "role") call BIS_fnc_getCfgData, false] call BIS_fnc_inString) then {
+if (["SpecialOperative", (configOf _unit >> "role") call BIS_fnc_getCfgData, false] call BIS_fnc_inString) then {
 	_group_role = _group_roles select 5;
 };
 
@@ -19,7 +20,7 @@ if (((backpack _unit) isKindOf "TFAR_Bag_Base") or (["radio", typeOf _unit, fals
 	_group_role = _group_roles select 6;
 };
 
-if ((["sniper", typeOf _unit, false] call BIS_fnc_inString) or (["marksman", (configFile >> "CfgVehicles" >> typeOf _unit >> "role") call BIS_fnc_getCfgData, false] call BIS_fnc_inString) or (["sharpshooter", typeOf _unit, false] call BIS_fnc_inString)) then {
+if ((["sniper", typeOf _unit, false] call BIS_fnc_inString) or (["marksman", (configOf _unit >> "role") call BIS_fnc_getCfgData, false] call BIS_fnc_inString) or (["sharpshooter", typeOf _unit, false] call BIS_fnc_inString)) then {
 	_group_role = _group_roles select 3;
 };
 
@@ -34,7 +35,7 @@ if (["officer", typeOf _unit, false] call BIS_fnc_inString) then {
 _pre_defined_role = _unit getVariable "_atak_group_role";
 
 if (!isNil "_pre_defined_role") then {
-	_callsign = _pre_defined_callsign;
+	_callsign = _pre_defined_role;
 };
 
 _group_role
diff --git a/addons/main/functions/extract_data/fn_extract_marker_callsign.sqf b/addons/main/functions/extract_data/fn_extract_marker_callsign.sqf
index 2608c1b..9e6da4b 100644
--- a/addons/main/functions/extract_data/fn_extract_marker_callsign.sqf
+++ b/addons/main/functions/extract_data/fn_extract_marker_callsign.sqf
@@ -7,15 +7,15 @@ params["_unit"];
 private _callsign = "";
 
 if ((([_unit] call BIS_fnc_objectType) select 0) == "Vehicle") then {
-	_callsign = getText (configFile >> "CfgVehicles" >> typeOf _unit >> "displayName");
+	_callsign = getText (configOf _unit >> "displayName");
 
 	if (!isNull driver _unit) then {
-		_callsign = getText (configFile >> "CfgVehicles" >> typeOf _unit >> "displayName") + " | " + ([name (driver _unit)] call armatak_fnc_shorten_name);
+		_callsign = getText (configOf _unit >> "displayName") + " | " + ([name (driver _unit)] call armatak_fnc_shorten_name);
 	};
 };
 
 if (unitIsUAV _unit) then {
-	_callsign = getText (configFile >> "CfgVehicles" >> typeOf _unit >> "displayName");
+	_callsign = getText (configOf _unit >> "displayName");
 
 	if (isUAVConnected _unit) then {
 		_callsign = (_callsign) + "[ON]";
diff --git a/addons/main/functions/extract_data/fn_extract_unit_callsign.sqf b/addons/main/functions/extract_data/fn_extract_unit_callsign.sqf
index d364eeb..f79692e 100644
--- a/addons/main/functions/extract_data/fn_extract_unit_callsign.sqf
+++ b/addons/main/functions/extract_data/fn_extract_unit_callsign.sqf
@@ -12,7 +12,7 @@ if (roleDescription _unit != "") then {
 	_callsign = name _unit;
 
 	if (_callsign == "Error: No unit") then {
-		_callsign = getText (configFile >> "CfgVehicles" >> typeOf _unit >> "displayName");
+		_callsign = getText (configOf _unit >> "displayName");
 	};
 };
 
diff --git a/addons/main/functions/fnc_logMessage.sqf b/addons/main/functions/fnc_logMessage.sqf
index 549b0c5..c207855 100644
--- a/addons/main/functions/fnc_logMessage.sqf
+++ b/addons/main/functions/fnc_logMessage.sqf
@@ -1,3 +1,3 @@
-params[_type, _message];
+params["_type", "_message"];
 
 "armatak" callExtension ["log", [_type, _message]]