diff --git a/README.md b/README.md
index 2d2e5ef..518bc37 100644
--- a/README.md
+++ b/README.md
@@ -9,7 +9,7 @@ The MIT License (MIT)
   
 Witches inhabit the land! They are currently in development but, can already:
 
-* Spawn near wood above ground.
+* Spawn near wood above ground and in their cottages.
   
 * Witches have magic!  They will defend themselves and each other against aggressive players and mobs!
   
@@ -17,9 +17,9 @@ Witches inhabit the land! They are currently in development but, can already:
   
 * New Witch cottage code with no additional mod requirements!
 
-* If protector (or similar) mod is available and enabled, Witches will no build in these areas! 
+* If protector (or similar) mod is available and enabled, Witches will not build in these areas! 
   
-* Some cottages will spawn over a dungeon if they are near the surface
+* Chance of cottage to spawn over a dungeon if they are near the surface.
 
 * Have a name and origin location which they will tell player.
 
diff --git a/changelog b/changelog
index 26df902..7292299 100644
--- a/changelog
+++ b/changelog
@@ -1,3 +1,4 @@
+    2022/02/23: Fixes and formatting
     2022/02/22: Restored Cottages spawning over dungeons (!) and some related settings.
     2022/02/19: Require only default and mobs now, additional checks, cottage generation now optional from game Settings tab > All Settings > Mods > witches
     2022/02/14: Dialog updates
diff --git a/cottages.lua b/cottages.lua
index ed7980a..9ed10b5 100644
--- a/cottages.lua
+++ b/cottages.lua
@@ -1,12 +1,16 @@
 -- this file is copyright (c) 2020 Francisco Athens licensed under the terms of the MIT license
-local witches_dungeon_cellar_chance = math.abs(tonumber(
-                                                   minetest.settings:get(
-                                                       "witches_dungeon_cellar_chance"))) or
-                                          2
-local witches_dungeon_cellar_depth = math.abs(tonumber(
-                                                  minetest.settings:get(
-                                                      "witches_dungeon_cellar_depth"))) or
-                                         5
+local dungeon_cellar_chance = tonumber(minetest.settings:get(
+                                           "witches_dungeon_cellar_chance")) or
+                                  2
+
+local dungeon_cellar_depth_min = tonumber(
+                                     minetest.settings:get(
+                                         "witches_dungeon_cellar_depth_min")) or
+                                     2
+
+local dungeon_cellar_depth_max = tonumber(
+                                     minetest.settings:get(
+                                         "witches_dungeon_cellar_depth")) or 5
 
 local function mts(table)
     local output = minetest.serialize(table)
