diff --git a/mission.sqm b/mission.sqm
@@ -17,9 +17,9 @@ class EditorData
 	class Camera
 	{
 		pos[]={7229.1802,63.966225,2439.9375};
-		dir[]={-0.0033506958,-0.64468831,0.76443964};
-		up[]={-0.0028257701,0.76444471,0.64468175};
-		aside[]={0.99999106,2.1464075e-010,0.0043831584};
+		dir[]={0.67291516,-0.55963153,0.48374283};
+		up[]={0.45440349,0.82873994,0.32665974};
+		aside[]={0.58370543,-2.500019e-008,-0.81197089};
 	};
 };
 binarizationWanted=0;
@@ -109,7 +109,7 @@ class AddonsMetaData
 {
 	class List
 	{
-		items=55;
+		items=54;
 		class Item0
 		{
 			className="A3_Ui_F";
@@ -194,283 +194,276 @@ class AddonsMetaData
 			url="http://ace3mod.com/";
 		};
 		class Item12
-		{
-			className="ace_ballistics";
-			name="ACE3 - Ballistics";
-			author="ACE-Team";
-			url="http://ace3mod.com/";
-		};
-		class Item13
 		{
 			className="ace_smallarms";
 			name="ACE3 - Small Arms";
 			author="ACE-Team";
 			url="http://ace3mod.com/";
 		};
-		class Item14
+		class Item13
 		{
 			className="A3_Characters_F_Exp";
 			name="Arma 3 Apex - Characters and Clothing";
 			author="Bohemia Interactive";
 			url="https://www.arma3.com";
 		};
-		class Item15
+		class Item14
 		{
 			className="ace_scopes";
 			name="ACE3 - Scopes";
 			author="ACE-Team";
 			url="http://ace3mod.com/";
 		};
-		class Item16
+		class Item15
 		{
 			className="ace_laserpointer";
 			name="ACE3 - Laser Pointer";
 			author="ACE-Team";
 			url="http://ace3mod.com/";
 		};
-		class Item17
+		class Item16
 		{
 			className="ace_goggles";
 			name="ACE3 - Goggles";
 			author="ACE-Team";
 			url="http://ace3mod.com/";
 		};
-		class Item18
+		class Item17
 		{
 			className="A3_Structures_F_Heli";
 			name="Arma 3 Helicopters - Buildings and Structures";
 			author="Bohemia Interactive";
 			url="https://www.arma3.com";
 		};
-		class Item19
+		class Item18
 		{
 			className="CUP_CAMisc";
 			name="CUP_CAMisc";
 		};
-		class Item20
+		class Item19
 		{
 			className="CUP_Misc3_Config";
 			name="CUP_Misc3_Config";
 		};
-		class Item21
+		class Item20
 		{
 			className="CUP_CAStructures_E_Misc_Misc_Interier";
 			name="CUP_CAStructures_E_Misc_Misc_Interier";
 		};
-		class Item22
+		class Item21
 		{
 			className="A3_Structures_F";
 			name="Arma 3 - Buildings and Structures";
 			author="Bohemia Interactive";
 			url="https://www.arma3.com";
 		};
-		class Item23
+		class Item22
 		{
 			className="A3_Structures_F_EPA";
 			name="Arma 3 Survive Episode - Buildings and Structures";
 			author="Bohemia Interactive";
 			url="https://www.arma3.com";
 		};
-		class Item24
+		class Item23
 		{
 			className="acex_sitting";
 			name="ACEX - Sitting";
 			author="ACE-Team";
 			url="http://ace3mod.com/";
 		};
-		class Item25
+		class Item24
 		{
 			className="A3_Structures_F_Mil";
 			name="Arma 3 - Military Buildings and Structures";
 			author="Bohemia Interactive";
 			url="https://www.arma3.com";
 		};
-		class Item26
+		class Item25
 		{
 			className="Desert";
 			name="Desert";
 		};
-		class Item27
+		class Item26
 		{
 			className="rhsusf_c_m113";
 			name="M113A3 APC";
 			author="Red Hammer Studios";
 			url="http://www.rhsmods.org/";
 		};
-		class Item28
+		class Item27
 		{
 			className="po_factions_me";
 			name="po_factions_me";
 			author="Leight, Keeway";
 		};
-		class Item29
+		class Item28
 		{
 			className="CUP_Buildings_Config";
 			name="CUP_Buildings_Config";
 		};
-		class Item30
+		class Item29
 		{
 			className="A3_Props_F_Orange";
 			name="Arma 3 Orange - Decorative and Mission Objects";
 			author="Bohemia Interactive";
 			url="https://www.arma3.com";
 		};
-		class Item31
+		class Item30
 		{
 			className="A3_Structures_F_Argo";
 			name="Arma 3 Malden - Buildings and Structures";
 			author="Bohemia Interactive";
 			url="https://www.arma3.com";
 		};
-		class Item32
+		class Item31
 		{
 			className="A3_Data_F_Curator";
 			name="Arma 3 Zeus Update - Main Configuration";
 			author="Bohemia Interactive";
 			url="https://www.arma3.com";
 		};
-		class Item33
+		class Item32
 		{
 			className="CUP_CAStructures_Nav_pier";
 			name="CUP_CAStructures_Nav_pier";
 		};
-		class Item34
+		class Item33
 		{
 			className="A3_Structures_F_Ind";
 			name="Arma 3 - Industrial Structures";
 			author="Bohemia Interactive";
 			url="https://www.arma3.com";
 		};
-		class Item35
+		class Item34
 		{
 			className="A3_Structures_F_Exp";
 			name="Arma 3 Apex - Buildings and Structures";
 			author="Bohemia Interactive";
 			url="https://www.arma3.com";
 		};
-		class Item36
+		class Item35
 		{
 			className="A3_Supplies_F_Heli";
 			name="Arma 3 Helicopters - Ammoboxes and Supplies";
 			author="Bohemia Interactive";
 			url="https://www.arma3.com";
 		};
-		class Item37
+		class Item36
 		{
 			className="CUP_CABuildings_Misc";
 			name="CUP_CABuildings_Misc";
 		};
-		class Item38
+		class Item37
 		{
 			className="ace_interaction";
 			name="ACE3 - Interaction";
 			author="ACE-Team";
 			url="http://ace3mod.com/";
 		};
-		class Item39
+		class Item38
 		{
 			className="ace_cargo";
 			name="ACE3 - Cargo";
 			author="ACE-Team";
 			url="http://ace3mod.com/";
 		};
-		class Item40
+		class Item39
 		{
 			className="ace_dragging";
 			name="ACE3 - Dragging";
 			author="ACE-Team";
 			url="http://ace3mod.com/";
 		};
-		class Item41
+		class Item40
 		{
 			className="rhs_c_troops";
 			name="AFRF Infantry & Equipment";
 			author="Red Hammer Studios";
 			url="http://www.rhsmods.org/";
 		};
-		class Item42
+		class Item41
 		{
 			className="rhs_c_heavyweapons";
 			name="Heavy weapons pack";
 			author="Red Hammer Studios";
 			url="http://www.rhsmods.org/";
 		};
-		class Item43
+		class Item42
 		{
 			className="rhs_c_a2port_car";
 			name="A2 ported cars";
 			author="Red Hammer Studios";
 			url="http://www.rhsmods.org/";
 		};
-		class Item44
+		class Item43
 		{
 			className="rhsusf_c_mrzr";
 			name="MRZR";
 			author="Red Hammer Studios";
 			url="http://www.rhsmods.org/";
 		};
-		class Item45
+		class Item44
 		{
 			className="rhsusf_vehicles";
 			name="rhsusf_vehicles";
 		};
-		class Item46
+		class Item45
 		{
 			className="A3_Modules_F";
 			name="Arma 3 Alpha - Scripted Modules";
 			author="Bohemia Interactive";
 			url="https://www.arma3.com";
 		};
-		class Item47
+		class Item46
 		{
 			className="RHS_US_A2_AirImport";
 			name="RHSUSF A2 Air Ports";
 			author="Red Hammer Studios";
 			url="http://www.rhsmods.org/";
 		};
-		class Item48
+		class Item47
 		{
 			className="A3_Structures_F_EPB";
 			name="Arma 3 Adapt Episode - Buildings and Structures";
 			author="Bohemia Interactive";
 			url="https://www.arma3.com";
 		};
-		class Item49
+		class Item48
 		{
 			className="rhsusf_c_troops";
 			name="RHSUSF Infantry & Equipment";
 			author="Red Hammer Studios";
 			url="http://www.rhsmods.org/";
 		};
-		class Item50
+		class Item49
 		{
 			className="rhsusf_c_statics";
 			name="RHSUSF Static Weapons";
 			author="Red Hammer Studios";
 			url="http://www.rhsmods.org/";
 		};
-		class Item51
+		class Item50
 		{
 			className="A3_Boat_F_Exp";
 			name="Arma 3 Apex - Boats and Submersibles";
 			author="Bohemia Interactive";
 			url="https://www.arma3.com";
 		};
-		class Item52
+		class Item51
 		{
 			className="rhsgref_c_a2port_armor";
 			name="BRDM-2";
 			author="Red Hammer Studios";
 			url="http://www.rhsmods.org/";
 		};
-		class Item53
+		class Item52
 		{
 			className="A3_Modules_F_Curator";
 			name="Arma 3 Zeus Update - Scripted Modules";
 			author="Bohemia Interactive";
 			url="https://www.arma3.com";
 		};
-		class Item54
+		class Item53
 		{
 			className="rhsusf_c_markvsoc";
 			name="Mark V SOC";
@@ -3799,7 +3792,6 @@ class Mission
 							{
 								name="rhs_weap_hk416d10_m320";
 								optics="rhs_acc_1p87";
-								flashlight="grad_flashlight_1";
 								class primaryMuzzleMag
 								{
 									name="rhs_mag_30Rnd_556x45_M855_Stanag";
@@ -8072,7 +8064,7 @@ class Mission
 			};
 			id=716;
 			type="Land_Pliers_F";
-			atlOffset=-0.002269268;
+			atlOffset=-0.0022029877;
 		};
 		class Item50
 		{
@@ -14079,7 +14071,7 @@ class Mission
 			};
 			id=1392;
 			type="Land_Pliers_F";
-			atlOffset=7.6293945e-006;
+			atlOffset=2.2888184e-005;
 		};
 		class Item250
 		{

diff --git a/onPlayerKilled.sqf b/onPlayerKilled.sqf
@@ -1,26 +1,36 @@
-"grad_gpsTracker_layer" cutFadeout 0.5;
+params ["_player", "_killer"];
+
+// dont start shit if not necessary
+if (_player getVariable ["GRAD_simpleWaveRespawn_respawning", false]) exitWith {
+	[false] call ace_spectator_fnc_setSpectator;
+	[_player, false] call TFAR_fnc_forceSpectator;
+	setPlayerRespawnTime 999999;
+	_player setVariable ["GRAD_simpleWaveRespawn_respawning", false];
+};
 
+"grad_gpsTracker_layer" cutFadeout 0.5;
 
 // remove radio to prevent taking an enemys radio
-_items = items player;
+private _items = items _player;
 {
 	_isHandheld = _x isKindOf ["ItemRadio", configFile >> "CfgWeapons"];
 	_isLongrange = _x isKindOf "TFAR_Bag_Base";
 
 	if (_isHandheld || _isLongrange) then {
-		player unlinkItem typeOf _x;
+		_player unlinkItem typeOf _x;
 	};
 } forEach _items;
 
-
-
 _handle = execVM "player\createDeathCam.sqf";
 waitUntil {scriptdone _handle};
 cutText ["", "BLACK IN", 1];
 
-// todo: add free cams for dead pilots
+[true] call ace_spectator_fnc_setSpectator;
+
 private _enemySides = [west,east,independent,civilian] - [playerSide];
 [[playerSide], _enemySides] call ace_spectator_fnc_updateSides;
+
+// give pilot free cam
 if (player getVariable ["GRAD_pilotTracking_isPilot",false]) then {
 	[[0,1,2],[]] call ace_spectator_fnc_updateCameraModes;
 } else {
@@ -29,7 +39,6 @@ if (player getVariable ["GRAD_pilotTracking_isPilot",false]) then {
 
 [[-2,-1], [0,1,2,3,4,5,6,7]] call ace_spectator_fnc_updateVisionModes;
 [1, objNull] call ace_spectator_fnc_setCameraAttributes;
-[true] call ace_spectator_fnc_setSpectator;
 [player, true] call TFAR_fnc_forceSpectator;
 
-[] call grad_simpleWaveRespawn_fnc_showRemainingTime;
+call grad_simpleWaveRespawn_fnc_showRemainingTime;
diff --git a/player/USTeleportListener.sqf b/player/USTeleportListener.sqf
diff --git a/player/createDeathCam.sqf b/player/createDeathCam.sqf
@@ -82,9 +82,11 @@ _ctrlAuthor ctrlCommit 0;
 _unit = player;
 _shooter = _unit getVariable ["ACE_medical_lastDamageSource",_unit];
 
+systemChat format ["killed by: %1", name _shooter];
+
 showCinemaBorder true;
 
-// playMusic "DEATH_MUSIC";
+playMusic "EventTrack03_F_Curator";
 _filmgrain = ppEffectCreate ["FilmGrain",2000];
 _filmgrain ppEffectEnable true;
 _filmgrain ppEffectAdjust [0.3,0.3,0.12,0.12,0.12,true];

diff --git a/player/createPilotMarker.sqf b/player/createPilotMarker.sqf
diff --git a/player/createPilotVehicleTracker.sqf b/player/createPilotVehicleTracker.sqf
diff --git a/player/pilotInventoryChangeListener.sqf b/player/pilotInventoryChangeListener.sqf
diff --git a/player/rebelsTeleportListener.sqf b/player/rebelsTeleportListener.sqf
diff --git a/rattrap_loadout/Rebels_Rattrap.hpp b/rattrap_loadout/Rebels_Rattrap.hpp
@@ -8,7 +8,7 @@ class Rebels_Rattrap: ModerateRebels {
         primaryWeapon = "arifle_AK12_F";
         primaryWeaponMagazine = "30Rnd_762x39_Mag_Tracer_Green_F";
         primaryWeaponMuzzle = "";
-        primaryWeaponPointer = "grad_flashlight_1";
+        primaryWeaponPointer = "";
         primaryWeaponOptics = "rhs_acc_1p87";
         handgunWeapon = "rhs_weap_makarov_pm";
         handgunWeaponMagazine = "rhs_mag_9x18_8_57N181S";

diff --git a/rattrap_loadout/US_Rattrap.hpp b/rattrap_loadout/US_Rattrap.hpp
@@ -6,8 +6,8 @@ class US_Rattrap: SOGBLACK {
         headgear = "rhsusf_opscore_bk_pelt";
         primaryWeapon = "rhs_weap_hk416d10";
         primaryWeaponMagazine = "30Rnd_556x45_Stanag_Tracer_Red";
-        primaryWeaponMuzzle = SUPPRESSORITEM;
-        primaryWeaponPointer = "grad_flashlight_1";
+        primaryWeaponMuzzle = "";
+        primaryWeaponPointer = "";
         primaryWeaponOptics = "rhsusf_acc_compm4";
 		primaryWeaponUnderbarrel = "rhsusf_acc_grip3";
         handgunWeapon = "rhsusf_weap_glock17g4";