diff --git a/SQF/dayz_code/Configs/CfgMagazines.hpp b/SQF/dayz_code/Configs/CfgMagazines.hpp
index 8718e6377..4b45618b6 100644
--- a/SQF/dayz_code/Configs/CfgMagazines.hpp
+++ b/SQF/dayz_code/Configs/CfgMagazines.hpp
@@ -1329,37 +1329,38 @@ class CfgMagazines {
 		picture = "\z\addons\dayz_epoch\pictures\equip_oildrum_e_CA.paa";
 		descriptionShort = "210 litres of fuel per barrel (Empty)";
 		class ItemActions {
-                        class Crafting
-                        {
-                                text = "$STR_EPOCH_PLAYER_276";
-                                script = ";['Crafting','CfgMagazines', _id] spawn player_craftItem;";
-                                neednearby[] = {"fire"};
-                                requiretools[] = {"ItemToolbox","ItemHatchet"};
-                                output[] = {{"ItemFireBarrel_kit",1}};
-                                input[] = {{"ItemFuelBarrelEmpty",1},{"ItemJerryCan",1},{"PartWoodPile",4}};
-                        };
+			class Crafting
+			{
+					text = "$STR_EPOCH_PLAYER_276";
+					script = ";['Crafting','CfgMagazines', _id] spawn player_craftItem;";
+					neednearby[] = {"fire"};
+					requiretools[] = {"ItemToolbox","ItemHatchet"};
+					output[] = {{"ItemFireBarrel_kit",1}};
+					input[] = {{"ItemFuelBarrelEmpty",1},{"ItemJerryCan",1},{"PartWoodPile",4}};
+			};
+		};
 	};
 	class ItemFireBarrel_kit: CA_Magazine
-        {
-                scope = 2;
-                count = 1;
-                type = 256;
-                displayName = "Fire Barrel Kit";
-                descriptionShort = "Fire Barrel";
-                model = "\z\addons\dayz_epoch\models\supply_crate.p3d";
-                picture = "\z\addons\dayz_epoch\pictures\equip_wooden_crate_ca.paa";
-                weight = 45;
-                class ItemActions
+    {
+            scope = 2;
+            count = 1;
+            type = 256;
+            displayName = "Fire Barrel Kit";
+            descriptionShort = "Fire Barrel";
+            model = "\z\addons\dayz_epoch\models\supply_crate.p3d";
+            picture = "\z\addons\dayz_epoch\pictures\equip_wooden_crate_ca.paa";
+            weight = 45;
+            class ItemActions
+            {
+                class Build
                 {
-                        class Build
-                        {
-                                text = "$STR_ACTIONS_BUILD";
-                                script = "spawn player_build;";
-                                require[] = {"ItemToolbox"};
-                                create = "FireBarrel_DZ";
-                        };
+                    text = "$STR_ACTIONS_BUILD";
+                    script = "spawn player_build;";
+                    require[] = {"ItemToolbox"};
+                    create = "FireBarrel_DZ";
                 };
-        };
+            };
+    };
 	class ItemJerrycan: CA_Magazine
 	{
 		scope = 2;
diff --git a/SQF/dayz_code/Configs/CfgVehicles/LAND/Volha.hpp b/SQF/dayz_code/Configs/CfgVehicles/LAND/Volha.hpp
index 139f21102..67a78883b 100644
--- a/SQF/dayz_code/Configs/CfgVehicles/LAND/Volha.hpp
+++ b/SQF/dayz_code/Configs/CfgVehicles/LAND/Volha.hpp
@@ -265,7 +265,7 @@ class Volha_1_TK_CIV_EP1: Volha_TK_CIV_Base_EP1
 	scope = 2;
 	accuracy = 1000;
 	displayname = "GAZ (blue)";
-	upgradeVehicle = {"Volha_1_TK_CIV_EP1_DZE1",{{"ItemORP",1},{"PartEngine",2}}};
+	upgradeVehicle[] = {"Volha_1_TK_CIV_EP1_DZE1",{{"ItemORP",1},{"PartEngine",2}}};
 };
 class Volha_2_TK_CIV_EP1: Volha_TK_CIV_Base_EP1
 {
@@ -274,7 +274,7 @@ class Volha_2_TK_CIV_EP1: Volha_TK_CIV_Base_EP1
 	displayname = "GAZ (grey)";
 	hiddenSelections[] = {"Camo1"};
 	hiddenSelectionsTextures[] = {"ca\wheeled_E\Volha\Data\Volha_Gray_ECIV_CO"};
-	upgradeVehicle = {"Volha_2_TK_CIV_EP1_DZE1",{{"ItemORP",1},{"PartEngine",2}}};
+	upgradeVehicle[] = {"Volha_2_TK_CIV_EP1_DZE1",{{"ItemORP",1},{"PartEngine",2}}};
 };
 class VolhaLimo_TK_CIV_EP1: Volha_TK_CIV_Base_EP1
 {
@@ -283,7 +283,7 @@ class VolhaLimo_TK_CIV_EP1: Volha_TK_CIV_Base_EP1
 	displayname = "GAZ Limo";
 	hiddenSelections[] = {"Camo1"};
 	hiddenSelectionsTextures[] = {"ca\wheeled_E\Volha\Data\Volha_Black_ECIV_CO"};
-	upgradeVehicle = {"VolhaLimo_TK_CIV_EP1_DZE1",{{"ItemORP",1},{"PartEngine",2}}};
+	upgradeVehicle[] = {"VolhaLimo_TK_CIV_EP1_DZE1",{{"ItemORP",1},{"PartEngine",2}}};
 };
 
 // Performance 1
