diff --git a/dayz_code/actions/fill_startGenerator.sqf b/dayz_code/actions/fill_startGenerator.sqf
index e6740dcb2..4e99fa278 100644
--- a/dayz_code/actions/fill_startGenerator.sqf
+++ b/dayz_code/actions/fill_startGenerator.sqf
@@ -67,7 +67,6 @@ if (_finished) then {
 
 			_vehicle setVariable ["GeneratorSound", _soundSource,true];
 
-			// TODO: Add running sounds to generator
 			cutText ["Generator has been started.", "PLAIN DOWN"];
 		};
 	} else {
diff --git a/dayz_code/actions/player_copyKey.sqf b/dayz_code/actions/player_copyKey.sqf
index bfc105977..bcc786b99 100644
--- a/dayz_code/actions/player_copyKey.sqf
+++ b/dayz_code/actions/player_copyKey.sqf
@@ -22,7 +22,7 @@ if(_isNear == 0) exitWith {TradeInprogress = false; cutText ["Key crafting needs
 call gear_ui_init;
 
 // require one tin bar per key
-_hasTinBar = 	"ItemTinBar" in _magazinesPlayer;
+_hasTinBar = 	"ItemTinBar" in magazines player;
 if(!_hasTinBar) exitWith {TradeInprogress = false; cutText ["Key crafting requires a 1oz Tin Bar." , "PLAIN DOWN"]};
 
 player playActionNow "Medic";
@@ -53,16 +53,24 @@ while {r_doLoop} do {
 };
 r_doLoop = false;
 
-_num_removed = ([player,"ItemTinBar"] call BIS_fnc_invRemove);
+if(_finished) then {
 
-if(_finished and _num_removed == 1) then {
-	// output key to backpack if space
-	_create = _item;
-	_qty = 1;
-	_box = unitBackpack player;
-	_box addWeaponCargoGlobal [_create,_qty];
-	cutText ["Copied key has been added to your backpack." , "PLAIN DOWN"];
+	_num_removed = ([player,"ItemTinBar"] call BIS_fnc_invRemove);
+
+	if(_num_removed == 1) then {
+		// output key to backpack if space
+		_create = _item;
+		_qty = 1;
+		_box = unitBackpack player;
+		_box addWeaponCargoGlobal [_create,_qty];
+		cutText ["Copied key has been added to your backpack." , "PLAIN DOWN"];
+	} else {
+		cutText ["Canceled Key Crafting." , "PLAIN DOWN"];
+	};
 } else {
+	r_interrupt = false;
+	[objNull, player, rSwitchMove,""] call RE;
+	player playActionNow "stop";
 	cutText ["Canceled Key Crafting." , "PLAIN DOWN"];
 };
 TradeInprogress = false;
diff --git a/dayz_code/actions/player_eat.sqf b/dayz_code/actions/player_eat.sqf
index 660103379..c5a8ed69f 100644
--- a/dayz_code/actions/player_eat.sqf
+++ b/dayz_code/actions/player_eat.sqf
@@ -13,6 +13,7 @@ _itemorignal = _this;
 _hasfooditem = _itemorignal in magazines player;
 
 _rawfood = _itemorignal in meatraw;
+_rawexceptions = _itemorignal in exceptionsraw;
 _cookedfood = _itemorignal in meatcooked;
 _hasoutput = _itemorignal in food_with_output;
 
@@ -53,12 +54,12 @@ if (_hasoutput) then{
     _item addMagazineCargoGlobal [_itemtodrop,1];
 };
 
-if ( _rawfood and (random 15 < 1)) then {
+if (_rawfood and !_rawexceptions and (random 15 < 1)) then {
 	r_player_infected = true;
 	player setVariable["USEC_infected",true,true];
 };
 
-if ( _badfood and (random 2 < 1)) then {
+if (_badfood and (random 2 < 1)) then {
 	r_player_infected = true;
 	player setVariable["USEC_infected",true,true];
 };
diff --git a/dayz_code/actions/stopGenerator.sqf b/dayz_code/actions/stopGenerator.sqf
index 6a2661360..4618238fc 100644
--- a/dayz_code/actions/stopGenerator.sqf
+++ b/dayz_code/actions/stopGenerator.sqf
@@ -56,7 +56,6 @@ if (_finished) then {
 		// Stop generator
 		_vehicle setVariable ["GeneratorRunning", false,true];
 
-		// TODO: Add running sounds to generator
 		cutText ["Generator has been stopped.", "PLAIN DOWN"];
 	
 };
diff --git a/dayz_code/init/variables.sqf b/dayz_code/init/variables.sqf
index 4ca28b6b1..cf5c6138a 100644
--- a/dayz_code/init/variables.sqf
+++ b/dayz_code/init/variables.sqf
@@ -30,6 +30,7 @@ meatraw = [
 	"ItemSeaBass",
 	"ItemTuna"
 ];
+exceptionsraw = ["ItemTuna"];
 meatcooked = [
     "FoodSteakCooked",
     "FoodmeatCooked",
diff --git a/dayz_equip/config.cpp b/dayz_equip/config.cpp
index fcca37492..e5cf9af86 100644
--- a/dayz_equip/config.cpp
+++ b/dayz_equip/config.cpp
@@ -1644,9 +1644,8 @@ class CfgMagazines
 		count = 1;
 		type = 256;
 		displayName = "Wooden Shack";
-		// TODO make custom model and icon
-		model = "\dayz_equip\models\woodPile.p3d";
-		picture = "\dayz_equip\textures\equip_woodPile_ca.paa";
+		model = "\dayz_equip\models\supply_crate.p3d";
+		picture = "\dayz_equip\textures\equip_wooden_crate_ca.paa";
 		descriptionShort = "Wooden Shack: A crafted object that holds some items/weapons/backpacks.";
 		class ItemActions {
 			class Build {
@@ -2117,8 +2116,7 @@ class CfgMagazines
 		fuelQuantity = 0;
 		type = 256;
 		displayName = "Fuel Barrel (Empty)";
-		// TODO add X to icon to represent empty barrel
-		picture = "\dayz_equip\textures\equip_oil_drum_model_ca.paa";
+		picture = "\dayz_equip\textures\equip_oildrum_e_CA.paa";
 		descriptionShort = "210 litres of fuel per barrel (Empty)";
 	};
 	class ItemJerrycan: CA_Magazine
diff --git a/dayz_equip/textures/equip_oildrum_e_CA.paa b/dayz_equip/textures/equip_oildrum_e_CA.paa
new file mode 100644
index 000000000..5960388e4
Binary files /dev/null and b/dayz_equip/textures/equip_oildrum_e_CA.paa differ
diff --git a/dayz_equip/textures/equip_silver_bar_CA.paa b/dayz_equip/textures/equip_silver_bar_CA.paa
index ef73ebcb7..027742f94 100644
Binary files a/dayz_equip/textures/equip_silver_bar_CA.paa and b/dayz_equip/textures/equip_silver_bar_CA.paa differ