diff --git a/minetest.conf b/minetest.conf
index 8b1b08d..4f4ede5 100644
--- a/minetest.conf
+++ b/minetest.conf
@@ -1,6 +1,7 @@
 movement_liquid_sink = 36
 movement_acceleration_air = 0.5
-movement_speed_descend = 0.6
+movement_speed_climb = 0.4
+movement_acceleration_default = 3
 
 remove_items = 86400
 enable_item_pickup = true
\ No newline at end of file
diff --git a/mobmodels/DM.png b/mobmodels/DM.png
deleted file mode 100644
index f3ad229..0000000
Binary files a/mobmodels/DM.png and /dev/null differ
diff --git a/mobmodels/DM.xcf b/mobmodels/DM.xcf
deleted file mode 100644
index bc59622..0000000
Binary files a/mobmodels/DM.xcf and /dev/null differ
diff --git a/mobmodels/DMech.png b/mobmodels/DMech.png
deleted file mode 100644
index 95d5d1c..0000000
Binary files a/mobmodels/DMech.png and /dev/null differ
diff --git a/mobmodels/DMech.xcf b/mobmodels/DMech.xcf
deleted file mode 100644
index 05bbc2d..0000000
Binary files a/mobmodels/DMech.xcf and /dev/null differ
diff --git a/mobmodels/DungeonMaster.blend b/mobmodels/DungeonMaster.blend
deleted file mode 100644
index d088458..0000000
Binary files a/mobmodels/DungeonMaster.blend and /dev/null differ
diff --git a/mobmodels/DungeonMaster.blend1 b/mobmodels/DungeonMaster.blend1
deleted file mode 100644
index 7928e7d..0000000
Binary files a/mobmodels/DungeonMaster.blend1 and /dev/null differ
diff --git a/mobmodels/DungeonMech.blend b/mobmodels/DungeonMech.blend
deleted file mode 100644
index 9e322ec..0000000
Binary files a/mobmodels/DungeonMech.blend and /dev/null differ
diff --git a/mods/hud/textures/hud_hunger_bg.png b/mods/hud/textures/hud_hunger_bg.png
index 310d99a..78b8a87 100644
Binary files a/mods/hud/textures/hud_hunger_bg.png and b/mods/hud/textures/hud_hunger_bg.png differ
diff --git a/mods/hud/textures/hud_hunger_fg.png b/mods/hud/textures/hud_hunger_fg.png
index c8a08dd..eac7902 100644
Binary files a/mods/hud/textures/hud_hunger_fg.png and b/mods/hud/textures/hud_hunger_fg.png differ
diff --git a/mods/mapgen/init.lua b/mods/mapgen/init.lua
index 20c1e9d..e4f5ca4 100644
--- a/mods/mapgen/init.lua
+++ b/mods/mapgen/init.lua
@@ -425,4 +425,31 @@ local function crustymese(old, new)
 	end
 end
 
