diff --git a/files/default/crafting.lua b/files/default/crafting.lua
index 1743522..26f669e 100644
--- a/files/default/crafting.lua
+++ b/files/default/crafting.lua
@@ -347,8 +347,8 @@ minetest.register_craft({
 minetest.register_craft({
 	output = "default:sandstone",
 	recipe = {
-		{"group:sand", "group:sand"},
-		{"group:sand", "group:sand"}
+		{"default:sand", "default:sand"},
+		{"default:sand", "default:sand"}
 	}
 })
 
diff --git a/files/default/nodes.lua b/files/default/nodes.lua
index b643ea7..f8b8329 100644
--- a/files/default/nodes.lua
+++ b/files/default/nodes.lua
@@ -183,7 +183,7 @@ minetest.register_node("default:gravel", {
 minetest.register_node("default:redsand", {
 	description = "Red Sand",
 	tiles = {"default_red_sand.png"},
-	groups = {crumbly = 3, falling_node = 1, redsand = 1},
+	groups = {crumbly = 3, falling_node = 1, sand = 1},
 	sounds = default.node_sound_sand_defaults()
 })
 
diff --git a/files/default/torch.lua b/files/default/torch.lua
index ad9450e..797e898 100644
--- a/files/default/torch.lua
+++ b/files/default/torch.lua
@@ -19,8 +19,8 @@ function default.register_torch(name, def)
 		on_blast = def.on_blast,
 
 		on_flood = function(pos, oldnode, newnode)
-			local torch = (oldnode.name:gsub("_wall", "") or oldnode.name:gsub("_celling", "")) or oldnode.name
-			minetest.add_item(pos, ItemStack(torch))
+			oldnode.name = name or name .. "_wall" or name .. "_celling"
+			minetest.add_item(pos, ItemStack(oldnode))
 			-- Play flame-extinguish sound if liquid is not an 'igniter'
 			local nodedef = minetest.registered_items[newnode.name]
 			if not (nodedef and nodedef.groups and
@@ -57,14 +57,14 @@ function default.register_torch(name, def)
 	torch_floor.wield_image = def.wield_image
 	torch_floor.selection_box = {
 		type = "wallmounted",
-		wall_bottom = {-1/8, -1/2, -1/8, 1/8, 2/16, 1/8},
+		wall_bottom = {-1/8, -1/2, -1/8, 1/8, 2/16, 1/8}
 	}
 
 	local torch_wall = table.copy(torch)
 	torch_wall.mesh = "torch_wall.obj"
 	torch_wall.selection_box = {
 		type = "wallmounted",
-		wall_side = {-1/2, -1/2, -1/8, -1/8, 1/8, 1/8},
+		wall_side = {-1/2, -1/2, -1/8, -1/8, 1/8, 1/8}
 	}
 	torch_wall.groups.not_in_creative_inventory = 1
 
@@ -72,7 +72,7 @@ function default.register_torch(name, def)
 	torch_ceiling.mesh = "torch_ceiling.obj"
 	torch_ceiling.selection_box = {
 		type = "wallmounted",
-		wall_top = {-1/8, -1/16, -5/16, 1/8, 1/2, 1/8},
+		wall_top = {-1/8, -1/16, -5/16, 1/8, 1/2, 1/8}
 	}
 	torch_ceiling.groups.not_in_creative_inventory = 1
 
@@ -86,7 +86,7 @@ default.register_torch("default:torch", {
 	tiles = {{
 		name = "default_torch.png",
 	--	name = "default_torch_animated.png",
-	--	animation = {type = "vertical_frames", aspect_w = 32, aspect_h = 32, length = 3.3}
+	--	animation = {type = "vertical_frames", aspect_w = 32, aspect_h = 32, length = 3}
 	}},
 	inventory_image = "default_torch.png",
 	wield_image = "default_torch.png",
diff --git a/files/deprecated/textures/mobs_bear.x b/files/deprecated/models/mobs_bear.x
similarity index 100%
rename from files/deprecated/textures/mobs_bear.x
rename to files/deprecated/models/mobs_bear.x
diff --git a/files/deprecated/textures/mobs_chicken.x b/files/deprecated/models/mobs_chicken.x
similarity index 100%
rename from files/deprecated/textures/mobs_chicken.x
rename to files/deprecated/models/mobs_chicken.x
diff --git a/files/deprecated/textures/mobs_cow.x b/files/deprecated/models/mobs_cow.x
similarity index 100%
rename from files/deprecated/textures/mobs_cow.x
rename to files/deprecated/models/mobs_cow.x
diff --git a/files/deprecated/textures/mobs_pig.x b/files/deprecated/models/mobs_pig.x
similarity index 100%
rename from files/deprecated/textures/mobs_pig.x
rename to files/deprecated/models/mobs_pig.x
diff --git a/files/deprecated/textures/mobs_spider.x b/files/deprecated/models/mobs_spider.x
similarity index 100%
rename from files/deprecated/textures/mobs_spider.x
rename to files/deprecated/models/mobs_spider.x
diff --git a/files/deprecated/textures/mobs_zombie.x b/files/deprecated/models/mobs_zombie.x
similarity index 100%
rename from files/deprecated/textures/mobs_zombie.x
rename to files/deprecated/models/mobs_zombie.x
diff --git a/files/mobs/mobs_redo/crafts.lua b/files/mobs/mobs_redo/crafts.lua
index 5ad8784..d426a76 100644
--- a/files/mobs/mobs_redo/crafts.lua
+++ b/files/mobs/mobs_redo/crafts.lua
@@ -122,7 +122,7 @@ local function mobs_shoot_egg(itemstack, thrower, pointed_thing)
 			max_hear_distance = 10,
 		})
 		if not mobs.is_creative(thrower) or
-		not minetest.is_singleplayer() then
+				not minetest.is_singleplayer() then
 			itemstack:take_item()
 		end
 	end
@@ -267,11 +267,13 @@ minetest.register_craft({
 })
 
 -- protection item
-minetest.register_craftitem("mobs:protector", {
-	description = "Mob Protection Rune",
-	inventory_image = "mobs_protector.png",
-	groups = {flammable = 2},
-})
+if not minetest.is_singleplayer() then
+	minetest.register_craftitem("mobs:protector", {
+		description = "Mob Protection Rune",
+		inventory_image = "mobs_protector.png",
+		groups = {flammable = 2},
+	})
+end
 
 minetest.register_craft({
 	output = "mobs:protector",