@@ -34,10 +38,11 @@ minetest.register_on_generated(function(minp, maxp, blockseed)
         witches.debug("dungeon registered of size " .. #dg.dungeon .. " at " ..
                           vector.to_string(cur_dg))
         -- check depth 
-        local mdd = witches_dungeon_cellar_depth or 5 -- max dungeon depth
-        local pos_ck = vector.new(vector.add(cur_dg, vector.new(0, mdd, 0))) -- how close does the dungeon need to be?
-        local pos_alt = vector.new(
-                            vector.add(pos_ck, vector.new(0, mdd + 20, 0))) -- ensure we are measuring above ground
+        local mindd = dungeon_cellar_depth_min or 2
+        local maxdd = dungeon_cellar_depth_max or 5 -- max dungeon depth
+        local pos_ck = vector.new(vector.add(cur_dg, vector.new(0, maxdd, 0))) -- how close does the dungeon need to be?
+        local pos_alt = vector.new(vector.add(pos_ck,
+                                              vector.new(0, maxdd + 20, 0))) -- ensure we are measuring above ground
         local air_check = minetest.find_nodes_in_area(pos_ck, pos_alt, "air")
         if air_check then
             -- print(#air_check.." nodes of air found!")
@@ -50,10 +55,11 @@ minetest.register_on_generated(function(minp, maxp, blockseed)
         witches.debug("current: " .. vector.to_string(cur_dg))
         witches.debug("last: " .. vector.to_string(dungeons[#dungeons]))
         local distance = vector.distance(cur_dg, dungeons[#dungeons])
-        if distance > 50 and air_check and #air_check >= 20 then
+        if distance > 50 and air_check and #air_check >= 20 and #air_check - 20 >
+            mindd then
             -- print("Distance: "..math.round(distance).." new surface dungeon (" ..#dungeons..") found at" ..(vector.to_string(cur_dg)))
-            local surface = vector.new(vector.add(pos_ck, vector.new(0,
-                                                                     20 + mdd -
+            local surface = vector.new(vector.add(pos_ck, vector.new(0, 20 +
+                                                                         maxdd -
                                                                          #air_check,
                                                                      0))) -- dropping the cottage on the surface
 
@@ -61,7 +67,7 @@ minetest.register_on_generated(function(minp, maxp, blockseed)
 
             d_ladder_pos = cur_dg
 
-            if math.random(1, witches_dungeon_cellar_chance) == 1 then
+            if math.random(1, dungeon_cellar_chance) == 1 then
                 witches.place_cottage(surface)
             end
 
@@ -95,17 +101,18 @@ function witches.grounding(pos, vol_vec, required_list, exception_list,
             y = 1,
             z = math.random(5 - r_tweak, 9)
         }
-    pos = vector.round(pos)
-    -- drop checks below sea level, undecided if this is necessary...
-    -- if pos.y < 0 then return end
-    -- local yaw = self.object:get_yaw()
-    -- print(mts(self.object:get_yaw()))
 
     if not pos then
         print("error: grounding failed pos checks")
         return
     end
 
+    pos = vector.round(pos)
+    -- drop checks below sea level, undecided if this is necessary...
+    -- if pos.y < 0 then return end
+    -- local yaw = self.object:get_yaw()
+    -- print(mts(self.object:get_yaw()))
+
     local pos1 = {
         x = pos.x - (area.x / 2),
         y = pos.y - area.y,
@@ -145,12 +152,9 @@ function witches.grounding(pos, vol_vec, required_list, exception_list,
         local ck_volume = {ck_pos1, ck_pos2}
 
         return volume, ck_volume
-
     end
-
 end
 
-local cottage_id = nil
 -- @cottage layout and materials template
 local default_params = {
     -- plan_size =  {x=9, y=7 ,z=9}, --general size not including roof
@@ -172,7 +176,7 @@ local default_params = {
     wall_nodes = {"default:tree", "default:pine_tree", "default:acacia_tree"},
     wall_nodes_ftype = {"wall_wdir"}, -- wall_dir, wall_fdir, wall_wdir
     wall_height = 3,
-    wall_height_add = 2, -- randomly added height variation
+    wall_height_add = 2, -- randomly added height variation to first floor
     window_nodes = {
         "default:fence_wood", "default:fence_pine_wood",
         "default:fence_acacia_wood", "default:fence_junglewood"
@@ -225,7 +229,6 @@ function witches.generate_cottage(pos1, pos2, params, secret_name)
         {x = pos2.x, y = pos1.y, z = pos1.z}
     }
     local upper_corner_nodes = {
-
         {x = pos1.x, y = pos2.y, z = pos1.z},
         {x = pos1.x, y = pos2.y, z = pos2.z},
         {x = pos2.x, y = pos2.y, z = pos2.z},
@@ -245,7 +248,11 @@ function witches.generate_cottage(pos1, pos2, params, secret_name)
     for h = 1, wp.foundation_depth do
         for i = 1, #ucn do
             local pos = {x = ucn[i].x, y = ucn[i].y - h + 1, z = ucn[i].z}
-            minetest.set_node(pos, {
+            -- minetest.set_node(pos, {name = wp.foundation_nodes[math.random(#wp.foundation_nodes)]})
+            local pos_ck = vector.new(pos.x, pos.y - 10, pos.z)
+            local pillars = minetest.find_nodes_in_area(pos, pos_ck,
+                                                        {"group:liquid", "air"})
+            minetest.bulk_set_node(pillars, {
                 name = wp.foundation_nodes[math.random(#wp.foundation_nodes)]
             })
         end
@@ -300,10 +307,14 @@ function witches.generate_cottage(pos1, pos2, params, secret_name)
 
     for h = 1, pcn_height do
         for i = 1, #pcn do
-            local pos = {x = pcn[i].x, y = pcn[i].y + 2 - h, z = pcn[i].z}
-            minetest.set_node(pos, {name = wall_node})
-            minetest.set_node({x = pos.x, y = pos.y - 1, z = pos.z},
-                              {name = root_node})
+            local pos = vector.new(pcn[i].x, pcn[i].y + 2 - h, pcn[i].z)
+            -- minetest.set_node(pos, {name = wall_node})
+            -- minetest.set_node({x = pos.x, y = pos.y - 1, z = pos.z}, {name = root_node})
+            local pos_ck = vector.new(pos.x, pos.y - 10, pos.z)
+            local pillars = minetest.find_nodes_in_area(pos, pos_ck,
+                                                        {"group:liquid", "air"})
+            minetest.bulk_set_node(pillars, {name = wall_node})
+
         end
     end
 
@@ -344,7 +355,11 @@ function witches.generate_cottage(pos1, pos2, params, secret_name)
         -- print("spawning "..tree_var )
         root_pos.y = root_pos.y - 1
         minetest.spawn_tree(tree_pos, tree_var)
-        minetest.set_node(root_pos, {name = root_node})
+        -- minetest.set_node(root_pos, {name = root_node})
+        local pos_ck = vector.new(tree_pos.x, tree_pos.y - 10, tree_pos.z)
+        local roots = minetest.find_nodes_in_area(tree_pos, pos_ck,
+                                                  {"group:liquid", "air"})
+        minetest.bulk_set_node(roots, {name = root_node})
     end
 
     -- first floor!
@@ -750,7 +765,8 @@ function witches.generate_cottage(pos1, pos2, params, secret_name)
                         minetest.set_node(f_pos1, {
                             name = f_name,
                             paramtype2 = "facedir",
-                            param2 = f_facedir1
+                            param2 = f_facedir1,
+                            protected = 1
                         })
 
                         minetest.registered_nodes[f_name].on_construct(f_pos1);
@@ -1240,11 +1256,3 @@ function witches.generate_cottage(pos1, pos2, params, secret_name)
     return l_pos
 end
 
---[[  build the cottage in a defined area
-local function place_cottage(cottage_id, pos1,pos2)
-  if not cottage_id then
-    return
-  end
-
-end
-]] -- 
diff --git a/init.lua b/init.lua
index a98874b..3c89de2 100644
--- a/init.lua
+++ b/init.lua
@@ -4,7 +4,7 @@
 local path = minetest.get_modpath("witches")
 witches = {}
 
-witches.version = "20220222"
+witches.version = "20220223"
 print("This is Witches " .. witches.version .. "!")
 
 -- Strips any kind of escape codes (translation, colors) from a string
diff --git a/settingtypes.txt b/settingtypes.txt
index d2bba79..df4eaf0 100644
--- a/settingtypes.txt
+++ b/settingtypes.txt
@@ -14,6 +14,9 @@ witches_houses_wanted_per_mapchunk (average number of houses to mapchunks over t
 # chance (1 or more) of a witch house spawning over a dungeon 
 witches_dungeon_cellar_chance (chance as 1 in <positive integer>  of a witch house spawning over a dungeon) int 2
 
+# depth (1 or more) minimum depth of a dungeon to spawn a witch house over 
+witches_dungeon_cellar_depth_min (minimum depth of a dungeon to spawn a witch house over) int 2
+
 # depth (5 or more) maximum depth of a dungeon to spawn a witch house over 
 witches_dungeon_cellar_depth (maximum depth of a dungeon to spawn a witch house over) int 5
 
diff --git a/utilities.lua b/utilities.lua
index 126bba4..8e75e78 100644
--- a/utilities.lua
+++ b/utilities.lua
@@ -399,7 +399,7 @@ function witches.claim_witches_chest(self)
                 witches.debug("unbound chest: " .. sn)
                 meta:set_string("owner", self.secret_name)
                 meta:set_string("infotext",
-                                self.secret_name .. "'s sealed chest of " .. sn)
+                                self.secret_name .. "'s sealed chest")
 
                 self.witches_chest = sn
                 self.witches_chest_owner = self.secret_name
diff --git a/witches.lua b/witches.lua
index 3b73e38..e07faf3 100644
--- a/witches.lua
+++ b/witches.lua
@@ -6,7 +6,7 @@ local hair_colors = witches.hair_colors
 local spawning = {
     cottage = {
         nodes = {"group:wood", "default:mossycobble", "default:cobble"},
-        neighbors = {"air", "default:chest", "doors:wood_witch_a"},
+        neighbors = {"air", "default:locked_chest", "doors:wood_witch_a"},
         min_light = 5,
         max_light = 15,
         interval = 30,