diff --git a/depends.txt b/depends.txt
index 902649e..2cb78b8 100644
--- a/depends.txt
+++ b/depends.txt
@@ -2,8 +2,9 @@ default
 bucket
 doors
 xpanes
+farming
 stairs?
 fire?
 oresplus?
 moreblocks?
-mesecons_doors?
+mesecons?
diff --git a/mod.conf b/mod.conf
index 7526291..5b22782 100644
--- a/mod.conf
+++ b/mod.conf
@@ -1,4 +1,4 @@
 name = xdecor
-depends = default, bucket, doors, xpanes
-optional_depends = fire, oresplus, moreblocks, mesecons_plus, stairs
+depends = default, bucket, doors, xpanes, farming
+optional_depends = fire, oresplus, moreblocks, mesecons, stairs
 description = A decoration mod meant to be simple and well-featured.
diff --git a/src/enchanting.lua b/src/enchanting.lua
index aa0b301..61b6d00 100644
--- a/src/enchanting.lua
+++ b/src/enchanting.lua
@@ -133,7 +133,7 @@ end
 
 function enchanting.put(_, listname, _, stack)
 	local stackname = stack:get_name()
-	if listname == "mese" and stackname == "default:mese_crystal" then
+	if listname == "mese" and (stackname == "default:mese_crystal" or stackname == "imese:industrial_mese_crystal" or stackname == "lapis:lapis") then
 		return stack:get_count()
 	elseif listname == "tool" and allowed(stackname:match("[^:]+$")) then
 		return 1
diff --git a/src/itemframe.lua b/src/itemframe.lua
index 6105d57..7735712 100644
--- a/src/itemframe.lua
+++ b/src/itemframe.lua
@@ -86,6 +86,12 @@ function itemframe.rightclick(pos, node, clicker, itemstack)
 	meta:set_string("item", itemstring)
 	update_item(pos, node)
 
+	if itemstring == "" then
+	   meta:set_string("infotext", "Item Frame (owned by " .. owner .. ")")
+	else
+	   meta:set_string("infotext", itemstring.." (owned by " .. owner .. ")")
+	end
+	
 	return itemstack
 end
 
diff --git a/src/mechanisms.lua b/src/mechanisms.lua
index b75683d..4a26140 100644
--- a/src/mechanisms.lua
+++ b/src/mechanisms.lua
@@ -43,6 +43,8 @@ local function door_toggle(pos_actuator, pos_door, player)
 	local actuator = minetest.get_node(pos_actuator)
 	local door = doors.get(pos_door)
 
+	if not door then return end
+
 	if actuator.name:sub(-4) == "_off" then
 		minetest.set_node(pos_actuator,
 			{name = actuator.name:gsub("_off", "_on"), param2 = actuator.param2})
@@ -215,4 +217,4 @@ minetest.register_craft({
 		{"group:stick"},
 		{"group:stone"}
 	}
-})
\ No newline at end of file
+})
diff --git a/src/nodes.lua b/src/nodes.lua
index c2bf4bd..8348ebb 100644
--- a/src/nodes.lua
+++ b/src/nodes.lua
@@ -6,7 +6,7 @@ local function register_pane(name, desc, def)
 		tiles = {"xdecor_" .. name .. ".png"},
 		drawtype = "airlike",
 		paramtype = "light",
-		textures = {"xdecor_" .. name .. ".png", "xdecor_" .. name .. ".png", "xpanes_space.png"},
+		textures = {"xdecor_" .. name .. ".png", "" ,"xdecor_" .. name .. ".png"},
 		inventory_image = "xdecor_" .. name .. ".png",
 		wield_image = "xdecor_" .. name .. ".png",
 		groups = def.groups,
diff --git a/src/recipes.lua b/src/recipes.lua
index 159e245..ac419b1 100644
--- a/src/recipes.lua
+++ b/src/recipes.lua
@@ -66,9 +66,9 @@ minetest.register_craft({
 minetest.register_craft({
 	output = "xdecor:cobweb",
 	recipe = {
-		{"farming:cotton", "", "farming:cotton"},
-		{"", "farming:cotton", ""},
-		{"farming:cotton", "", "farming:cotton"}
+	   {"farming:string", "", "farming:string"},
+	   {"", "farming:string", ""},
+	   {"farming:string", "", "farming:string"}
 	}
 })