@@ -291,25 +291,25 @@ class VolhaLimo_TK_CIV_EP1_DZE1: VolhaLimo_TK_CIV_EP1
 {
 	maxspeed = 150; // max engine limit 125-130
 	terrainCoef = 2.5;
-	upgradeVehicle = {"VolhaLimo_TK_CIV_EP1_DZE2",{{"ItemAVE",1},{"PartGeneric",1},{"ItemTankTrap",1}}};
+	upgradeVehicle[] = {"VolhaLimo_TK_CIV_EP1_DZE2",{{"ItemAVE",1},{"PartGeneric",1},{"ItemTankTrap",1}}};
 };
 class Volha_1_TK_CIV_EP1_DZE1: Volha_1_TK_CIV_EP1
 {
 	maxspeed = 150; // car 100
 	terrainCoef = 2.5;
-	upgradeVehicle = {"Volha_1_TK_CIV_EP1_DZE2",{{"ItemAVE",1},{"PartGeneric",1},{"ItemTankTrap",1}}};
+	upgradeVehicle[] = {"Volha_1_TK_CIV_EP1_DZE2",{{"ItemAVE",1},{"PartGeneric",1},{"ItemTankTrap",1}}};
 };
 class Volha_2_TK_CIV_EP1_DZE1: Volha_2_TK_CIV_EP1
 {
 	maxspeed = 150; // car 100
 	terrainCoef = 2.5;
-	upgradeVehicle = {"Volha_2_TK_CIV_EP1_DZE2",{{"ItemAVE",1},{"PartGeneric",1},{"ItemTankTrap",1}}};
+	upgradeVehicle[] = {"Volha_2_TK_CIV_EP1_DZE2",{{"ItemAVE",1},{"PartGeneric",1},{"ItemTankTrap",1}}};
 };
 // Armor 2
 class VolhaLimo_TK_CIV_EP1_DZE2: VolhaLimo_TK_CIV_EP1_DZE1
 {
 	armor = 50; // car 20
-	upgradeVehicle = {"VolhaLimo_TK_CIV_EP1_DZE3",{{"ItemLRK",1},{"ItemTent",1}}};
+	upgradeVehicle[] = {"VolhaLimo_TK_CIV_EP1_DZE3",{{"ItemLRK",1},{"ItemTent",1}}};
 	class HitPoints: HitPoints
 	{
 		class HitLFWheel: HitLFWheel
@@ -365,7 +365,7 @@ class VolhaLimo_TK_CIV_EP1_DZE2: VolhaLimo_TK_CIV_EP1_DZE1
 class Volha_1_TK_CIV_EP1_DZE2: Volha_1_TK_CIV_EP1_DZE1
 {
 	armor = 50; // car 20
-	upgradeVehicle = {"Volha_1_TK_CIV_EP1_DZE3",{{"ItemLRK",1},{"ItemTent",1}}};
+	upgradeVehicle[] = {"Volha_1_TK_CIV_EP1_DZE3",{{"ItemLRK",1},{"ItemTent",1}}};
 	class HitPoints: HitPoints
 	{
 		class HitLFWheel: HitLFWheel
@@ -421,7 +421,7 @@ class Volha_1_TK_CIV_EP1_DZE2: Volha_1_TK_CIV_EP1_DZE1
 class Volha_2_TK_CIV_EP1_DZE2: Volha_2_TK_CIV_EP1_DZE1
 {
 	armor = 50; // car 20
-	upgradeVehicle = {"Volha_2_TK_CIV_EP1_DZE3",{{"ItemLRK",1},{"ItemTent",1}}};
+	upgradeVehicle[] = {"Volha_2_TK_CIV_EP1_DZE3",{{"ItemLRK",1},{"ItemTent",1}}};
 	class HitPoints: HitPoints
 	{
 		class HitLFWheel: HitLFWheel
@@ -480,21 +480,21 @@ class VolhaLimo_TK_CIV_EP1_DZE3: VolhaLimo_TK_CIV_EP1_DZE2
 	transportMaxWeapons = 20;  // car 10
 	transportMaxMagazines = 100; // car 50 
     transportmaxbackpacks = 4; // car 2
-	upgradeVehicle = {"VolhaLimo_TK_CIV_EP1_DZE4",{{"ItemTNK",1},{"PartFueltank",2}}};
+	upgradeVehicle[] = {"VolhaLimo_TK_CIV_EP1_DZE4",{{"ItemTNK",1},{"PartFueltank",2}}};
 };
 class Volha_1_TK_CIV_EP1_DZE3: Volha_1_TK_CIV_EP1_DZE2
 {
 	transportMaxWeapons = 20;  // car 10
 	transportMaxMagazines = 100; // car 50 
     transportmaxbackpacks = 4; // car 2
-	upgradeVehicle = {"Volha_1_TK_CIV_EP1_DZE4",{{"ItemTNK",1},{"PartFueltank",2}}};
+	upgradeVehicle[] = {"Volha_1_TK_CIV_EP1_DZE4",{{"ItemTNK",1},{"PartFueltank",2}}};
 };
 class Volha_2_TK_CIV_EP1_DZE3: Volha_2_TK_CIV_EP1_DZE2
 {
 	transportMaxWeapons = 20;  // car 10
 	transportMaxMagazines = 100; // car 50 
     transportmaxbackpacks = 4; // car 2
-	upgradeVehicle = {"Volha_2_TK_CIV_EP1_DZE4",{{"ItemTNK",1},{"PartFueltank",2}}};
+	upgradeVehicle[] = {"Volha_2_TK_CIV_EP1_DZE4",{{"ItemTNK",1},{"PartFueltank",2}}};
 };
 // Fuel 4
 class VolhaLimo_TK_CIV_EP1_DZE4: VolhaLimo_TK_CIV_EP1_DZE3
diff --git a/SQF/dayz_code/Configs/cfgVehicles.hpp b/SQF/dayz_code/Configs/cfgVehicles.hpp
index 5cf2e3f8e..e0b5df300 100644
--- a/SQF/dayz_code/Configs/cfgVehicles.hpp
+++ b/SQF/dayz_code/Configs/cfgVehicles.hpp
@@ -1927,21 +1927,22 @@ class CfgVehicles {
 		};
 	};
 	class Land_Fire_barrel;
-	class FireBarrel_DZ: Land_Fire_barrel
-        {
-                scope = 2;
-                destrType = "DestructNo";
-                cost = 100;
-                model = "\z\addons\dayz_epoch\models\oil_drum_model.p3d";
-                icon = "\ca\data\data\Unknown_object.paa";
-                offset[] = {0,1.5,0.5};
-                mapSize = 2;
-                armor = 400;
-                displayName = "Fire Barrel";
-                vehicleClass = "Fortifications";
-                constructioncount = 3;
-                removeoutput[] = {{"ItemFuelBarrelEmpty",1}};
-        };
+	class FireBarrel_DZ:Land_Fire_barrel
+	{
+		scope = 2;
+		// destrType = "DestructNo";
+		cost = 100;
+		offset[] = {0,2,0};
+		model = "\z\addons\dayz_epoch\models\oil_drum_model.p3d"; 
+		icon = "\ca\data\data\Unknown_object.paa";
+		mapSize = 2;
+		armor = 400;
+		displayName = "Fire Barrel";
+		vehicleClass = "Fortifications";
+		constructioncount = 2;
+		removeoutput[] = {{"ItemFireBarrel_kit",1}};
+		requireplot = 0;
+	};
 	class Gunrack1;
 	class GunRack_DZ: Gunrack1
         {
@@ -2340,23 +2341,6 @@ class CfgVehicles {
 			};
 		};
 	};
-	class Land_Fire_barrel;
-	class FireBarrel_DZ:Land_Fire_barrel
-		{
-		scope = 2;
-		destrType = "DestructNo";
-		cost = 100;
-		offset[] = {0,2,0};
-		model = "\z\addons\dayz_epoch\models\oil_drum_model.p3d"; 
-		icon = "\ca\data\data\Unknown_object.paa";
-		mapSize = 2;
-		armor = 400;
-		displayName = "Fire Barrel";
-		vehicleClass = "Fortifications";
-		constructioncount = 2;
-		removeoutput[] = {{"ItemFireBarrel_kit",1}};
-		requireplot = 0;
-	};
 	class WoodSmallWallWin_DZ: ModularItems
 	{
 		scope = 2;