diff --git a/@ExileServer/addons/exad_hacking/Functions/fn_startHack.sqf b/@ExileServer/addons/exad_hacking/Functions/fn_startHack.sqf
index 0f57866..ecec71a 100644
--- a/@ExileServer/addons/exad_hacking/Functions/fn_startHack.sqf
+++ b/@ExileServer/addons/exad_hacking/Functions/fn_startHack.sqf
@@ -67,7 +67,7 @@ _player removeItem "Exile_Item_Laptop";
 	params ["_object","_player","_laptop","_flag","_markers","_marker","_success","_ticks","_newSize","_destroy","_msg"];
 	UISleep 2;
 	
-	(parseText (format["<t color='%1' size='%2' font='%3'>%4</t><br/><t color='%5' size='%6' font='%7'>%8</t>", ExAd_Hint_Title_Color, ExAd_Hint_Title_Size, ExAd_Hint_Title_Font,STR_ExAd_HACKING_HINT_TITLE, ExAd_Hint_Msg_Color, ExAd_Hint_Msg_Size, ExAd_Hint_Msg_Font, STR_ExAd_HACKING_HINT_HACK_START])) remoteExec ["hint", -2];
+	["baguetteRequest", ["Hacktivity Detected on the Grid!"]] call ExileServer_system_network_send_broadcast; 
 	
 	if(ExAd_HACKS_IN_PROGRESS >= ExAd_HACKING_ALLOWED_HACKS)exitWith{
 		_laptop setVariable ["ExAd_HACKING_IN_PROGRESS", false, true];
@@ -174,4 +174,4 @@ _player removeItem "Exile_Item_Laptop";
 	{deleteMarker _x}forEach _markers;
 };
 
