diff --git a/SQF/dayz_code/compile/fn_selfActions.sqf b/SQF/dayz_code/compile/fn_selfActions.sqf
index bbfbed587..2cc1d6bdb 100644
--- a/SQF/dayz_code/compile/fn_selfActions.sqf
+++ b/SQF/dayz_code/compile/fn_selfActions.sqf
@@ -102,6 +102,7 @@ if (!isNull cursorTarget and !_inVehicle and !_isPZombie and (player distance cu
 	} forEach boil_tin_cans;
 	_hasFuelE = 	"ItemJerrycanEmpty" in _magazinesPlayer;
 	_hasFuelBarrelE = 	"ItemFuelBarrelEmpty" in _magazinesPlayer;
+	_hasHotwireKit = 	"ItemHotwireKit" in _magazinesPlayer;
 
 	_itemsPlayer = items player;
 	
@@ -210,7 +211,11 @@ if (!isNull cursorTarget and !_inVehicle and !_isPZombie and (player distance cu
 					s_player_lockunlock set [count s_player_lockunlock,_Unlock];
 					s_player_lockUnlock_crtl = 1;
 				} else {
-					_Unlock = player addAction ["<t color='#ff0000'>Vehicle Locked</t>", "",_cursorTarget, 2, true, true, "", ""];
+					if(_hasHotwireKit) then {
+						_Unlock = player addAction [format["Hotwire %1",_text], "\z\addons\dayz_code\actions\hotwire_veh.sqf",_cursorTarget, 2, true, true, "", ""];
+					} else {
+						_Unlock = player addAction ["<t color='#ff0000'>Vehicle Locked</t>", "",_cursorTarget, 2, true, true, "", ""];
+					};
 					s_player_lockunlock set [count s_player_lockunlock,_Unlock];
 					s_player_lockUnlock_crtl = 1;
 				};
@@ -288,7 +293,7 @@ if (!isNull cursorTarget and !_inVehicle and !_isPZombie and (player distance cu
 		};
 
 		// Study body
-		if (_isMan and !_isZombie) then {
+		if (_isMan and !_isZombie and !_isAnimal) then {
 			_player_studybody = true;
 		}
 	};
@@ -490,13 +495,13 @@ if (!isNull cursorTarget and !_inVehicle and !_isPZombie and (player distance cu
 	
 
 	// inplace maintenance tool
-	if((_isDestructable or _cursorTarget isKindOf "ModularItems" or _cursorTarget isKindOf "DZE_Housebase")) then {
+	if((_isDestructable or _cursorTarget isKindOf "ModularItems" or _cursorTarget isKindOf "DZE_Housebase") and (damage _cursorTarget > 0.5)) then {
 		if ((s_player_lastTarget select 1) != _cursorTarget) then {
 			if (s_player_maint_build > 0) then {	
 				player removeAction s_player_maint_build;
 				s_player_maint_build = -1;
 			};
-		}; 
+		};
 
 		if (s_player_maint_build < 0) then {
 			s_player_lastTarget set [1,_cursorTarget];