-crustymese("mapgen:stone", "mapgen:mese_stone")
\ No newline at end of file
+crustymese("mapgen:stone", "mapgen:mese_stone")
+
+-- liquid sounds
+
+minetest.register_abm({
+	nodenames = {"mapgen:lava_source", "mapgen:lava_flowing"},
+	interval = 2,
+	chance = 2,
+	action = function(pos, node, active_object_count, active_object_count_wider)
+		minetest.sound_play("mapgen_lava", {pos = pos, gain = 0.05, max_hear_distance = 1.5})
+			if math.random(1,13) == 8 then
+				local rnd = math.random(0,1)*-1
+				minetest.add_particle(pos, {x=0.1*rnd, y=0.8, z=-0.1*rnd}, {x=-0.5*rnd, y=0.2, z=0.5*rnd}, 1.7,
+   				1.2, true, "mapgen_lava_particle.png")
+			end
+end})
+
+--
+-- Flowing water sound
+--
+
+minetest.register_abm({
+	nodenames = {"mapgen:water_flowing"},
+	interval = 1.8,
+	chance = 1.5,
+	action = function(pos, node, active_object_count, active_object_count_wider)
+		minetest.sound_play("mapgen_water", {pos = pos, gain = 0.025, max_hear_distance = 5})
+end})
\ No newline at end of file
diff --git a/mods/mapgen/nodes.lua b/mods/mapgen/nodes.lua
index fa115ff..7d96864 100644
--- a/mods/mapgen/nodes.lua
+++ b/mods/mapgen/nodes.lua
@@ -190,11 +190,23 @@ minetest.register_node("mapgen:long_grass_5", {
 minetest.register_node("mapgen:cactus", {
 	description = "Cactus",
 	tiles = {"mapgen_cactus_top.png", "mapgen_cactus_top.png", "mapgen_cactus_side.png"},
-	paramtype2 = "facedir",
 	is_ground_content = true,
 	groups = {snappy=1,choppy=3,flammable=2},
 	sounds = default.node_sound_wood_defaults(),
-	on_place = minetest.rotate_node
+	on_place = minetest.rotate_node,
+	drawtype = "nodebox",
+	paramtype = "light",
+	damage_per_second = 1,
+	node_box = {
+		type = "fixed",
+		fixed = {{-7/16, -0.5, -7/16, 7/16, 0.5, 7/16}, {-8/16, -0.5, -7/16, -7/16, 0.5, -7/16},
+			 {7/16, -0.5, -7/16, 7/16, 0.5, -8/16},{-7/16, -0.5, 7/16, -7/16, 0.5, 8/16},{7/16, -0.5, 7/16, 8/16, 0.5, 7/16}}--
+	},
+	selection_box = {
+		type = "fixed",
+		fixed = {-7/16, -0.5, -7/16, 7/16, 0.5, 7/16},
+				
+	},
 })
 
 minetest.register_node("mapgen:sand", {
@@ -305,6 +317,25 @@ minetest.register_node("mapgen:oak_leaves", {
 		}
 	},
 	sounds = default.node_sound_leaves_defaults(),
+	on_place = function(itemstack, placer, pointed_thing)
+		-- place a random grass node
+		local stack = ItemStack("mapgen:oak_leaves_deco")
+		local ret = minetest.item_place(stack, placer, pointed_thing)
+		return ItemStack("mapgen:oak_leaves".." "..itemstack:get_count()-(1-ret:get_count()))
+	end,
+})
+
+minetest.register_node("mapgen:oak_leaves_deco", {
+	description = "Oak Leaves",
+	drawtype = "allfaces_optional",
+	visual_scale = 1.3,
+	tiles = {"mapgen_oak_leaves.png"},
+	paramtype = "light",
+	waving=1,
+	is_ground_content = false,
+	groups = {snappy=3, flammable=2, leaves=1},
+	sounds = default.node_sound_leaves_defaults(),
+	drop = {'mapgen:oak_leaves'},
 })
 
 minetest.register_node("mapgen:oak_sapling", {
diff --git a/mods/mapgen/sounds/mapgen_lava.ogg b/mods/mapgen/sounds/mapgen_lava.ogg
new file mode 100644
index 0000000..4e5d1c9
Binary files /dev/null and b/mods/mapgen/sounds/mapgen_lava.ogg differ
diff --git a/mods/mapgen/sounds/mapgen_water.ogg b/mods/mapgen/sounds/mapgen_water.ogg
new file mode 100644
index 0000000..fa8e7e2
Binary files /dev/null and b/mods/mapgen/sounds/mapgen_water.ogg differ
diff --git a/mods/mapgen/textures/bubble.png b/mods/mapgen/textures/bubble.png
deleted file mode 100644
index 3bca7e1..0000000
Binary files a/mods/mapgen/textures/bubble.png and /dev/null differ
diff --git a/mods/mapgen/textures/heart.png b/mods/mapgen/textures/heart.png
deleted file mode 100644
index 552d0d8..0000000
Binary files a/mods/mapgen/textures/heart.png and /dev/null differ
diff --git a/mods/mapgen/textures/mapgen_lava_particle.png b/mods/mapgen/textures/mapgen_lava_particle.png
new file mode 100644
index 0000000..80f11a4
Binary files /dev/null and b/mods/mapgen/textures/mapgen_lava_particle.png differ
diff --git a/mods/tools/textures/tool_steel_battleaxe.png b/mods/tools/textures/tool_steel_battleaxe.png
deleted file mode 100644
index 9679ee5..0000000
Binary files a/mods/tools/textures/tool_steel_battleaxe.png and /dev/null differ