diff --git a/abms.lua b/abms.lua
index 74f195d..a5338ae 100644
--- a/abms.lua
+++ b/abms.lua
@@ -412,7 +412,7 @@ minetest.register_abm({
 		if not mob then
 			return
 		end
-		print('spawning '..name)
+		--print('spawning '..name)
 
 		if mob.hp_max and mob.object and mob.health and mob.damage then
 			local factor = 1 + (math.max(math.abs(pos.x), math.abs(pos.y), math.abs(pos.z)) / 6200)
diff --git a/dungeon.lua b/dungeon.lua
index 4f05135..36ebbd3 100644
--- a/dungeon.lua
+++ b/dungeon.lua
@@ -20,46 +20,31 @@ end
 newnode = fun_caves.clone_node("default:cobble")
 newnode.description = "Dungeon Stone"
 newnode.legacy_mineral = false
-newnode.groups = {dungeon = 1}
+newnode.groups.dungeon = 1
 minetest.register_node("fun_caves:dungeon_floor_1", newnode)
 
 -- dungeon floor, halls
 newnode = fun_caves.clone_node("default:cobble")
 newnode.description = "Dungeon Stone"
 newnode.legacy_mineral = false
-newnode.groups = {dungeon = 1}
+newnode.groups.dungeon = 1
+newnode.drop = 'default:cobble'
 minetest.register_node("fun_caves:dungeon_floor_2", newnode)
 
 -- dungeon walls, basic
 newnode = fun_caves.clone_node("default:cobble")
 newnode.description = "Dungeon Stone"
-newnode.groups = {dungeon = 1}
+newnode.groups.dungeon = 1
+newnode.drop = 'default:cobble'
 minetest.register_node("fun_caves:dungeon_wall_1", newnode)
 
 -- dungeon walls, type 2
 newnode = fun_caves.clone_node("default:cobble")
 newnode.description = "Dungeon Stone"
-newnode.groups = {dungeon = 1}
+newnode.groups.dungeon = 1
+newnode.drop = 'default:cobble'
 minetest.register_node("fun_caves:dungeon_wall_2", newnode)
 
-newnode = fun_caves.clone_node("default:glass")
-newnode.description = "Dungeon Stone"
-newnode.groups = {dungeon = 1}
-minetest.register_node("fun_caves:dungeon_wall_transparent", newnode)
-
-newnode = fun_caves.clone_node("default:glass")
-newnode.description = "Dungeon Stone"
-newnode.groups = {dungeon = 1}
-newnode.tiles = {'fun_caves_blank.png'}
-newnode.pointable = false
-minetest.register_node("fun_caves:dungeon_wall_invisible", newnode)
-
-newnode = fun_caves.clone_node("default:meselamp")
-newnode.description = "Dungeon Light"
-newnode.light_source = 10
-newnode.groups = {dungeon = 1}
-minetest.register_node("fun_caves:dungeon_light", newnode)
-
 
 local treasures = {
 	{'fun_caves:aquamarine', 'fun_caves:garnet', 'fun_caves:zoisite', 'fun_caves:coral_gem', 'fun_caves:moonstone', 'fun_caves:pure_copper', 'fun_caves:sky_iron', 'fun_caves:sky_iron', 'fun_caves:sky_iron', 'fun_caves:sky_iron', 'default:obsidian'},
@@ -174,7 +159,7 @@ fun_caves.dungeon = function(minp_in, maxp_in, data, p2data, area, node, heightm
 				for x = -1, (cell_size * 2) do
 					local ivm = area:index(x + minp.x + center_off, minp.y - 8, z + minp.z + center_off)
 					for y = minp.y - 8, avg do
-						if x == -1 or x == (cell_size * 2) or z == -1 or z == (cell_size * 2) then
+						if y > minp.y - 4 and (x == -1 or x == (cell_size * 2) or z == -1 or z == (cell_size * 2)) then
 							data[ivm] = node['default:cobble']
 						elseif ((x == 2 or x == 9) and z > 1 and z < 10) or ((z == 2 or z == 9) and x > 1 and x < 10) then
 							data[ivm] = node['default:cobble']
diff --git a/mapgen.lua b/mapgen.lua
index 0927d06..8cfbf64 100644
--- a/mapgen.lua
+++ b/mapgen.lua
@@ -429,6 +429,7 @@ local function generate(p_minp, p_maxp, seed)
 			break
 		end
 
+		local biomemap
 		if fun_caves.cavegen and fun_caves.decogen then
 			local h2, write_cave
 			write_cave, h2 = fun_caves.cavegen(minp, maxp, data, area, node, heightmap, underzone, ground_nodes)
@@ -437,7 +438,6 @@ local function generate(p_minp, p_maxp, seed)
 			end
 			write = write or write_cave
 
-			local biomemap
 			if fun_caves.use_bi_hi then
 				biomemap = minetest.get_mapgen_object("biomemap")
 			end