diff --git a/Server/Entities/ServerVehicle.cs b/Server/Entities/ServerVehicle.cs
index ae98baa0..1a592468 100644
--- a/Server/Entities/ServerVehicle.cs
+++ b/Server/Entities/ServerVehicle.cs
@@ -37,7 +37,7 @@ namespace reallife_gamemode.Server.Entities
             if (currentVeh != null) VehicleManager.DeleteVehicle(currentVeh);
             Vehicle veh = NAPI.Vehicle.CreateVehicle(this.Model, this.Position, this.Heading, this.PrimaryColor, this.SecondaryColor, this.NumberPlate, locked: this.Locked, engine: false);
             VehicleStreaming.SetEngineState(veh, false);
-            VehicleStreaming.SetLockStatus(veh, false);
+            VehicleStreaming.SetLockStatus(veh, this.Locked);
             VehicleManager.AddVehicle(this, veh);
 
             string numberplate = $"{this.Id}";
@@ -52,6 +52,13 @@ namespace reallife_gamemode.Server.Entities
                 numberplate = $"U{uV.UserId} " + numberplate;
             }
 
+            if(this is ShopVehicle sV)
+            {
+                numberplate = "Shop";
+                VehicleStreaming.SetLockStatus(veh, false);
+                Array.ForEach((WindowID[])Enum.GetValues(typeof(WindowID)), x => VehicleStreaming.SetVehicleWindowState(veh, x, WindowState.WindowDown));
+            }
+
             veh.NumberPlate = numberplate;
 
             return veh;
diff --git a/Server/Events/Key.cs b/Server/Events/Key.cs
index 9d881657..8f2e138e 100644
--- a/Server/Events/Key.cs
+++ b/Server/Events/Key.cs
@@ -199,7 +199,9 @@ namespace reallife_gamemode.Server.Events
             if (player.IsInVehicle && player.VehicleSeat == -1)
             {
                 Vehicle v = player.Vehicle;
-                VehicleStreaming.SetEngineState(v, !VehicleStreaming.GetEngineState(v));
+                bool state = VehicleStreaming.GetEngineState(v);
+                NAPI.Util.ConsoleOutput("changing engine state: " + state.ToString());
+                VehicleStreaming.SetEngineState(v, !state);
             }
         }
         [RemoteEvent("keyPress:X")]