diff --git a/functions.lua b/functions.lua
index 5adba74..568ad6e 100644
--- a/functions.lua
+++ b/functions.lua
@@ -31,11 +31,9 @@ function throwing_shoot_arrow (itemstack, player, stiffness, is_cross)
 	else
 		minetest.sound_play("throwing_bow_sound", {pos=playerpos})
 	end
-	if obj:get_luaentity().player == "" then
-		obj:get_luaentity().player = player
-	end
-	obj:get_luaentity().stack = player:get_inventory():get_stack("main", player:get_wield_index()-1)
+	obj:get_luaentity().player = player
 	obj:get_luaentity().inventory = player:get_inventory()
+	obj:get_luaentity().stack = player:get_inventory():get_stack("main", player:get_wield_index()-1)
 	return true
 end
 
@@ -67,7 +65,7 @@ function throwing_reload (itemstack, player, pos, is_cross, loaded)
 					if not minetest.setting_getbool("creative_mode") then
 						player:get_inventory():remove_item("main", arrow[1])
 					end
-					meta = arrow[2]
+					local meta = arrow[2]
 					player:set_wielded_item({name=loaded, wear=wear, metadata=meta})
 				end
 			end
diff --git a/textures/throwing_arrow_torch.png b/textures/throwing_arrow_torch.png
index cd3bf0b..0126df1 100644
Binary files a/textures/throwing_arrow_torch.png and b/textures/throwing_arrow_torch.png differ
diff --git a/textures/throwing_arrow_torch_2.png b/textures/throwing_arrow_torch_2.png
index 2c58723..6bf9e11 100644
Binary files a/textures/throwing_arrow_torch_2.png and b/textures/throwing_arrow_torch_2.png differ
diff --git a/textures/throwing_arrow_torch_back.png b/textures/throwing_arrow_torch_back.png
index a7cc2ff..12754c7 100644
Binary files a/textures/throwing_arrow_torch_back.png and b/textures/throwing_arrow_torch_back.png differ