diff --git a/mods/mapgen/mapgen.lua b/mods/mapgen/mapgen.lua
index 4e93b8a..4c95e61 100644
--- a/mods/mapgen/mapgen.lua
+++ b/mods/mapgen/mapgen.lua
@@ -113,6 +113,8 @@
 		},
 	})
 	
+
+	
 	--swamp water
 	
 		minetest.register_ore({
@@ -214,6 +216,26 @@
 		},
 	})
 	
+	minetest.register_ore({
+		ore_type        = "blob",
+		ore             = "mapgen:coarse_dirt",
+		wherein         = {"mapgen:dirt_with_leafygrass"},
+		clust_scarcity  = 16 * 16 * 16,
+		clust_size      = 3,
+		y_min           = -31000,
+		y_max           = 31000,
+		noise_threshold = 0.0,
+		noise_params    = {
+			offset = 0.5,
+			scale = 0.2,
+			spread = {x = 5, y = 5, z = 5},
+			seed = 766,
+			octaves = 1,
+			persist = 0.0
+		},
+		biomes = {"coniferous_forest_tall",}
+	})
+	
 	-- Scatter ores
 
 	-- Coal
@@ -782,7 +804,7 @@
 	minetest.register_biome({
 		name = "coniferous_forest_tall",
 		--node_dust = "",
-		node_top = "default:dirt_with_grass",
+		node_top = "mapgen:dirt_with_leafygrass",
 		depth_top = 1,
 		node_filler = "default:dirt",
 		depth_filler = 3,
@@ -1224,7 +1246,7 @@
 local function register_grass_decoration(offset, scale, length)
 	minetest.register_decoration({
 		deco_type = "simple",
-		place_on = {"default:dirt_with_grass", "default:sand"},
+		place_on = {"default:dirt_with_grass", "default:sand", "mapgen:dirt_with_leafygrass"},
 		sidelen = 16,
 		noise_params = {
 			offset = offset,
@@ -1450,7 +1472,7 @@ end
 	
 	minetest.register_decoration({
 		deco_type = "schematic",
-		place_on = {"default:dirt_with_grass"},
+		place_on = {"mapgen:dirt_with_leafygrass"},
 		sidelen = 16,
 		noise_params = {
 			offset = 0.036,
@@ -1461,7 +1483,7 @@ end
 			persist = 0.66
 		},
 		biomes = {"coniferous_forest_tall"},
-		y_min = 2,
+		y_min = -50,
 		y_max = 31000,
 		schematic = minetest.get_modpath("mapgen") .. "/schematics/pine.mts",
 		flags = "place_center_x, place_center_z",
@@ -1560,7 +1582,7 @@ minetest.register_decoration({
 	place_on = {"default:dirt_with_grass"},
 	sidelen = 6,
 	fill_ratio = 0.01,
-	biomes = {"grassland"},
+	biomes = {"grassland", "deciduous_forest", "deciduous_forest2"},
 	decoration = "mapgen:wild_oat",
 	height = 1,
 })
@@ -1780,7 +1802,7 @@ minetest.register_decoration({
 	
 	minetest.register_decoration({
 	deco_type = "simple",
-	place_on = "default:dirt_with_grass",
+	place_on = "default:dirt_with_grass", "mapgen:dirt_with_leafygrass",
 	sidelen = 16,
 	fill_ratio = 0.01,
 	biomes = {"grassland", "deciduous_forest", "coniferous_forest_tall"},
@@ -1799,6 +1821,18 @@ minetest.register_decoration({
 	height = 1,
 })
 
+	--shrubs
+	
+	minetest.register_decoration({
+	deco_type = "simple",
+	place_on = "mapgen:dirt_with_leafygrass",
+	sidelen = 16,
+	fill_ratio = 0.2,
+	biomes = {"coniferous_forest_tall",},
+	decoration = "mapgen:shrub",
+	height = 1,
+})
+
 	--ferns
 	
 minetest.register_decoration({
diff --git a/mods/mapgen/models/mapgen_shrub1.png b/mods/mapgen/models/mapgen_shrub1.png
new file mode 100644
index 0000000..b14ec97
Binary files /dev/null and b/mods/mapgen/models/mapgen_shrub1.png differ
diff --git a/mods/mapgen/models/shrub.obj b/mods/mapgen/models/shrub.obj
new file mode 100644
index 0000000..2c7879a
--- /dev/null
+++ b/mods/mapgen/models/shrub.obj
@@ -0,0 +1,45 @@
+# Blender v2.72 (sub 0) OBJ File: 'shrub.blend'
+# www.blender.org
+mtllib shrub.mtl
+o Plane.004
+v -0.975716 0.267716 1.127146
+v 1.024098 0.240560 1.129742
+v -0.973881 0.211721 -0.872069
+v 1.025933 0.184565 -0.869473
+v -1.071143 -0.041514 0.554547
+v 0.891063 -0.039281 0.941512
+v -0.684172 -0.053816 -1.407621
+v 1.278034 -0.051583 -1.020656
+v -0.826134 0.451123 0.991426
+v 1.166425 0.279599 1.008464
+v -0.810215 0.437386 -1.008464
+v 1.182343 0.265862 -0.991426
+v -1.336549 -0.020002 0.995727
+v 0.662479 0.042366 0.995727
+v -1.342309 0.164609 -0.995727
+v 0.656719 0.226977 -0.995727
+v 0.000000 -1.023631 1.000000
+v 0.000000 -1.023631 -1.000000
+v -0.000000 0.976369 1.000000
+v -0.000000 0.976369 -1.000000
+v -1.000000 -1.023631 0.000000
+v 1.000000 -1.023631 0.000000
+v -1.000000 0.976369 -0.000000
+v 1.000000 0.976369 -0.000000
+vt 0.000000 0.000000
+vt 0.500000 0.000000
+vt 0.500000 0.500000
+vt 0.000000 0.500000
+vt 1.000000 0.000000
+vt 1.000000 0.500000
+vt 1.000000 1.000000
+vt 0.500000 1.000000
+vt 0.000000 1.000000
+usemtl Material
+s off
+f 1/1 2/2 4/3 3/4
+f 5/2 6/5 8/6 7/3
+f 9/3 10/6 12/7 11/8
+f 13/3 14/6 16/7 15/8
+f 17/4 18/3 20/8 19/9
+f 21/4 22/3 24/8 23/9
diff --git a/mods/mapgen/nodes.lua b/mods/mapgen/nodes.lua
index 8dce220..a07be39 100644
--- a/mods/mapgen/nodes.lua
+++ b/mods/mapgen/nodes.lua
@@ -14,6 +14,33 @@ minetest.register_node("mapgen:"..name, {
 		type = "fixed",
 		fixed = {-0.3, -0.5, -0.3, 0.3, 0.3, 0.3}
 	},
+	paramtype2 = "degrotate",
+	walkable = false,
+	buildable_to = true,
+	groups = {snappy = 1, oddly_breakable_by_hand = 1, flora = 1, flammable = 1},
+	sounds = default.node_sound_leaves_defaults()
+})
+end
+
+function mapgen.register_shrub(name, desc, texnumber)
+minetest.register_node("mapgen:"..name, {
+	description = desc,
+	drawtype = "mesh",
+	mesh = "shrub.obj",
+	tiles = {
+		"mapgen_shrub"..texnumber..".png",
+	},
+	paramtype = "light",
+	selection_box = {
+		type = "fixed",
+		fixed = {-0.3, -0.5, -0.3, 0.3, 0.3, 0.3}
+	},
+	on_construct = function(pos, node)
+		local node = minetest.get_node(pos)
+		node.param2 = math.random(0,179)
+	end,
+	paramtype2 = "degrotate",
+	visual_scale = 0.5,
 	walkable = false,
 	buildable_to = true,
 	groups = {snappy = 1, oddly_breakable_by_hand = 1, flora = 1, flammable = 1},
@@ -26,6 +53,8 @@ end
 mapgen.register_fern("fern", "Fern", "1")
 mapgen.register_fern("fern2", "Broad Leaf Fern", "2")
 
+mapgen.register_shrub("shrub", "Shrub", "1")
+
 --nodes
 
 --plants (PLNT01)
@@ -465,6 +494,55 @@ minetest.register_node("mapgen:jungletree", {
 	walkable = false,
 })
 
+minetest.register_node("mapgen:bamboo", {
+	description = "Bamboo",
+	drawtype = "plantlike",
+	tiles = {"mapgen_bamboo.png"},
+	paramtype = "light",
+	is_ground_content = false,
+	sunlight_propagates = true,
+	inventory_image = "mapgen_bamboo.png",
+	groups = {choppy=1, flammable=1, oddly_breakable_by_hand=1, tree=1},
+	sounds = default.node_sound_wood_defaults(),
+	selection_box = {
+		type = "fixed",
+		fixed = {-0.2, -0.5, -0.2, 0.2, 0.5, 0.2}
+	},
+	walkable = true,
+})
+
+minetest.register_node("mapgen:bamboo_leaves", {
+	description = "Bamboo Leaves",
+	drawtype = "firelike",
+	tiles = {"mapgen_bamboo_leaves.png"},
+	paramtype = "light",
+	is_ground_content = false,
+	sunlight_propagates = true,
+	groups = {snappy=1, flammable=1, oddly_breakable_by_hand=1, leafdecay=1, leaves=1},
+	sounds = default.node_sound_leaves_defaults(),
+	walkable = false,
+	selection_box = {
+		type = "fixed",
+		fixed = {-0.4, -0.4, -0.4, 0.4, 0.4, 0.4}
+	},
+})
+
+minetest.register_node("mapgen:bamboo_with_leaves", {
+	description = "Bamboo With Leaves",
+	drawtype = "plantlike",
+	tiles = {"mapgen_bamboo_leaves.png^mapgen_bamboo.png"},
+	paramtype = "light",
+	is_ground_content = false,
+	sunlight_propagates = true,
+	groups = {choppy=1, flammable=1, oddly_breakable_by_hand=1, tree=1, leaves=1},
+	sounds = default.node_sound_wood_defaults(),
+	walkable = false,
+	selection_box = {
+		type = "fixed",
+		fixed = {-0.2, -0.5, -0.2, 0.2, 0.5, 0.2}
+	},
+})
+
 minetest.register_node("mapgen:flame_lily", {
 	description = "Flame Lily",
 	drawtype = "plantlike",
@@ -478,7 +556,7 @@ minetest.register_node("mapgen:flame_lily", {
 	sounds = default.node_sound_leaves_defaults(),
 	selection_box = {
 		type = "fixed",
-		fixed = {-0.5, -0.5, -0.5, 0.5, 0, 0.5}
+		fixed = {-0.3, -0.5, -0.3, 0.3, 0, 0.3}
 	},
 	walkable = false,
 })
@@ -707,6 +785,13 @@ minetest.register_node("mapgen:dirt_with_swampgrass", {
 	sounds = default.node_sound_dirt_defaults()
 })
 
+minetest.register_node("mapgen:dirt_with_leafygrass", {
+	description = "Dirt With Leaf Covered Grass",
+	tiles = {"mapgen_leafy_grass.png", "default_dirt.png", "default_dirt.png^mapgen_leafy_grass_side.png"},
+	groups = {crumbly = 1, oddly_breakable_by_hand = 1},
+	sounds = default.node_sound_dirt_defaults()
+})
+
 minetest.register_node("mapgen:aloe_vera", {
 	description = "Aloe Vera",
 	drawtype = "plantlike",
diff --git a/mods/mapgen/textures/mapgen_bamboo.png b/mods/mapgen/textures/mapgen_bamboo.png
new file mode 100644
index 0000000..54b42aa
Binary files /dev/null and b/mods/mapgen/textures/mapgen_bamboo.png differ
diff --git a/mods/mapgen/textures/mapgen_bamboo_leaves.png b/mods/mapgen/textures/mapgen_bamboo_leaves.png
new file mode 100644
index 0000000..de74829
Binary files /dev/null and b/mods/mapgen/textures/mapgen_bamboo_leaves.png differ
diff --git a/mods/mapgen/textures/mapgen_leafy_grass.png b/mods/mapgen/textures/mapgen_leafy_grass.png
new file mode 100644
index 0000000..d970bb5
Binary files /dev/null and b/mods/mapgen/textures/mapgen_leafy_grass.png differ
diff --git a/mods/mapgen/textures/mapgen_leafy_grass_side.png b/mods/mapgen/textures/mapgen_leafy_grass_side.png
new file mode 100644
index 0000000..6832728
Binary files /dev/null and b/mods/mapgen/textures/mapgen_leafy_grass_side.png differ