diff --git a/crystal.lua b/crystal.lua
index 300f07d9b1158fd8b99c4c0f2412d391e69c1fd2..de704f6f46fdb902bd22dd3017d600d8649b30cc 100644
--- a/crystal.lua
+++ b/crystal.lua
@@ -148,7 +148,7 @@ minetest.register_tool("ethereal:shovel_crystal", {
 
 				local inv = user:get_inventory()
 
-				minetest.env:remove_node(pointed_thing.under)
+				minetest.remove_node(pointed_thing.under)
 				nodeupdate(pos)
 				
 				inv:add_item("main", {name = nn})
diff --git a/extra.lua b/extra.lua
index f49964379c598f5a5f395f1d23daec63c1b6b4f9..57281fe312c6ebceb72f433ab171b456e86ed6b7 100644
--- a/extra.lua
+++ b/extra.lua
@@ -285,9 +285,9 @@ minetest.register_tool("ethereal:light_staff", {
 		local node = minetest.get_node(pos).name
 
 		if node == "default:stone" then
-			minetest.env:add_node(pos, {name="ethereal:glostone"})
+			minetest.add_node(pos, {name="ethereal:glostone"})
 		elseif node == "ethereal:glostone" then
-			minetest.env:add_node(pos, {name="default:stone"})
+			minetest.add_node(pos, {name="default:stone"})
 		end
 
 		if not minetest.setting_getbool("creative_mode") then
diff --git a/fishing.lua b/fishing.lua
index b47095d5882d238932e959d5c16e220434308c36..4c831a00e34c3f50feac11f48b71fbda49142795 100644
--- a/fishing.lua
+++ b/fishing.lua
@@ -49,7 +49,7 @@ minetest.register_craftitem("ethereal:fishing_rod_baited", {
 	liquids_pointable = true,
 	on_use = function (itemstack, user, pointed_thing)
 		if pointed_thing and pointed_thing.under then
-			local node = minetest.env:get_node(pointed_thing.under)
+			local node = minetest.get_node(pointed_thing.under)
 			if string.find(node.name, "default:water_source") then
 				if math.random(1, 100) < 5 then
 					local inv = user:get_inventory()
diff --git a/init.lua b/init.lua
index a5236bb62a86814765ae0d7510d238b5cdc780e5..9e5529664b6f9451d3e4c138b79de4daadcccf90 100644
--- a/init.lua
+++ b/init.lua
@@ -1,6 +1,6 @@
 --[[
 
-	Minetest Ethereal Mod 1.14 (4th Feb 2015)
+	Minetest Ethereal Mod 1.14 (1st March 2015)
 
 	Created by ChinChow
 
@@ -54,8 +54,8 @@ dofile(minetest.get_modpath("ethereal").."/sealife.lua")
 dofile(minetest.get_modpath("ethereal").."/fences.lua")
 dofile(minetest.get_modpath("ethereal").."/gates.lua")
 dofile(minetest.get_modpath("ethereal").."/stairs.lua")
-dofile(minetest.get_modpath("ethereal").."/mapgen_v7s.lua")
---dofile(minetest.get_modpath("ethereal").."/mapgen_v7n.lua") -- 0.4.11 dev only
+--dofile(minetest.get_modpath("ethereal").."/mapgen_v7s.lua") -- 0.4.11 and below
+dofile(minetest.get_modpath("ethereal").."/mapgen_v7n.lua") -- 0.4.11 dev and above
 
 -- Xanadu server Only
 --dofile(minetest.get_modpath("ethereal").."/plantpack.lua")
diff --git a/sapling.lua b/sapling.lua
index addc5afcd1abe8ab3524ea39886854ab26e257e6..667a150372b3049b24d9691ff35be029ad21b8ff 100644
--- a/sapling.lua
+++ b/sapling.lua
@@ -40,7 +40,7 @@ ethereal.register_sapling( "ethereal:acacia_sapling", "Acacia Sapling", "moretre
 
 ethereal.place_tree = function (pos, ofx, ofz, schem)
 	-- Remove Sapling and Place Tree Schematic
-	minetest.env:set_node(pos, {name="air"})
+	minetest.set_node(pos, {name="air"})
 	pos.x = pos.x - ofx
 	pos.z = pos.z - ofz
 	minetest.place_schematic(pos, minetest.get_modpath("ethereal").."/schematics/"..schem..".mts", "0", {}, false );
diff --git a/water.lua b/water.lua
index e066eec8bf234781482011436e4b39d03bffb97c..a99b9afe11bc17623ba7057f8ad77d26bd78fca5 100644
--- a/water.lua
+++ b/water.lua
@@ -66,9 +66,9 @@ minetest.register_abm({
 		local pos0 = {x=pos.x-1,y=pos.y-1,z=pos.z-1}
 		local pos1 = {x=pos.x+1,y=pos.y+1,z=pos.z+1}
 
-		local water = minetest.env:find_nodes_in_area(pos0, pos1, "default:water_source")
+		local water = minetest.find_nodes_in_area(pos0, pos1, "default:water_source")
 		if water then
-			minetest.env:set_node(water[1], {name="default:ice"})
+			minetest.set_node(water[1], {name="default:ice"})
 		end
 	end,
 })
@@ -118,12 +118,30 @@ minetest.register_abm({
 		local pos0 = {x=pos.x-1,y=pos.y-1,z=pos.z-1}
 		local pos1 = {x=pos.x+1,y=pos.y+1,z=pos.z+1}
 
-		local water = minetest.env:find_nodes_in_area(pos0, pos1, "group:water")
+		local water = minetest.find_nodes_in_area(pos0, pos1, "group:water")
 		if water then
 			for n = 1, #water do
-				minetest.env:set_node(water[n], {name="air"})
+				minetest.set_node(water[n], {name="air"})
 			end
 		end
 	end,
 })
 ]]
+--[[
+-- If torch next to water then drop torch
+minetest.register_abm({
+	nodenames = {"default:torch"},
+	neighbors = {"default:water_source", "default:water_flowing"},
+	interval = 1,
+	chance = 1,
+
+	action = function(pos, node)
+		local pos0 = {x=pos.x-1,y=pos.y,z=pos.z-1}
+		local pos1 = {x=pos.x+1,y=pos.y+1,z=pos.z+1}
+		if #minetest.find_nodes_in_area(pos0, pos1, {"default:water_source", "default:water_flowing"}) > 0 then
+			minetest.set_node(pos, {name="default:water_flowing"})
+			minetest.add_item(pos, {name = "default:torch"})
+		end
+	end,
+})
+]]