-true
\ No newline at end of file
+true
diff --git a/mpmissions/Exile.Altis/ExAdClient/HaloParachute/postInit.sqf b/mpmissions/Exile.Altis/ExAdClient/HaloParachute/postInit.sqf
index 358efb2..347f783 100644
--- a/mpmissions/Exile.Altis/ExAdClient/HaloParachute/postInit.sqf
+++ b/mpmissions/Exile.Altis/ExAdClient/HaloParachute/postInit.sqf
@@ -42,7 +42,7 @@ if(isNil "ExAd_ACTION_EJECT_HEIGHT")then{ExAd_ACTION_EJECT_HEIGHT = 0;};
 		
 		if(ExAd_HALOPARACHUTE_USE_KEY_ACTIONS)then{
 			ExAd_ACTION_HALOPARACHUTE_USE_KEY_ACTIONS = (findDisplay 46) displayAddEventHandler ["KeyDown",{
-				if(_this select 1 == 45 && _this select 2 && _this select 4)then{
+				if(_this select 1 == 47 && _this select 2 && _this select 4)then{
 					if((getPos player) select 2 > ExAd_ACTION_EJECT_HEIGHT && vehicle player != player)then{
 						call ExAd_fnc_ejectPlayer
 					}else{
@@ -64,4 +64,4 @@ if(isNil "ExAd_ACTION_EJECT_HEIGHT")then{ExAd_ACTION_EJECT_HEIGHT = 0;};
 			(findDisplay 46) displayRemoveEventHandler ["KeyDown", ExAd_ACTION_HALOPARACHUTE_USE_KEY_ACTIONS];
 		};
 	};
-};
\ No newline at end of file
+};
diff --git a/mpmissions/Exile.Altis/ExAdClient/VirtualGarage/Functions/fn_allowVGStore.sqf b/mpmissions/Exile.Altis/ExAdClient/VirtualGarage/Functions/fn_allowVGStore.sqf
index bb23263..7e69055 100644
--- a/mpmissions/Exile.Altis/ExAdClient/VirtualGarage/Functions/fn_allowVGStore.sqf
+++ b/mpmissions/Exile.Altis/ExAdClient/VirtualGarage/Functions/fn_allowVGStore.sqf
@@ -15,9 +15,12 @@
 	See the License for the specific language governing permissions and
 	limitations under the License.
 */
-private ["_res","_flag"];
+private ["_res","_flag","_cmon1","_cmon2","ExAd_STOP_COMBAT_STORING"];
+
+_cmon1 = if (ExileClientPlayerIsInCombat && ExAd_STOP_COMBAT_STORING)exitWith{["ErrorTitleAndText", ["ExAd - Virtual Garage", "You cannot store Vehicles While in Combat!"]] call ExileClient_gui_toaster_addTemplateToast;};
+
+_cmon2 = if (isNil "ExAdCurFlagNetId")exitWith{diag_log "ExAdClient: allowVGStore - ExAdCurFlagNetId is nil";false};
 
-if(isNil "ExAdCurFlagNetId")exitWith{diag_log "ExAdClient: allowVGStore - ExAdCurFlagNetId is nil";false};
 _flag = objectFromNetId ExAdCurFlagNetId;
 
 _allowedVeh = _flag call ExAd_fnc_allowedVGVeh;
@@ -25,4 +28,4 @@ _storedVeh = count (_flag getVariable ["ExAdVGVeh", []]);
 
 _res = if(_allowedVeh > _storedVeh)then{true}else{false};
 
-_res
\ No newline at end of file
+_res
diff --git a/mpmissions/Exile.Altis/ExAdClient/VirtualGarage/customize.sqf b/mpmissions/Exile.Altis/ExAdClient/VirtualGarage/customize.sqf
index bcba508..fc71095 100644
--- a/mpmissions/Exile.Altis/ExAdClient/VirtualGarage/customize.sqf
+++ b/mpmissions/Exile.Altis/ExAdClient/VirtualGarage/customize.sqf
@@ -26,4 +26,6 @@ ExAd_VG_CLEAN_ON_STORE = true;			//BOOLEAN - If vehicle inventory should reset w
 
 ExAd_VG_SHOW_ADVHINT = false; 			//BOOLEAN - If the virtual garage should display an Advanced hint upon store and fetch.
 
-ExAd_VG_ALLOWED_VEH_TYPE = ["Car","Air"];//ARRAY - Array with allowed vehicle types for the virtual garage. | "Car", "Tank", "Helicopter", "Plane" or "Air" for both WARNING DON'T USE "LandVehicle" Can crash the Exile system.  
\ No newline at end of file
+ExAd_STOP_COMBAT_STORING = true; 		//BOOLEAN - If set to true players cannot store vehicles while they are in combat. Prevents combat storing.
+
+ExAd_VG_ALLOWED_VEH_TYPE = ["Car","Tank","Plane","Air","Ship","Submarine"];//ARRAY - Array with allowed vehicle types for the virtual garage. | "Car", "Tank", "Helicopter", "Plane" or "Air" for both WARNING DON'T USE "LandVehicle" Can crash the Exile system.  
diff --git a/mpmissions/Exile.Altis/stringtable.xml b/mpmissions/Exile.Altis/stringtable.xml
index deccff5..16f63c7 100644
--- a/mpmissions/Exile.Altis/stringtable.xml
+++ b/mpmissions/Exile.Altis/stringtable.xml
@@ -14,7 +14,7 @@
 		</Container>
 		<Container name="Info">
 			<Key ID="STR_ExAd_HALOPARACHUTE_INFO_DETACH">
-				<Original>You can eject from parachute with: Alt Shift x</Original>
+				<Original>Alt+Shift+V to Eject from Parachute!</Original>
 			</Key>
 		</Container>
 	</Package>
@@ -110,7 +110,7 @@
 				<Original>Hack Activity</Original>
 			</Key>
 			<Key ID="STR_ExAd_HACKING_HINT_HACK_START">
-				<Original>A brute force hack is detected on the grid!</Original>
+				<Original>Someone is hacking another person's base!</Original>
 			</Key>
 		</Container>
 	</Package>
@@ -208,4 +208,4 @@
 			</Key>
 		</Container>
 	</Package>
-</Project>
\ No newline at end of file
+</Project>