diff --git a/start/newbieshouse b/start/newbieshouse
index a4f43fac2..c4cb97361 100644
--- a/start/newbieshouse
+++ b/start/newbieshouse
@@ -10,7 +10,7 @@ enter_x 9
 enter_y 4
 msg
 Created:  2003-07-31 Tchize
-Modified: 2008-01-01 Kevin Bulgrien
+Modified: 2008-06-11 Arvid Norlander
 endmsg
 end
 arch dungeon_magic
@@ -303,6 +303,10 @@ arch woodfloor2
 x 1
 y 9
 end
+arch swall_1_4_half
+x 1
+y 9
+end
 arch wwall_2_1_1
 x 1
 y 9
@@ -315,10 +319,6 @@ arch woodfloor2
 x 1
 y 10
 end
-arch swall_1_1
-x 1
-y 10
-end
 arch wwall_2_1_1
 x 1
 y 10
@@ -331,10 +331,6 @@ arch woodfloor2
 x 1
 y 11
 end
-arch swall_1_2
-x 1
-y 11
-end
 arch wwall_2_1_1
 x 1
 y 11
@@ -601,6 +597,12 @@ arch dungeon_magic
 x 2
 y 6
 end
+arch button_small
+x 2
+y 6
+invisible 1
+connected 88
+end
 arch woodfloor2
 x 2
 y 6
@@ -726,6 +728,7 @@ x 2
 y 15
 resist_physical 100
 resist_magic 100
+generator_limit 50
 end
 arch dungeon_magic
 x 2
@@ -987,7 +990,7 @@ arch woodfloor2
 x 3
 y 9
 end
-arch swall_1_4
+arch swall_2_1_2
 x 3
 y 9
 end
@@ -1331,10 +1334,6 @@ arch woodfloor2
 x 4
 y 14
 end
-arch swall_0
-x 4
-y 14
-end
 arch wwall_3_1
 x 4
 y 14
@@ -2406,6 +2405,7 @@ x 7
 y 26
 resist_physical 100
 resist_magic 100
+generator_limit 50
 end
 arch dungeon_magic
 x 7
@@ -2703,10 +2703,6 @@ arch dungeon_magic
 x 9
 y 4
 end
-arch grass_only
-x 9
-y 4
-end
 arch marker
 slaying quest initial training start
 msg
@@ -2717,6 +2713,10 @@ x 9
 y 4
 speed 1.0
 end
+arch grass_only
+x 9
+y 4
+end
 arch dungeon_magic
 x 9
 y 5
@@ -2944,10 +2944,6 @@ arch dungeon_magic
 x 9
 y 28
 end
-arch woodfloor2
-x 9
-y 28
-end
 arch invis_exit
 slaying /start/Nexus
 hp 6
@@ -2955,6 +2951,10 @@ sp 12
 x 9
 y 28
 end
+arch woodfloor2
+x 9
+y 28
+end
 arch dungeon_magic
 x 10
 end
@@ -3209,10 +3209,6 @@ arch dungeon_magic
 x 10
 y 28
 end
-arch woodfloor2
-x 10
-y 28
-end
 arch invis_exit
 slaying /start/Nexus
 hp 6
@@ -3220,6 +3216,10 @@ sp 12
 x 10
 y 28
 end
+arch woodfloor2
+x 10
+y 28
+end
 arch dungeon_magic
 x 11
 end
@@ -3502,10 +3502,6 @@ arch dungeon_magic
 x 11
 y 22
 end
-arch woodfloor2
-x 11
-y 22
-end
 arch creator
 slaying Magical food
 other_arch food
@@ -3514,6 +3510,10 @@ y 22
 connected 11
 lifesave 1
 end
+arch woodfloor2
+x 11
+y 22
+end
 arch dungeon_magic
 x 11
 y 23
@@ -3804,10 +3804,6 @@ arch dungeon_magic
 x 12
 y 21
 end
-arch woodfloor2
-x 12
-y 21
-end
 arch magic_ear
 msg
 @match food
@@ -3817,6 +3813,10 @@ x 12
 y 21
 connected 11
 end
+arch woodfloor2
+x 12
+y 21
+end
 arch dungeon_magic
 x 12
 y 22
@@ -3873,10 +3873,6 @@ arch dungeon_magic
 x 12
 y 26
 end
-arch woodfloor2
-x 12
-y 26
-end
 arch magic_ear
 msg
 @match hello world
@@ -3887,6 +3883,10 @@ x 12
 y 26
 connected 32
 end
+arch woodfloor2
+x 12
+y 26
+end
 arch dungeon_magic
 x 12
 y 27
@@ -4185,10 +4185,6 @@ arch dungeon_magic
 x 13
 y 26
 end
-arch woodfloor2
-x 13
-y 26
-end
 arch magic_mouth
 msg
 say hello world
@@ -4197,6 +4193,10 @@ endmsg
 x 13
 y 26
 end
+arch woodfloor2
+x 13
+y 26
+end
 arch dungeon_magic
 x 13
 y 27