diff --git a/mods/hyrule_mapgen/init.lua b/mods/hyrule_mapgen/init.lua
index 48c2cbc..e1308cb 100644
--- a/mods/hyrule_mapgen/init.lua
+++ b/mods/hyrule_mapgen/init.lua
@@ -151,9 +151,15 @@ sound = false
 
 minetest.register_abm({
 	nodenames = {"default:water_flowing"},
-	interval = 2.0,
-	chance = 2,
+	interval = 3.0,
+	chance = 3,
 	action = function(pos, node, active_object_count, active_object_count_wider)
+	
+	if minetest.find_node_near(pos, 6, {"default:ice"}) and not minetest.find_node_near(pos, 6, {"hyrule_mapgen:lamp_lit", "fire:basic_flame"}) then
+		minetest.set_node(pos, {name="hyrule_mapgen:ice_waterfall"})
+		return
+	end
+	
 		local above = minetest.get_node({x=pos.x, y=pos.y+1, z=pos.z}).name
 		local below = minetest.get_node({x=pos.x, y=pos.y-1, z=pos.z}).name
 		local above2 = minetest.get_node({x=pos.x, y=pos.y+2, z=pos.z}).name
@@ -207,6 +213,36 @@ minetest.register_abm({
 	end
 })
 
+minetest.register_abm({
+	nodenames = {"hyrule_mapgen:ice_waterfall"},
+	interval = 2.0,
+	chance = 2,
+	action = function(pos, node, active_object_count, active_object_count_wider)
+	
+	if minetest.find_node_near(pos, 6, {"fire:basic_flame", "hyrule_mapgen:lamp_lit"}) then
+		minetest.set_node(pos, {name="default:water_flowing"})
+	end
+	--[[
+	minetest.add_particlespawner({
+			amount = 1,
+			time = 2,
+			minpos = {x=pos.x-1.3, y=pos.y+0.3, z=pos.z-1.3},
+			maxpos = {x=pos.x+1.3, y=pos.y+0.9, z=pos.z+1.3},
+			minvel = {x=0, y=0.1, z=0},
+			maxvel = {x=0.1, y=0.3, z=0.1},
+			minacc = {x=0, y=0.1, z=0},
+			maxacc = {x=0.2, y=0.2, z=0.2},
+			minexptime = 0.5,
+			maxexptime = 1,
+			minsize = 12,
+			maxsize = 15,
+			collisiondetection = false,
+			vertical = false,
+			texture = "hyrule_mapgen_mist.png",
+		})]]
+	end
+})
+
 --[[
 minetest.register_abm({
 	nodenames = {"fire:basic_flame"},
@@ -980,6 +1016,15 @@ minetest.register_node("hyrule_mapgen:ice_brick", {
 	sounds = default.node_sound_glass_defaults(),
 })
 
+minetest.register_node("hyrule_mapgen:ice_waterfall", {
+	description = "Frozen Waterfall",
+	drawtype = "glasslike",
+	use_texture_alpha = true,
+	tiles = {"hyrule_mapgen_ice_waterfall.png"},
+	groups = {cracky = 3, cools_lava = 1},
+	sounds = default.node_sound_glass_defaults(),
+})
+
 minetest.register_craft({
 	output = 'hyrule_mapgen:ice_brick',
 	recipe = {
diff --git a/mods/hyrule_mapgen/mapgen.lua b/mods/hyrule_mapgen/mapgen.lua
index 87b7cce..1633904 100644
--- a/mods/hyrule_mapgen/mapgen.lua
+++ b/mods/hyrule_mapgen/mapgen.lua
@@ -1746,21 +1746,17 @@ end)
 
 
 minetest.register_on_newplayer(function(player)
-	if not village_spawned and minetest.get_day_count() == 0 then
 		local name = player:get_player_name()
 		if name == "singleplayer" then
-		minetest.after(1, function()
 		local pos = player:getpos()
-		minetest.place_schematic({x=pos.x-6, y=pos.y-1, z=pos.z-4}, minetest.get_modpath("hyrule_mapgen").."/schematics/cave.mts", 0, {}, true)
 		local obj = minetest.env:add_entity({x=pos.x-2, y=pos.y+1, z=pos.z}, "mobs_npc:npc_custom")
 		local npc = obj:get_luaentity()
 		npc.xdir = 1
 		npc.item = "default:sword_wood"
 		npc.text = "It's dangerous to go alone, take this!"
 		npc.skin = "mobs_npc_old.png"
-		end)
+		minetest.place_schematic({x=pos.x-6, y=pos.y-1, z=pos.z-4}, minetest.get_modpath("hyrule_mapgen").."/schematics/cave.mts", 0, {}, true)
 		end
-	end
 end)
 
 --villages
diff --git a/mods/hyrule_mapgen/schematics/cave2 (2).mts b/mods/hyrule_mapgen/schematics/cave2 (2).mts
new file mode 100644
index 0000000..e35e4db
Binary files /dev/null and b/mods/hyrule_mapgen/schematics/cave2 (2).mts differ
diff --git a/mods/hyrule_mapgen/textures/hyrule_mapgen_ice_waterfall.png b/mods/hyrule_mapgen/textures/hyrule_mapgen_ice_waterfall.png
index e6d611c..7a345e6 100644
Binary files a/mods/hyrule_mapgen/textures/hyrule_mapgen_ice_waterfall.png and b/mods/hyrule_mapgen/textures/hyrule_mapgen_ice_waterfall.png differ
diff --git a/mods/moreplants/init.lua b/mods/moreplants/init.lua
index 6bd3d34..6d06945 100644
--- a/mods/moreplants/init.lua
+++ b/mods/moreplants/init.lua
@@ -749,7 +749,7 @@ minetest.register_node("moreplants:cavefern", {
 	tiles = {
 		"moreplants_cavefern.png",
 	},
-	groups = {snappy=3, flammable=1, attached_node=1, flora=1},
+	groups = {snappy=3, flammable=1, flora=1},
 	sounds = default.node_sound_leaves_defaults(),
 	is_ground_content=true,
 	buildable_to = true, 
@@ -769,7 +769,7 @@ minetest.register_node("moreplants:hangingplant", {
 	tiles = {
 		"moreplants_hanging_plant.png",
 	},
-	groups = {snappy=3, flammable=1, attached_node=1, flora=1},
+	groups = {snappy=3, flammable=1, flora=1},
 	sounds = default.node_sound_leaves_defaults(),
 	is_ground_content=true,
 	buildable_to = true,