diff --git a/Sources/epoch_code/compile/setup/masterLoop/Event2.sqf b/Sources/epoch_code/compile/setup/masterLoop/Event2.sqf
index 67bef9cd..940e819d 100644
--- a/Sources/epoch_code/compile/setup/masterLoop/Event2.sqf
+++ b/Sources/epoch_code/compile/setup/masterLoop/Event2.sqf
@@ -20,9 +20,10 @@ if (damage player != _damagePlayer) then {
 _energyValue = _chargeRate min _energyRegenMax;
 _vehicle = vehicle player;
 if (_vehicle != player && isEngineOn _vehicle) then {
-	_energyValue = _energyValue + 5;
+	if !(_vehicle iskindof "Bicycle") then {
+		_energyValue = _energyValue + 5;
+	};
 };
-
 if (currentVisionMode player == 1) then { //NV enabled
 	_energyValue = _energyValue - _energyCostNV;
 	_playerEnergy = missionNamespace getVariable [_playerEnergyKey, _playerEnergyDefault];
diff --git a/Sources/epoch_config/Configs/CfgActionMenu/CfgActionMenu_self.hpp b/Sources/epoch_config/Configs/CfgActionMenu/CfgActionMenu_self.hpp
index 68d20598..106b2088 100644
--- a/Sources/epoch_config/Configs/CfgActionMenu/CfgActionMenu_self.hpp
+++ b/Sources/epoch_config/Configs/CfgActionMenu/CfgActionMenu_self.hpp
@@ -15,7 +15,7 @@
 
 class veh_lock
 {
-	condition = "dyna_inVehicle && !dyna_lockedInVehicle";
+	condition = "if (vehicle player iskindof 'Bicycle') exitwith {false};dyna_inVehicle && !dyna_lockedInVehicle";
 	action = "[vehicle player, true, player, Epoch_personalToken] remoteExec ['EPOCH_server_lockVehicle',2];";
 	icon = "x\addons\a3_epoch_code\Data\UI\buttons\pad_cannot_lock.paa";
 	tooltip = "Lock";
diff --git a/Sources/epoch_config/Configs/CfgActionMenu/CfgActionMenu_target.hpp b/Sources/epoch_config/Configs/CfgActionMenu/CfgActionMenu_target.hpp
index 830eab9a..a1a37584 100644
--- a/Sources/epoch_config/Configs/CfgActionMenu/CfgActionMenu_target.hpp
+++ b/Sources/epoch_config/Configs/CfgActionMenu/CfgActionMenu_target.hpp
@@ -48,7 +48,7 @@ class veh_gear
 };
 class veh_lock
 {
-	condition = "dyna_isVehicle && !dyna_locked";
+	condition = "if (dyna_cursorTarget iskindof 'Bicycle') exitwith {false};dyna_isVehicle && !dyna_locked";
 	action = "[dyna_cursorTarget, true, player, Epoch_personalToken] remoteExec ['EPOCH_server_lockVehicle',2];";
 	icon = "x\addons\a3_epoch_code\Data\UI\buttons\pad_cannot_lock.paa";
 	tooltip = "Lock";
diff --git a/Sources/epoch_config/Configs/CfgBuildingLootPos.hpp b/Sources/epoch_config/Configs/CfgBuildingLootPos.hpp
index 9d03cd31..e1195eae 100644
--- a/Sources/epoch_config/Configs/CfgBuildingLootPos.hpp
+++ b/Sources/epoch_config/Configs/CfgBuildingLootPos.hpp
@@ -288,6 +288,7 @@ class CfgBuildingLootPos
     class Land_Cargo_Tower_V1_No7_F : Land_Cargo_Tower_V1_F {};
     class Land_Cargo_Tower_V2_F : Land_Cargo_Tower_V1_F {};
     class Land_Cargo_Tower_V3_F : Land_Cargo_Tower_V1_F {};
+	class Land_Cargo_Tower_V4_F : Land_Cargo_Tower_V1_F { };
     class Land_Cargo_Patrol_V1_F : Default
     {
         lootType = "mil";
@@ -298,6 +299,7 @@ class CfgBuildingLootPos
     };
     class Land_Cargo_Patrol_V2_F : Land_Cargo_Patrol_V1_F {};
     class Land_Cargo_Patrol_V3_F : Land_Cargo_Patrol_V1_F {};
+	class Land_Cargo_Patrol_V4_F : Land_Cargo_Patrol_V1_F { };
     class Land_Medevac_house_V1_F : Default
     {
         lootType = "mil";
@@ -344,6 +346,7 @@ class CfgBuildingLootPos
     };
     class Land_Cargo_HQ_V2_F : Land_Cargo_HQ_V1_F {};
     class Land_Cargo_HQ_V3_F : Land_Cargo_HQ_V1_F {};
+	class Land_Cargo_HQ_V4_F : Land_Cargo_HQ_V1_F { };
     class Land_Cargo_House_V1_F : Default
     {
         lootType = "mil";
@@ -358,6 +361,7 @@ class CfgBuildingLootPos
     };
     class Land_Cargo_House_V2_F : Land_Cargo_House_V1_F {};
     class Land_Cargo_House_V3_F : Land_Cargo_House_V1_F {};
+	class Land_Cargo_House_V4_F : Land_Cargo_House_V1_F {};
     class Land_dp_smallFactory_F : Default
     {
         shelfPos[] = {{{-1.50586,4.79297,-1.87129},180.159}};
@@ -490,6 +494,7 @@ class CfgBuildingLootPos
         tablePos[] = {{{-0.646484,0.492188,-0.766783},90.0316}};
         palletPos[] = {{{3.13672,-1.19922,-0.69166},0},{{-3.17773,-3.54102,-0.69166},0}};
     };
+	class Land_BagBunker_01_large_green_F : Land_BagBunker_Large_F {};
     class Land_BagBunker_Tower_F : Default
     {
         lootType = "mil";
@@ -497,6 +502,7 @@ class CfgBuildingLootPos
         shoeboxPos[] = {{{2.37891,-1.93555,-0.873341},0}};
         palletPos[] = {{{-0.732422,2.07617,-2.17334},348},{{-0.771484,-2.21094,-2.17334},0}};
     };
+	class Land_HBarrier_01_tower_green_F : Land_BagBunker_Tower_F {};
     class Land_Offices_01_V1_F : Default
     {
         limit = 6;