diff --git a/rtmmp/mods/default/init.lua b/rtmmp/mods/default/init.lua
index 81c59b7..924f86e 100644
--- a/rtmmp/mods/default/init.lua
+++ b/rtmmp/mods/default/init.lua
@@ -75,8 +75,7 @@ minetest.register_tool("default:pick_mese", {
 		groupcaps={
 			cracky={times={[1]=2.0, [2]=1.0, [3]=0.5}, uses=20, maxlevel=3},
 			crumbly={times={[1]=2.0, [2]=1.0, [3]=0.5}, uses=20, maxlevel=3},
-			snappy={times={[1]=2.0, [2]=1.0, [3]=0.5}, uses=20, maxlevel=3},
-			fastness={times={[1]=25.0, [2]=19.0, [3]=13.5}, uses=10, maxlevel=3}
+			snappy={times={[1]=2.0, [2]=1.0, [3]=0.5}, uses=20, maxlevel=3}
 		}
 	},
 })
@@ -464,6 +463,12 @@ minetest.register_craft({
 	recipe = "default:sand",
 })
 
+minetest.register_craft({
+	type = "cooking",
+	output = "default:glass",
+	recipe = "default:desert_sand",
+})
+
 minetest.register_craft({
 	type = "cooking",
 	output = "default:stone",
@@ -697,7 +702,16 @@ minetest.register_node("default:stone", {
 	drop = 'default:cobble',
 	legacy_mineral = true,
 	sounds = default.node_sound_stone_defaults(),
-	stack_max = 128,
+})
+
+minetest.register_node("default:desert_stone", {
+	description = "Desert stone",
+	tile_images = {"default_desert_stone.png"},
+	is_ground_content = true,
+	groups = {cracky=3},
+	drop = 'default:desert_stone',
+	legacy_mineral = true,
+	sounds = default.node_sound_stone_defaults(),
 })
 
 minetest.register_node("default:stone_with_coal", {
@@ -707,7 +721,6 @@ minetest.register_node("default:stone_with_coal", {
 	groups = {cracky=3},
 	drop = 'default:coal_lump',
 	sounds = default.node_sound_stone_defaults(),
-	stack_max = 128,
 })
 
 minetest.register_node("default:stone_with_iron", {
@@ -717,7 +730,6 @@ minetest.register_node("default:stone_with_iron", {
 	groups = {cracky=3},
 	drop = 'default:iron_lump',
 	sounds = default.node_sound_stone_defaults(),
-	stack_max = 128,
 })
 
 minetest.register_node("default:dirt_with_grass", {
@@ -729,7 +741,6 @@ minetest.register_node("default:dirt_with_grass", {
 	sounds = default.node_sound_dirt_defaults({
 		footstep = {name="default_grass_footstep", gain=0.4},
 	}),
-	stack_max = 128,
 })
 
 minetest.register_node("default:dirt_with_grass_footsteps", {
@@ -741,7 +752,6 @@ minetest.register_node("default:dirt_with_grass_footsteps", {
 	sounds = default.node_sound_dirt_defaults({
 		footstep = {name="default_grass_footstep", gain=0.4},
 	}),
-	stack_max = 128,
 })
 
 minetest.register_node("default:dirt", {
@@ -750,27 +760,32 @@ minetest.register_node("default:dirt", {
 	is_ground_content = true,
 	groups = {crumbly=3},
 	sounds = default.node_sound_dirt_defaults(),
-	stack_max = 128,
 })
 
 minetest.register_node("default:sand", {
 	description = "Sand",
 	tile_images = {"default_sand.png"},
 	is_ground_content = true,
-	groups = {crumbly=3},
+	groups = {crumbly=3, falling_node=1},
+	sounds = default.node_sound_sand_defaults(),
+})
+
+minetest.register_node("default:desert_sand", {
+	description = "Desert sand",
+	tile_images = {"default_desert_sand.png"},
+	is_ground_content = true,
+	groups = {sand=1, crumbly=3, falling_node=1},
 	sounds = default.node_sound_sand_defaults(),
-	stack_max = 128,
 })
 
 minetest.register_node("default:gravel", {
 	description = "Gravel",
 	tile_images = {"default_gravel.png"},
 	is_ground_content = true,
-	groups = {crumbly=2},
+	groups = {crumbly=2, falling_node=1},
 	sounds = default.node_sound_dirt_defaults({
 		footstep = {name="default_gravel_footstep", gain=0.45},
 	}),
-	stack_max = 128,
 })
 
 minetest.register_node("default:sandstone", {
@@ -780,7 +795,6 @@ minetest.register_node("default:sandstone", {
 	groups = {crumbly=2,cracky=2},
 	drop = 'default:sand',
 	sounds = default.node_sound_stone_defaults(),
-	stack_max = 128,
 })
 
 minetest.register_node("default:clay", {
@@ -792,7 +806,6 @@ minetest.register_node("default:clay", {
 	sounds = default.node_sound_dirt_defaults({
 		footstep = "",
 	}),
-	stack_max = 128,
 })
 
 minetest.register_node("default:brick", {
@@ -802,25 +815,22 @@ minetest.register_node("default:brick", {
 	groups = {cracky=3},
 	drop = 'default:clay_brick 4',
 	sounds = default.node_sound_stone_defaults(),
-	stack_max = 128,
 })
 
 minetest.register_node("default:tree", {
 	description = "Tree",
 	tile_images = {"default_tree_top.png", "default_tree_top.png", "default_tree.png"},
 	is_ground_content = true,
-	groups = {tree=1,snappy=2,choppy=2,oddly_breakable_by_hand=1},
+	groups = {tree=1,snappy=2,choppy=2,oddly_breakable_by_hand=1,flammable=2},
 	sounds = default.node_sound_wood_defaults(),
-	stack_max = 128,
 })
 
 minetest.register_node("default:jungletree", {
 	description = "Jungle Tree",
 	tile_images = {"default_jungletree_top.png", "default_jungletree_top.png", "default_jungletree.png"},
 	is_ground_content = true,
-	groups = {tree=1,snappy=2,choppy=2,oddly_breakable_by_hand=1},
+	groups = {tree=1,snappy=2,choppy=2,oddly_breakable_by_hand=1,flammable=2},
 	sounds = default.node_sound_wood_defaults(),
-	stack_max = 128,
 })
 
 minetest.register_node("default:junglegrass", {
@@ -832,9 +842,8 @@ minetest.register_node("default:junglegrass", {
 	wield_image = "default_junglegrass.png",
 	paramtype = "light",
 	walkable = false,
-	groups = {snappy=3},
+	groups = {snappy=3,flammable=2},
 	sounds = default.node_sound_leaves_defaults(),
-	stack_max = 128,
 })
 
 minetest.register_node("default:leaves", {
@@ -843,7 +852,7 @@ minetest.register_node("default:leaves", {
 	visual_scale = 1.3,
 	tile_images = {"default_leaves.png"},
 	paramtype = "light",
-	groups = {snappy=3, leafdecay=3},
+	groups = {snappy=3, leafdecay=3, flammable=2},
 	drop = {
 		max_items = 1,
 		items = {
@@ -860,16 +869,14 @@ minetest.register_node("default:leaves", {
 		}
 	},
 	sounds = default.node_sound_leaves_defaults(),
-	stack_max = 128,
 })
 
 minetest.register_node("default:cactus", {
 	description = "Cactus",
 	tile_images = {"default_cactus_top.png", "default_cactus_top.png", "default_cactus_side.png"},
 	is_ground_content = true,
-	groups = {snappy=2,choppy=3},
+	groups = {snappy=2,choppy=3,flammable=2},
 	sounds = default.node_sound_wood_defaults(),
-	stack_max = 128,
 })
 
 minetest.register_node("default:papyrus", {
@@ -881,18 +888,16 @@ minetest.register_node("default:papyrus", {
 	paramtype = "light",
 	is_ground_content = true,
 	walkable = false,
-	groups = {snappy=3},
+	groups = {snappy=3,flammable=2},
 	sounds = default.node_sound_leaves_defaults(),
-	stack_max = 128,
 })
 
 minetest.register_node("default:bookshelf", {
 	description = "Bookshelf",
 	tile_images = {"default_wood.png", "default_wood.png", "default_bookshelf.png"},
 	is_ground_content = true,
-	groups = {snappy=2,choppy=3,oddly_breakable_by_hand=2},
+	groups = {snappy=2,choppy=3,oddly_breakable_by_hand=2,flammable=3},
 	sounds = default.node_sound_wood_defaults(),
-	stack_max = 128,
 })
 
 minetest.register_node("default:glass", {
@@ -905,7 +910,6 @@ minetest.register_node("default:glass", {
 	is_ground_content = true,
 	groups = {snappy=2,cracky=3,oddly_breakable_by_hand=3},
 	sounds = default.node_sound_glass_defaults(),
-	stack_max = 128,
 })
 
 minetest.register_node("default:fence_wood", {
@@ -920,9 +924,8 @@ minetest.register_node("default:fence_wood", {
 		type = "fixed",
 		fixed = {-1/7, -1/2, -1/7, 1/7, 1/2, 1/7},
 	},
-	groups = {snappy=2,choppy=2,oddly_breakable_by_hand=2},
+	groups = {snappy=2,choppy=2,oddly_breakable_by_hand=2,flammable=2},
 	sounds = default.node_sound_wood_defaults(),
-	stack_max = 128,
 })
 
 minetest.register_node("default:rail", {
@@ -939,7 +942,6 @@ minetest.register_node("default:rail", {
 		--fixed = <default>
 	},
 	groups = {bendy=2,snappy=1,dig_immediate=2},
-	stack_max = 128,
 })
 
 minetest.register_node("default:ladder", {
@@ -959,19 +961,17 @@ minetest.register_node("default:ladder", {
 		--wall_bottom = = <default>
 		--wall_side = = <default>
 	},
-	groups = {snappy=2,choppy=2,oddly_breakable_by_hand=3},
+	groups = {snappy=2,choppy=2,oddly_breakable_by_hand=3,flammable=2},
 	legacy_wallmounted = true,
 	sounds = default.node_sound_wood_defaults(),
-	stack_max = 128,
 })
 
 minetest.register_node("default:wood", {
 	description = "Wood",
 	tile_images = {"default_wood.png"},
 	is_ground_content = true,
-	groups = {snappy=2,choppy=2,oddly_breakable_by_hand=2},
+	groups = {snappy=2,choppy=2,oddly_breakable_by_hand=2,flammable=3},
 	sounds = default.node_sound_wood_defaults(),
-	stack_max = 128,
 })
 
 minetest.register_node("default:mese", {
@@ -980,7 +980,6 @@ minetest.register_node("default:mese", {
 	is_ground_content = true,
 	groups = {cracky=1},
 	sounds = default.node_sound_defaults(),
-	stack_max = 128,
 })
 
 minetest.register_node("default:cloud", {
@@ -988,7 +987,6 @@ minetest.register_node("default:cloud", {
 	tile_images = {"default_cloud.png"},
 	is_ground_content = true,
 	sounds = default.node_sound_defaults(),
-	stack_max = 128,
 })
 
 minetest.register_node("default:water_flowing", {
@@ -1011,8 +1009,7 @@ minetest.register_node("default:water_flowing", {
 		{image="default_water.png", backface_culling=false},
 		{image="default_water.png", backface_culling=true},
 	},
-	groups = {water=3, liquid=3},
-	stack_max = 128,
+	groups = {water=3, liquid=3, puts_out_fire=1},
 })
 
 minetest.register_node("default:water_source", {
@@ -1035,8 +1032,7 @@ minetest.register_node("default:water_source", {
 		-- New-style water source material (mostly unused)
 		{image="default_water.png", backface_culling=false},
 	},
-	groups = {water=3, liquid=3},
-	stack_max = 128,
+	groups = {water=3, liquid=3, puts_out_fire=1},
 })
 
 minetest.register_node("default:lava_flowing", {
@@ -1060,8 +1056,7 @@ minetest.register_node("default:lava_flowing", {
 		{image="default_lava.png", backface_culling=false},
 		{image="default_lava.png", backface_culling=true},
 	},
-	groups = {lava=3, liquid=2, hot=3},
-	stack_max = 128,
+	groups = {lava=3, liquid=2, hot=3, igniter=2},
 })
 
 minetest.register_node("default:lava_source", {
@@ -1085,8 +1080,7 @@ minetest.register_node("default:lava_source", {
 		-- New-style lava source material (mostly unused)
 		{image="default_lava.png", backface_culling=false},
 	},
-	groups = {lava=3, liquid=2, hot=3},
-	stack_max = 128,
+	groups = {lava=3, liquid=2, hot=3, igniter=2},
 })
 
 minetest.register_node("default:torch", {
@@ -1106,10 +1100,9 @@ minetest.register_node("default:torch", {
 		wall_bottom = {-0.1, -0.5, -0.1, 0.1, -0.5+0.6, 0.1},
 		wall_side = {-0.5, -0.3, -0.1, -0.5+0.3, 0.3, 0.1},
 	},
-	groups = {choppy=2,dig_immediate=3},
+	groups = {choppy=2,dig_immediate=3,flammable=1},
 	legacy_wallmounted = true,
 	sounds = default.node_sound_defaults(),
-	stack_max = 128,
 })
 
 minetest.register_node("default:sign_wall", {
@@ -1129,10 +1122,9 @@ minetest.register_node("default:sign_wall", {
 		--wall_bottom = <default>
 		--wall_side = <default>
 	},
-	groups = {choppy=2,dig_immediate=2},
+	groups = {choppy=2,dig_immediate=2,flammable=2},
 	legacy_wallmounted = true,
 	sounds = default.node_sound_defaults(),
-	stack_max = 128,
 })
 
 minetest.register_node("default:chest", {
@@ -1144,7 +1136,6 @@ minetest.register_node("default:chest", {
 	groups = {snappy=2,choppy=2,oddly_breakable_by_hand=2},
 	legacy_facedir_simple = true,
 	sounds = default.node_sound_wood_defaults(),
-	stack_max = 128,
 })
 
 minetest.register_node("default:chest_locked", {
@@ -1156,7 +1147,6 @@ minetest.register_node("default:chest_locked", {
 	groups = {snappy=2,choppy=2,oddly_breakable_by_hand=2},
 	legacy_facedir_simple = true,
 	sounds = default.node_sound_wood_defaults(),
-	stack_max = 128,
 })
 
 minetest.register_node("default:furnace", {
@@ -1168,7 +1158,6 @@ minetest.register_node("default:furnace", {
 	groups = {cracky=2},
 	legacy_facedir_simple = true,
 	sounds = default.node_sound_stone_defaults(),
-	stack_max = 128,
 })
 
 minetest.register_node("default:cobble", {
@@ -1177,7 +1166,6 @@ minetest.register_node("default:cobble", {
 	is_ground_content = true,
 	groups = {cracky=3},
 	sounds = default.node_sound_stone_defaults(),
-	stack_max = 128,
 })
 
 minetest.register_node("default:mossycobble", {
@@ -1186,16 +1174,14 @@ minetest.register_node("default:mossycobble", {
 	is_ground_content = true,
 	groups = {cracky=3},
 	sounds = default.node_sound_stone_defaults(),
-	stack_max = 128,
 })
 
 minetest.register_node("default:steelblock", {
 	description = "Steel Block",
 	tile_images = {"default_steel_block.png"},
 	is_ground_content = true,
-	groups = {snappy=1,bendy=2},
+	groups = {snappy=1,bendy=2,cracky=1,melty=2,level=2},
 	sounds = default.node_sound_stone_defaults(),
-	stack_max = 128,
 })
 
 minetest.register_node("default:nyancat", {
@@ -1207,7 +1193,6 @@ minetest.register_node("default:nyancat", {
 	groups = {cracky=2},
 	legacy_facedir_simple = true,
 	sounds = default.node_sound_defaults(),
-	stack_max = 128,
 })
 
 minetest.register_node("default:nyancat_rainbow", {
@@ -1216,7 +1201,6 @@ minetest.register_node("default:nyancat_rainbow", {
 	inventory_image = "default_nc_rb.png",
 	groups = {cracky=2},
 	sounds = default.node_sound_defaults(),
-	stack_max = 128,
 })
 
 minetest.register_node("default:sapling", {
@@ -1228,9 +1212,8 @@ minetest.register_node("default:sapling", {
 	wield_image = "default_sapling.png",
 	paramtype = "light",
 	walkable = false,
-	groups = {snappy=2,dig_immediate=3},
+	groups = {snappy=2,dig_immediate=3,flammable=2},
 	sounds = default.node_sound_defaults(),
-	stack_max = 128,
 })
 
 minetest.register_node("default:apple", {
@@ -1242,10 +1225,26 @@ minetest.register_node("default:apple", {
 	paramtype = "light",
 	sunlight_propagates = true,
 	walkable = false,
-	groups = {fleshy=3,dig_immediate=3},
+	groups = {fleshy=3,dig_immediate=3,flammable=2},
 	on_use = minetest.item_eat(4),
 	sounds = default.node_sound_defaults(),
-	stack_max = 128,
+})
+
+minetest.register_node("default:dry_shrub", {
+	description = "Dry Shrub",
+	drawtype = "plantlike",
+	visual_scale = 1.0,
+	tile_images = {"default_dry_shrub.png"},
+	inventory_image = "default_dry_shrub.png",
+	wield_image = "default_dry_shrub.png",
+	paramtype = "light",
+	walkable = false,
+	groups = {snappy=3,flammable=3},
+	sounds = default.node_sound_leaves_defaults(),
+	selection_box = {
+		type = "fixed",
+		fixed = {-1/3, -1/2, -1/3, 1/3, 1/6, 1/3},
+	},
 })
 
 --
@@ -1255,56 +1254,47 @@ minetest.register_node("default:apple", {
 minetest.register_craftitem("default:stick", {
 	description = "Stick",
 	inventory_image = "default_stick.png",
-	stack_max = 128,
 })
 
 minetest.register_craftitem("default:paper", {
 	description = "Paper",
 	inventory_image = "default_paper.png",
-	stack_max = 128,
 })
 
 minetest.register_craftitem("default:book", {
 	description = "Book",
 	inventory_image = "default_book.png",
-	stack_max = 128,
 })
 
 minetest.register_craftitem("default:coal_lump", {
 	description = "Lump of coal",
 	inventory_image = "default_coal_lump.png",
-	groups = {coal = 1},
-	stack_max = 128,
 })
 
 minetest.register_craftitem("default:iron_lump", {
 	description = "Lump of iron",
 	inventory_image = "default_iron_lump.png",
-	stack_max = 128,
 })
 
 minetest.register_craftitem("default:clay_lump", {
 	description = "Lump of clay",
 	inventory_image = "default_clay_lump.png",
-	stack_max = 128,
 })
 
 minetest.register_craftitem("default:steel_ingot", {
 	description = "Steel ingot",
 	inventory_image = "default_steel_ingot.png",
-	stack_max = 128,
 })
 
 minetest.register_craftitem("default:clay_brick", {
 	description = "Clay brick",
+	inventory_image = "default_steel_ingot.png",
 	inventory_image = "default_clay_brick.png",
-	stack_max = 128,
 })
 
 minetest.register_craftitem("default:scorched_stuff", {
 	description = "Scorched stuff",
 	inventory_image = "default_scorched_stuff.png",
-	stack_max = 128,
 })
 
 --
@@ -1342,45 +1332,121 @@ minetest.add_to_creative_inventory('default:lava_source')
 minetest.add_to_creative_inventory('default:ladder')
 
 --
--- Aliases for map generator outputs
--- (required at least by an in-development branch)
+-- Falling stuff
 --
 
-minetest.register_alias("mapgen_air", "air")
-minetest.register_alias("mapgen_stone", "default:stone")
-minetest.register_alias("mapgen_tree", "default:tree")
-minetest.register_alias("mapgen_leaves", "default:leaves")
-minetest.register_alias("mapgen_apple", "default:apple")
-minetest.register_alias("mapgen_water_source", "default:water_source")
-minetest.register_alias("mapgen_dirt", "default:dirt")
-minetest.register_alias("mapgen_sand", "default:sand")
-minetest.register_alias("mapgen_gravel", "default:gravel")
-minetest.register_alias("mapgen_clay", "default:clay")
-minetest.register_alias("mapgen_lava_source", "default:lava_source")
-minetest.register_alias("mapgen_cobble", "default:cobble")
-minetest.register_alias("mapgen_mossycobble", "default:mossycobble")
-minetest.register_alias("mapgen_dirt_with_grass", "default:dirt_with_grass")
-minetest.register_alias("mapgen_junglegrass", "default:junglegrass")
-minetest.register_alias("mapgen_stone_with_coal", "default:stone_with_coal")
-minetest.register_alias("mapgen_stone_with_iron", "default:stone_with_iron")
-minetest.register_alias("mapgen_mese", "default:mese")
+minetest.register_entity("default:falling_node", {
+	initial_properties = {
+		physical = true,
+		collisionbox = {-0.5,-0.5,-0.5, 0.5,0.5,0.5},
+		visual = "wielditem",
+		textures = {},
+		visual_size = {x=0.667, y=0.667},
+	},
 
+	nodename = "",
+
+	set_node = function(self, nodename)
+		self.nodename = nodename
+		local stack = ItemStack(nodename)
+		local itemtable = stack:to_table()
+		local itemname = nil
+		if itemtable then
+			itemname = stack:to_table().name
+		end
+		local item_texture = nil
+		local item_type = ""
+		if minetest.registered_items[itemname] then
+			item_texture = minetest.registered_items[itemname].inventory_image
+			item_type = minetest.registered_items[itemname].type
+		end
+		prop = {
+			is_visible = true,
+			textures = {nodename},
+		}
+		self.object:set_properties(prop)
+	end,
+
+	get_staticdata = function(self)
+		return self.nodename
+	end,
+
+	on_activate = function(self, staticdata)
+		self.nodename = staticdata
+		self.object:set_armor_groups({immortal=1})
+		--self.object:setacceleration({x=0, y=-10, z=0})
+		self:set_node(self.nodename)
+	end,
+
+	on_step = function(self, dtime)
+		-- Set gravity
+		self.object:setacceleration({x=0, y=-10, z=0})
+		-- Turn to actual sand when collides to ground or just move
+		local pos = self.object:getpos()
+		local bcp = {x=pos.x, y=pos.y-0.7, z=pos.z} -- Position of bottom center point
+		local bcn = minetest.env:get_node(bcp)
+		-- Note: walkable is in the node definition, not in item groups
+		if minetest.registered_nodes[bcn.name] and
+				minetest.registered_nodes[bcn.name].walkable then
+			local np = {x=bcp.x, y=bcp.y+1, z=bcp.z}
+			-- Check what's here
+			local n2 = minetest.env:get_node(np)
+			-- If it's not air or liquid, remove node and replace it with
+			-- it's drops
+			if n2.name ~= "air" and (not minetest.registered_nodes[n2.name] or
+					minetest.registered_nodes[n2.name].liquidtype == "none") then
+				local drops = minetest.get_node_drops(n2.name, "")
+				minetest.env:remove_node(np)
+				-- Add dropped items
+				local _, dropped_item
+				for _, dropped_item in ipairs(drops) do
+					minetest.env:add_item(np, dropped_item)
+				end
+				-- Run script hook
+				local _, callback
+				for _, callback in ipairs(minetest.registered_on_dignodes) do
+					callback(np, n2, nil)
+				end
+			end
+			-- Create node and remove entity
+			minetest.env:add_node(np, {name=self.nodename})
+			self.object:remove()
+		else
+			-- Do nothing
+		end
+	end
+})
+
+function default.spawn_falling_node(p, nodename)
+	obj = minetest.env:add_entity(p, "default:falling_node")
+	obj:get_luaentity():set_node(nodename)
+end
+
+-- Horrible crap to support old code
+-- Don't use this and never do what this does, it's completely wrong!
+-- (More specifically, the client and the C++ code doesn't get the group)
+function default.register_falling_node(nodename, texture)
+	minetest.log("error", debug.traceback())
+	minetest.log('error', "WARNING: default.register_falling_node is deprecated")
+	if minetest.registered_nodes[nodename] then
+		minetest.registered_nodes[nodename].groups.falling_node = 1
+	end
+end
 
 --
 -- Some common functions
 --
 
-default.falling_node_names = {}
-default.non_solid_node_names = {}
-
 function nodeupdate_single(p)
 	n = minetest.env:get_node(p)
-	if default.falling_node_names[n.name] ~= nil then
+	if minetest.get_node_group(n.name, "falling_node") ~= 0 then
 		p_bottom = {x=p.x, y=p.y-1, z=p.z}
 		n_bottom = minetest.env:get_node(p_bottom)
-		if default.non_solid_node_names[n_bottom.name] ~= nil then
+		-- Note: walkable is in the node definition, not in item groups
+		if minetest.registered_nodes[n_bottom.name] and
+				not minetest.registered_nodes[n_bottom.name].walkable then
 			minetest.env:remove_node(p)
-			minetest.env:add_entity(p, "default:falling_"..n.name)
+			default.spawn_falling_node(p, n.name)
 			nodeupdate(p)
 		end
 	end
@@ -1397,56 +1463,6 @@ function nodeupdate(p)
 	end
 end
 
---
--- Falling stuff
---
-
-
-function default.register_falling_node(nodename, texture)
-	default.falling_node_names[nodename] = true
-	-- Override naming conventions for stuff like :default:falling_default:sand
-	minetest.register_entity(":default:falling_"..nodename, {
-		-- Static definition
-		physical = true,
-		collisionbox = {-0.5,-0.5,-0.5, 0.5,0.5,0.5},
-		visual = "cube",
-		textures = {texture,texture,texture,texture,texture,texture},
-		-- State
-		-- Methods
-		on_step = function(self, dtime)
-			-- Set gravity
-			self.object:setacceleration({x=0, y=-10, z=0})
-			-- Turn to actual sand when collides to ground or just move
-			local pos = self.object:getpos()
-			local bcp = {x=pos.x, y=pos.y-0.7, z=pos.z} -- Position of bottom center point
-			local bcn = minetest.env:get_node(bcp)
-			if default.non_solid_node_names[bcn.name] == nil then
-				-- Turn to a sand node
-				local np = {x=bcp.x, y=bcp.y+1, z=bcp.z}
-				minetest.env:add_node(np, {name=nodename})
-				self.object:remove()
-			else
-				-- Do nothing
-			end
-		end
-	})
-end
-
-default.register_falling_node("default:sand", "default_sand.png")
-default.register_falling_node("default:gravel", "default_gravel.png")
-
-function default.register_non_solid_node(nodename)
-	default.non_solid_node_names[nodename] = true
-end
-
--- list node types that falling stuff can fall through
-default.register_non_solid_node("air")
-default.register_non_solid_node("default:water_flowing")
-default.register_non_solid_node("default:water_source")
-default.register_non_solid_node("default:lava_flowing")
-default.register_non_solid_node("default:lava_source")
-
-
 --
 -- Global callbacks
 --
diff --git a/rtmmp/mods/default/leafdecay.lua b/rtmmp/mods/default/leafdecay.lua
index 36b6df8..8f4ff97 100644
--- a/rtmmp/mods/default/leafdecay.lua
+++ b/rtmmp/mods/default/leafdecay.lua
@@ -61,28 +61,16 @@ minetest.register_abm({
 		end
 		default.leafdecay_trunk_find_allow_accumulator =
 				default.leafdecay_trunk_find_allow_accumulator - 1
-		for dx = -d, d do if do_preserve then break end
-		for dy = -d, d do if do_preserve then break end
-		for dz = -d, d do if do_preserve then break end
-			local p = {
-				x = p0.x + dx,
-				y = p0.y + dy,
-				z = p0.z + dz,
-			}
-			local n = minetest.env:get_node(p)
-			local reg = minetest.registered_nodes[n.name]
-			-- Assume ignore is a trunk, to make the thing work at the border of the active area
-			if n.name == "ignore" or (reg.groups.tree and reg.groups.tree ~= 0) then
-				do_preserve = true
-				if default.leafdecay_enable_cache then
-					--print("caching trunk")
-					-- Cache the trunk
-					default.leafdecay_trunk_cache[p0_hash] = p
-				end
+		-- Assume ignore is a trunk, to make the thing work at the border of the active area
+		local p1 = minetest.env:find_node_near(p0, d, {"ignore", "group:tree"})
+		if p1 then
+			do_preserve = true
+			if default.leafdecay_enable_cache then
+				--print("caching trunk")
+				-- Cache the trunk
+				default.leafdecay_trunk_cache[p0_hash] = p1
 			end
 		end
-		end
-		end
 		if not do_preserve then
 			-- Drop stuff other than the node itself
 			itemstacks = minetest.get_node_drops(n0.name)
diff --git a/rtmmp/mods/default/textures/default_apple.png b/rtmmp/mods/default/textures/default_apple.png
index e6854ed..9593f28 100644
Binary files a/rtmmp/mods/default/textures/default_apple.png and b/rtmmp/mods/default/textures/default_apple.png differ
diff --git a/rtmmp/mods/default/textures/default_brick.png b/rtmmp/mods/default/textures/default_brick.png
index 83209ca..32d77f3 100644
Binary files a/rtmmp/mods/default/textures/default_brick.png and b/rtmmp/mods/default/textures/default_brick.png differ
diff --git a/rtmmp/mods/default/textures/default_cactus_side.png b/rtmmp/mods/default/textures/default_cactus_side.png
index a33f688..395dd0d 100644
Binary files a/rtmmp/mods/default/textures/default_cactus_side.png and b/rtmmp/mods/default/textures/default_cactus_side.png differ
diff --git a/rtmmp/mods/default/textures/default_cactus_top.png b/rtmmp/mods/default/textures/default_cactus_top.png
index 11711d5..60a193c 100644
Binary files a/rtmmp/mods/default/textures/default_cactus_top.png and b/rtmmp/mods/default/textures/default_cactus_top.png differ
diff --git a/rtmmp/mods/default/textures/default_cobble.png b/rtmmp/mods/default/textures/default_cobble.png
index 42b6065..bc79696 100644
Binary files a/rtmmp/mods/default/textures/default_cobble.png and b/rtmmp/mods/default/textures/default_cobble.png differ
diff --git a/rtmmp/mods/default/textures/default_desert_sand.png b/rtmmp/mods/default/textures/default_desert_sand.png
new file mode 100644
index 0000000..9e36263
Binary files /dev/null and b/rtmmp/mods/default/textures/default_desert_sand.png differ
diff --git a/rtmmp/mods/default/textures/default_desert_stone.png b/rtmmp/mods/default/textures/default_desert_stone.png
new file mode 100644
index 0000000..a1afe6d
Binary files /dev/null and b/rtmmp/mods/default/textures/default_desert_stone.png differ
diff --git a/rtmmp/mods/default/textures/default_dirt.png b/rtmmp/mods/default/textures/default_dirt.png
index aa750da..30cd4bf 100644
Binary files a/rtmmp/mods/default/textures/default_dirt.png and b/rtmmp/mods/default/textures/default_dirt.png differ
diff --git a/rtmmp/mods/default/textures/default_dry_shrub.png b/rtmmp/mods/default/textures/default_dry_shrub.png
new file mode 100644
index 0000000..450d5d9
Binary files /dev/null and b/rtmmp/mods/default/textures/default_dry_shrub.png differ
diff --git a/rtmmp/mods/default/textures/default_grass.png b/rtmmp/mods/default/textures/default_grass.png
index 074f1df..4e1f0f1 100644
Binary files a/rtmmp/mods/default/textures/default_grass.png and b/rtmmp/mods/default/textures/default_grass.png differ
diff --git a/rtmmp/mods/default/textures/default_grass_footsteps.png b/rtmmp/mods/default/textures/default_grass_footsteps.png
index 1f0e12b..57e063d 100644
Binary files a/rtmmp/mods/default/textures/default_grass_footsteps.png and b/rtmmp/mods/default/textures/default_grass_footsteps.png differ
diff --git a/rtmmp/mods/default/textures/default_grass_side.png b/rtmmp/mods/default/textures/default_grass_side.png
index 8ba0227..6ca1a6f 100644
Binary files a/rtmmp/mods/default/textures/default_grass_side.png and b/rtmmp/mods/default/textures/default_grass_side.png differ
diff --git a/rtmmp/mods/default/textures/default_lava.png b/rtmmp/mods/default/textures/default_lava.png
index 2c7d9ad..9cf9fa8 100644
Binary files a/rtmmp/mods/default/textures/default_lava.png and b/rtmmp/mods/default/textures/default_lava.png differ
diff --git a/rtmmp/mods/default/textures/default_mossycobble.png b/rtmmp/mods/default/textures/default_mossycobble.png
index 3a36e56..ca72717 100644
Binary files a/rtmmp/mods/default/textures/default_mossycobble.png and b/rtmmp/mods/default/textures/default_mossycobble.png differ
diff --git a/rtmmp/mods/default/textures/default_sand.png b/rtmmp/mods/default/textures/default_sand.png
index 62d8422..2a48456 100644
Binary files a/rtmmp/mods/default/textures/default_sand.png and b/rtmmp/mods/default/textures/default_sand.png differ
diff --git a/rtmmp/mods/default/textures/default_sandstone.png b/rtmmp/mods/default/textures/default_sandstone.png
index 95e9252..c4759b4 100644
Binary files a/rtmmp/mods/default/textures/default_sandstone.png and b/rtmmp/mods/default/textures/default_sandstone.png differ
diff --git a/rtmmp/mods/default/textures/default_stone.png b/rtmmp/mods/default/textures/default_stone.png
index bfa3f1c..17c3f56 100644
Binary files a/rtmmp/mods/default/textures/default_stone.png and b/rtmmp/mods/default/textures/default_stone.png differ
diff --git a/rtmmp/mods/doors/init.lua b/rtmmp/mods/doors/init.lua
index e8646ba..3264b27 100644
--- a/rtmmp/mods/doors/init.lua
+++ b/rtmmp/mods/doors/init.lua
@@ -21,7 +21,6 @@ minetest.register_node( 'doors:door_wood', {
 	paramtype2          = 'wallmounted',
 	selection_box       = { type = 'wallmounted' },
 	groups              = { choppy=2, dig_immediate=2 },
-	stack_max = 128,
 })
 
 minetest.register_craft( {
diff --git a/rtmmp/mods/fire/README.txt b/rtmmp/mods/fire/README.txt
new file mode 100644
index 0000000..b240f11
--- /dev/null
+++ b/rtmmp/mods/fire/README.txt
@@ -0,0 +1,30 @@
+Minetest 0.4 mod: fire
+======================
+
+License of source code:
+-----------------------
+Copyright (C) 2012 Perttu Ahola (celeron55) <celeron55@gmail.com>
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2 of the License, or
+(at your option) any later version.
+
+http://www.gnu.org/licenses/gpl-2.0.html
+
+License of media (textures and sounds)
+--------------------------------------
+Attribution-ShareAlike 3.0 Unported (CC BY-SA 3.0)                                 
+http://creativecommons.org/licenses/by-sa/3.0/
+
+Authors of media files
+-----------------------
+Everything not listed in here:
+Copyright (C) 2012 Perttu Ahola (celeron55) <celeron55@gmail.com>
+
+fire_small.ogg sampled from:
+  http://www.freesound.org/people/dobroide/sounds/4211/
+
+fire_large.ogg sampled from:
+  http://www.freesound.org/people/Dynamicell/sounds/17548/
+
diff --git a/rtmmp/mods/fire/init.lua b/rtmmp/mods/fire/init.lua
new file mode 100644
index 0000000..78f9726
--- /dev/null
+++ b/rtmmp/mods/fire/init.lua
@@ -0,0 +1,188 @@
+-- minetest/fire/init.lua
+
+minetest.register_node("fire:basic_flame", {
+	description = "Fire",
+	drawtype = "glasslike",
+	tile_images = {"fire_basic_flame.png"},
+	light_source = 14,
+	groups = {igniter=3,dig_immediate=3},
+	drop = '',
+	walkable = false,
+})
+
+local fire = {}
+fire.D = 6
+-- key: position hash of low corner of area
+-- value: {handle=sound handle, name=sound name}
+fire.sounds = {}
+
+function fire.get_area_p0p1(pos)
+	local p0 = {
+		x=math.floor(pos.x/fire.D)*fire.D,
+		y=math.floor(pos.y/fire.D)*fire.D,
+		z=math.floor(pos.z/fire.D)*fire.D,
+	}
+	local p1 = {
+		x=p0.x+fire.D-1,
+		y=p0.y+fire.D-1,
+		z=p0.z+fire.D-1
+	}
+	return p0, p1
+end
+
+function fire.update_sounds_around(pos)
+	local p0, p1 = fire.get_area_p0p1(pos)
+	local cp = {x=(p0.x+p1.x)/2, y=(p0.y+p1.y)/2, z=(p0.z+p1.z)/2}
+	local flames_p = minetest.env:find_nodes_in_area(p0, p1, {"fire:basic_flame"})
+	--print("number of flames at "..minetest.pos_to_string(p0).."/"
+	--		..minetest.pos_to_string(p1)..": "..#flames_p)
+	local should_have_sound = (#flames_p > 0)
+	local wanted_sound = nil
+	if #flames_p >= 9 then
+		wanted_sound = {name="fire_large", gain=1.5}
+	elseif #flames_p > 0 then
+		wanted_sound = {name="fire_small", gain=1.5}
+	end
+	local p0_hash = minetest.hash_node_position(p0)
+	local sound = fire.sounds[p0_hash]
+	if not sound then
+		if should_have_sound then
+			fire.sounds[p0_hash] = {
+				handle = minetest.sound_play(wanted_sound, {pos=cp, loop=true}),
+				name = wanted_sound.name,
+			}
+		end
+	else
+		if not wanted_sound then
+			minetest.sound_stop(sound.handle)
+			fire.sounds[p0_hash] = nil
+		elseif sound.name ~= wanted_sound.name then
+			minetest.sound_stop(sound.handle)
+			fire.sounds[p0_hash] = {
+				handle = minetest.sound_play(wanted_sound, {pos=cp, loop=true}),
+				name = wanted_sound.name,
+			}
+		end
+	end
+end
+
+function fire.on_flame_add_at(pos)
+	--print("flame added at "..minetest.pos_to_string(pos))
+	fire.update_sounds_around(pos)
+end
+
+function fire.on_flame_remove_at(pos)
+	--print("flame removed at "..minetest.pos_to_string(pos))
+	fire.update_sounds_around(pos)
+end
+
+function fire.find_pos_for_flame_around(pos)
+	return minetest.env:find_node_near(pos, 1, {"air"})
+end
+
+function fire.flame_should_extinguish(pos)
+	--return minetest.env:find_node_near(pos, 1, {"group:puts_out_fire"})
+	local p0 = {x=pos.x-2, y=pos.y, z=pos.z-2}
+	local p1 = {x=pos.x+2, y=pos.y, z=pos.z+2}
+	local ps = minetest.env:find_nodes_in_area(p0, p1, {"group:puts_out_fire"})
+	return (#ps ~= 0)
+end
+
+minetest.register_on_placenode(function(pos, newnode, placer)
+	if newnode.name == "fire:basic_flame" then
+		fire.on_flame_add_at(pos)
+	end
+end)
+
+minetest.register_on_dignode(function(pos, oldnode, digger)
+	if oldnode.name == "fire:basic_flame" then
+		fire.on_flame_remove_at(pos)
+	end
+end)
+
+-- Ignite neighboring nodes
+minetest.register_abm({
+	nodenames = {"group:flammable"},
+	neighbors = {"group:igniter"},
+	interval = 1,
+	chance = 2,
+	action = function(p0, node, _, _)
+		-- If there is water or stuff like that around flame, don't ignite
+		if fire.flame_should_extinguish(p0) then
+			return
+		end
+		local p = fire.find_pos_for_flame_around(p0)
+		if p then
+			minetest.env:set_node(p, {name="fire:basic_flame"})
+			fire.on_flame_add_at(p)
+		end
+	end,
+})
+
+-- Rarely ignite things from far
+minetest.register_abm({
+	nodenames = {"group:igniter"},
+	neighbors = {"air"},
+	interval = 2,
+	chance = 10,
+	action = function(p0, node, _, _)
+		local reg = minetest.registered_nodes[node.name]
+		if not reg or not reg.groups.igniter or reg.groups.igniter < 2 then
+			return
+		end
+		local d = reg.groups.igniter
+		local p = minetest.env:find_node_near(p0, d, {"group:flammable"})
+		if p then
+			-- If there is water or stuff like that around flame, don't ignite
+			if fire.flame_should_extinguish(p) then
+				return
+			end
+			local p2 = fire.find_pos_for_flame_around(p)
+			if p2 then
+				minetest.env:set_node(p2, {name="fire:basic_flame"})
+				fire.on_flame_add_at(p2)
+			end
+		end
+	end,
+})
+
+-- Remove flammable nodes and flame
+minetest.register_abm({
+	nodenames = {"fire:basic_flame"},
+	interval = 1,
+	chance = 2,
+	action = function(p0, node, _, _)
+		-- If there is water or stuff like that around flame, remove flame
+		if fire.flame_should_extinguish(p0) then
+			minetest.env:remove_node(p0)
+			fire.on_flame_remove_at(p0)
+			return
+		end
+		-- Make the following things rarer
+		if math.random(1,3) == 1 then
+			return
+		end
+		-- If there are no flammable nodes around flame, remove flame
+		if not minetest.env:find_node_near(p0, 1, {"group:flammable"}) then
+			minetest.env:remove_node(p0)
+			fire.on_flame_remove_at(p0)
+			return
+		end
+		if math.random(1,4) == 1 then
+			-- remove a flammable node around flame
+			local p = minetest.env:find_node_near(p0, 1, {"group:flammable"})
+			if p then
+				-- If there is water or stuff like that around flame, don't remove
+				if fire.flame_should_extinguish(p0) then
+					return
+				end
+				minetest.env:remove_node(p)
+			end
+		else
+			-- remove flame
+			minetest.env:remove_node(p0)
+			fire.on_flame_remove_at(p0)
+		end
+	end,
+})
+
diff --git a/rtmmp/mods/fire/sounds/fire_large.ogg b/rtmmp/mods/fire/sounds/fire_large.ogg
new file mode 100644
index 0000000..fe78e62
Binary files /dev/null and b/rtmmp/mods/fire/sounds/fire_large.ogg differ
diff --git a/rtmmp/mods/fire/sounds/fire_small.ogg b/rtmmp/mods/fire/sounds/fire_small.ogg
new file mode 100644
index 0000000..5aac595
Binary files /dev/null and b/rtmmp/mods/fire/sounds/fire_small.ogg differ
diff --git a/rtmmp/mods/fire/textures/fire_basic_flame.png b/rtmmp/mods/fire/textures/fire_basic_flame.png
new file mode 100644
index 0000000..a5c2afd
Binary files /dev/null and b/rtmmp/mods/fire/textures/fire_basic_flame.png differ
diff --git a/rtmmp/mods/legacy/init.lua b/rtmmp/mods/legacy/init.lua
index 2dee693..7f9088c 100644
--- a/rtmmp/mods/legacy/init.lua
+++ b/rtmmp/mods/legacy/init.lua
@@ -78,7 +78,6 @@ minetest.register_alias("scorched_stuff", "default:scorched_stuff")
 minetest.register_craftitem(":rat", {
 	description = "Rat",
 	inventory_image = "rat.png",
-	stack_max = 128,
 	on_drop = function(item, dropper, pos)
 		minetest.env:add_rat(pos)
 		item:take_item()
@@ -98,13 +97,11 @@ minetest.register_craftitem(":cooked_rat", {
 	description = "Cooked rat",
 	inventory_image = "cooked_rat.png",
 	on_use = minetest.item_eat(6),
-	stack_max = 128,
 })
 
 minetest.register_craftitem(":firefly", {
 	description = "Firefly",
 	inventory_image = "firefly.png",
-	stack_max = 128,
 	on_drop = function(item, dropper, pos)
 		minetest.env:add_firefly(pos)
 		item:take_item()
diff --git a/rtmmp/mods/legacy/textures/apple_iron.png b/rtmmp/mods/legacy/textures/apple_iron.png
index 2734d6b..2dffdf0 100644
Binary files a/rtmmp/mods/legacy/textures/apple_iron.png and b/rtmmp/mods/legacy/textures/apple_iron.png differ
diff --git a/rtmmp/mods/legacy/textures/dungeon_master.png b/rtmmp/mods/legacy/textures/dungeon_master.png
index b719276..3457c82 100644
Binary files a/rtmmp/mods/legacy/textures/dungeon_master.png and b/rtmmp/mods/legacy/textures/dungeon_master.png differ
diff --git a/rtmmp/mods/legacy/textures/fireball.png b/rtmmp/mods/legacy/textures/fireball.png
index e68d9f0..5231428 100644
Binary files a/rtmmp/mods/legacy/textures/fireball.png and b/rtmmp/mods/legacy/textures/fireball.png differ
diff --git a/rtmmp/mods/legacy/textures/oerkki1.png b/rtmmp/mods/legacy/textures/oerkki1.png
index 4f81af4..33cbac9 100644
Binary files a/rtmmp/mods/legacy/textures/oerkki1.png and b/rtmmp/mods/legacy/textures/oerkki1.png differ
diff --git a/rtmmp/mods/legacy/textures/oerkki1_damaged.png b/rtmmp/mods/legacy/textures/oerkki1_damaged.png
index b76ca60..9b77738 100644
Binary files a/rtmmp/mods/legacy/textures/oerkki1_damaged.png and b/rtmmp/mods/legacy/textures/oerkki1_damaged.png differ
diff --git a/rtmmp/mods/legacy/textures/rat.png b/rtmmp/mods/legacy/textures/rat.png
index c85fcad..d1a0e2a 100644
Binary files a/rtmmp/mods/legacy/textures/rat.png and b/rtmmp/mods/legacy/textures/rat.png differ