diff --git a/addons/main/functions/extract_data/fn_extract_callsign.sqf b/addons/main/functions/extract_data/fn_extract_callsign.sqf
index 2ed1fe0..8c7c462 100644
--- a/addons/main/functions/extract_data/fn_extract_callsign.sqf
+++ b/addons/main/functions/extract_data/fn_extract_callsign.sqf
@@ -9,4 +9,5 @@ if (roleDescription _unit != "") then {
 		_callsign = getText(configFile >> "CfgVehicles" >> typeOf _unit >> "displayName");
 	};
 };
+
 _callsign
\ No newline at end of file
diff --git a/addons/main/functions/extract_data/fn_extract_drone_info.sqf b/addons/main/functions/extract_data/fn_extract_drone_info.sqf
index b3b4200..623b03d 100644
--- a/addons/main/functions/extract_data/fn_extract_drone_info.sqf
+++ b/addons/main/functions/extract_data/fn_extract_drone_info.sqf
@@ -7,7 +7,7 @@ private _atak_longitude = _location select 1;
 private _atak_speed = speed _drone;
 private _atak_bearing = parseNumber ((getDir _drone) toFixed 0);
 private _atak_role = "a-f-A";
-private _atak_callsign = getText(configFile >> "CfgVehicles" >> typeOf _unit >> "displayName");
+private _atak_callsign = getText(configFile >> "CfgVehicles" >> typeOf _drone >> "displayName");
 private _atak_server_instance = missionNamespace getVariable "_atak_server_instance";
 private _atak_server_instance_token = missionNamespace getVariable "_atak_server_instance_token";
 private _atak_altitude = _location select 2;
diff --git a/addons/main/functions/fn_init.sqf b/addons/main/functions/fn_init.sqf
index 3fe4587..fb86e4b 100644
--- a/addons/main/functions/fn_init.sqf
+++ b/addons/main/functions/fn_init.sqf
@@ -22,7 +22,7 @@ if (isServer && _activated) exitWith {
 
 	_atak_server_instance_token = call armatak_fnc_extract_auth_token;
 
-	if (_atak_server_instance_token == "") then {
+	if ((_atak_server_instance_token == "") and !(["ERROR", _atak_server_instance_token, false] call BIS_fnc_inString)) then {
 		private _warning = format ["<t color='#FF0000'>ARMATAK</t><br/> %1", "Connection Failed"];
 		[[_warning, 2]] call CBA_fnc_notify;
 	} else {
@@ -51,7 +51,7 @@ if (isServer && _activated) exitWith {
 
 			_request = "armatak" callExtension ["ots_api:post", [_markers]];
 		}, 1, []] call CBA_fnc_addPerFrameHandler;
-	}, [], 5] call CBA_fnc_waitAndExecute;
+	}, [], 1] call CBA_fnc_waitAndExecute;
 };
 
 true;
\ No newline at end of file