diff --git a/mods/mapgen/mapgen.lua b/mods/mapgen/mapgen.lua
index f888f6b..069caf8 100644
--- a/mods/mapgen/mapgen.lua
+++ b/mods/mapgen/mapgen.lua
@@ -1228,18 +1228,6 @@ local function register_dry_grass_decoration(offset, scale, length)
 	})
 end
 
-local register_wild_oat_dry_decoration = function(offset, scale, length)
-	minetest.register_decoration({
-	deco_type = "simple",
-	place_on = {"default:dirt_with_dry_grass"},
-	sidelen = 6,
-	fill_ratio = 0.01,
-	biomes = {"savanna"},
-	decoration = "mapgen:wild_oat_dry",
-	height = 1,
-	})
-end
-
 local function register_jungle_grass_decoration(offset, scale, length)
 	minetest.register_decoration({
 		deco_type = "simple",
@@ -1285,6 +1273,7 @@ end
 
 	-- Apple tree and log
 
+
 	minetest.register_decoration({
 		deco_type = "schematic",
 		place_on = {"default:dirt_with_grass"},
@@ -1502,6 +1491,16 @@ end
 		rotation = "random",
 	})
 
+	--oats
+minetest.register_decoration({
+	deco_type = "simple",
+	place_on = {"default:dirt_with_dry_grass"},
+	sidelen = 6,
+	fill_ratio = 0.01,
+	biomes = {"savanna"},
+	decoration = "mapgen:wild_oat_dry",
+	height = 1,
+})
 	
 	-- Acacia tree and log
 
@@ -2017,6 +2016,27 @@ minetest.register_on_generated(function(minp, maxp)
 					end
 				end
 		end
+		if math.random(1, 20) == 1 then
+			local pos = {x = dirt[n].x, y = dirt[n].y, z = dirt[n].z }
+			local num = math.random(1,2)
+				if minetest.get_node({x=pos.x, y=pos.y+1, z=pos.z}).name == "default:water_source" and minetest.get_node({x=pos.x, y=pos.y+3, z=pos.z}).name ~= "air" then
+					if math.random(1,1) == 1 then
+					minetest.add_node({x=pos.x, y=pos.y+1, z=pos.z}, {name = "mapgen:kelp"..num})
+						if math.random(1,2) == 1 and minetest.get_node({x=pos.x, y=pos.y+4, z=pos.z}).name ~= "air" then
+						minetest.add_node({x=pos.x, y=pos.y+2, z=pos.z}, {name = "mapgen:kelp"..num})
+							if math.random(1,2) == 1 and minetest.get_node({x=pos.x, y=pos.y+5, z=pos.z}).name ~= "air" then
+							minetest.add_node({x=pos.x, y=pos.y+3, z=pos.z}, {name = "mapgen:kelp"..num})
+								if math.random(1,2) == 1 and minetest.get_node({x=pos.x, y=pos.y+6, z=pos.z}).name ~= "air" then
+								minetest.add_node({x=pos.x, y=pos.y+4, z=pos.z}, {name = "mapgen:kelp"..num})
+									if math.random(1,2) == 1 and minetest.get_node({x=pos.x, y=pos.y+7, z=pos.z}).name ~= "air" then
+									minetest.add_node({x=pos.x, y=pos.y+5, z=pos.z}, {name = "mapgen:kelp"..num})
+									end
+								end
+							end
+						end
+					end
+				end
+		end
 	end
 end)
 
diff --git a/mods/mapgen/nodes.lua b/mods/mapgen/nodes.lua
index 0790a6b..459344d 100644
--- a/mods/mapgen/nodes.lua
+++ b/mods/mapgen/nodes.lua
@@ -873,16 +873,6 @@ minetest.register_node("mapgen:dead_grass_5", {
 	end
 })
 
-minetest.register_node("mapgen:stone_with_sea_grass", {
-	description = "Stone With Sea Grass",
-	tiles = {"mapgen_sea_grass.png", "default_stone.png",
-	{name = "default_stone.png^ mapgen_sea_grass_side.png",
-	tileable_vertical = false}},
-	groups = {crumbly = 3, soil = 1, spreading_dirt_type = 1},
-	drop = 'mapgen:stone_with_sea_grass:',
-	sounds = default.node_sound_stone_defaults()
-})
-
 --underwater (WATR01)
 
 minetest.register_node("mapgen:big_coral", {
@@ -981,7 +971,7 @@ minetest.register_node("mapgen:anemone", {
 	walkable = false,
 })
 
-minetest.register_node("mapgen:kelp", {
+minetest.register_node("mapgen:kelp1", {
 	description = "Kelp",
 	drawtype = "plantlike",
 	tiles = {"mapgen_kelp.png"},
@@ -999,7 +989,7 @@ minetest.register_node("mapgen:kelp", {
 	walkable = false,
 })
 
-minetest.register_node("mapgen:kelp_2", {
+minetest.register_node("mapgen:kelp2", {
 	description = "Kelp",
 	drawtype = "plantlike",
 	tiles = {"mapgen_kelp_2.png"},
@@ -1083,6 +1073,16 @@ minetest.register_node("mapgen:seagrass_3", {
 
 --stone (STN02)
 
+minetest.register_node("mapgen:stone_with_sea_grass", {
+	description = "Stone With Sea Grass",
+	tiles = {"mapgen_sea_grass.png", "default_stone.png",
+	{name = "default_stone.png^mapgen_sea_grass_side.png",
+	tileable_vertical = false}},
+	groups = {crumbly = 3, soil = 1, spreading_dirt_type = 1},
+	drop = 'mapgen:stone_with_sea_grass:',
+	sounds = default.node_sound_stone_defaults()
+})
+
 minetest.register_node("mapgen:stone_with_ammonite", {
 	description = "Stone with Ammonite",
 	tiles = {"mapgen_marine_fossil.png"},