diff --git a/marksel/cellar b/marksel/cellar
index 5916e8a1d..5a782fbec 100644
--- a/marksel/cellar
+++ b/marksel/cellar
@@ -165,10 +165,6 @@ arch dungeon_floor
 x 2
 y 2
 end
-arch dungeon_floor
-x 2
-y 3
-end
 arch magic_mouth
 msg
 Yuck. Don't they clean this place out?
@@ -179,6 +175,10 @@ y 3
 end
 arch dungeon_floor
 x 2
+y 3
+end
+arch dungeon_floor
+x 2
 y 4
 end
 arch barrel
diff --git a/marksel/grumms_inn b/marksel/grumms_inn
index cda1db446..b9581266b 100644
--- a/marksel/grumms_inn
+++ b/marksel/grumms_inn
@@ -70,9 +70,6 @@ end
 arch woodwall_2_2_1
 y 9
 end
-arch grass
-y 10
-end
 arch invis_exit
 slaying /world/world_120_109
 hp 42
@@ -80,7 +77,7 @@ sp 43
 y 10
 end
 arch grass
-y 11
+y 10
 end
 arch invis_exit
 slaying /world/world_120_109
@@ -89,7 +86,7 @@ sp 43
 y 11
 end
 arch grass
-y 12
+y 11
 end
 arch invis_exit
 slaying /world/world_120_109
@@ -98,7 +95,7 @@ sp 43
 y 12
 end
 arch grass
-y 13
+y 12
 end
 arch invis_exit
 slaying /world/world_120_109
@@ -107,12 +104,15 @@ sp 43
 y 13
 end
 arch grass
+y 13
+end
+arch invis_exit
+slaying /world/world_120_109
+hp 42
+sp 43
 y 14
 end
-arch invis_exit
-slaying /world/world_120_109
-hp 42
-sp 43
+arch grass
 y 14
 end
 arch woodfloor2
@@ -210,10 +210,6 @@ arch grass
 x 1
 y 13
 end
-arch grass
-x 1
-y 14
-end
 arch invis_exit
 slaying /world/world_120_109
 hp 42
@@ -221,6 +217,10 @@ sp 43
 x 1
 y 14
 end
+arch grass
+x 1
+y 14
+end
 arch woodfloor2
 x 2
 end
@@ -302,10 +302,6 @@ arch grass
 x 2
 y 13
 end
-arch grass
-x 2
-y 14
-end
 arch invis_exit
 slaying /world/world_120_109
 hp 42
@@ -313,6 +309,10 @@ sp 43
 x 2
 y 14
 end
+arch grass
+x 2
+y 14
+end
 arch woodfloor2
 x 3
 end
@@ -419,10 +419,6 @@ arch grass
 x 3
 y 13
 end
-arch grass
-x 3
-y 14
-end
 arch invis_exit
 slaying /world/world_120_109
 hp 42
@@ -430,6 +426,10 @@ sp 43
 x 3
 y 14
 end
+arch grass
+x 3
+y 14
+end
 arch woodfloor2
 x 4
 end
@@ -535,10 +535,6 @@ arch grass
 x 4
 y 13
 end
-arch grass
-x 4
-y 14
-end
 arch invis_exit
 slaying /world/world_120_109
 hp 42
@@ -546,6 +542,10 @@ sp 43
 x 4
 y 14
 end
+arch grass
+x 4
+y 14
+end
 arch woodfloor2
 x 5
 end
@@ -656,10 +656,6 @@ arch grass
 x 5
 y 13
 end
-arch grass
-x 5
-y 14
-end
 arch invis_exit
 slaying /world/world_120_109
 hp 42
@@ -667,6 +663,10 @@ sp 43
 x 5
 y 14
 end
+arch grass
+x 5
+y 14
+end
 arch woodfloor2
 x 6
 end
@@ -744,10 +744,6 @@ arch small_stones
 x 6
 y 13
 end
-arch grass
-x 6
-y 14
-end
 arch invis_exit
 slaying /world/world_120_109
 hp 42
@@ -755,6 +751,10 @@ sp 43
 x 6
 y 14
 end
+arch grass
+x 6
+y 14
+end
 arch woodfloor2
 x 7
 end
@@ -802,13 +802,12 @@ arch woodfloor2
 x 7
 y 7
 end
-arch woodfloor2
+arch button_small
+connected 1
 x 7
 y 8
 end
-arch button_small
-invisible 1
-connected 1
+arch woodfloor2
 x 7
 y 8
 end
@@ -821,13 +820,12 @@ connected 1
 x 7
 y 9
 end
-arch small_stones
+arch button_small
+connected 1
 x 7
 y 10
 end
-arch button_small
-invisible 1
-connected 1
+arch small_stones
 x 7
 y 10
 end
@@ -843,10 +841,6 @@ arch small_stones
 x 7
 y 13
 end
-arch grass
-x 7
-y 14
-end
 arch invis_exit
 slaying /world/world_120_109
 hp 42
@@ -854,6 +848,10 @@ sp 43
 x 7
 y 14
 end
+arch grass
+x 7
+y 14
+end
 arch woodfloor2
 x 8
 end
@@ -930,10 +928,6 @@ arch small_stones
 x 8
 y 13
 end
-arch grass
-x 8
-y 14
-end
 arch invis_exit
 slaying /world/world_120_109
 hp 42
@@ -941,6 +935,10 @@ sp 43
 x 8
 y 14
 end
+arch grass
+x 8
+y 14
+end
 arch woodfloor2
 x 9
 end
@@ -1024,10 +1022,6 @@ arch grass
 x 9
 y 13
 end
-arch grass
-x 9
-y 14
-end
 arch invis_exit
 slaying /world/world_120_109
 hp 42
@@ -1035,6 +1029,10 @@ sp 43
 x 9
 y 14
 end
+arch grass
+x 9
+y 14
+end
 arch woodfloor2
 x 10
 end
diff --git a/marksel/grumms_inn2 b/marksel/grumms_inn2
index 6a5b77027..033e6869d 100644
--- a/marksel/grumms_inn2
+++ b/marksel/grumms_inn2
@@ -150,13 +150,12 @@ arch woodfloor2
 x 2
 y 1
 end
-arch woodfloor2
+arch button_small
+connected 1
 x 2
 y 2
 end
-arch button_small
-invisible 1
-connected 1
+arch woodfloor2
 x 2
 y 2
 end
@@ -169,28 +168,26 @@ connected 1
 x 2
 y 3
 end
-arch woodfloor2
-x 2
-y 4
-end
 arch button_small
-invisible 1
 connected 1
 x 2
 y 4
 end
 arch woodfloor2
 x 2
-y 5
+y 4
 end
 arch button_small
-invisible 1
 connected 2
 x 2
 y 5
 end
 arch woodfloor2
 x 2
+y 5
+end
+arch woodfloor2
+x 2
 y 6
 end
 arch mdoor_closed_1
@@ -198,13 +195,12 @@ connected 2
 x 2
 y 6
 end
-arch woodfloor2
+arch button_small
+connected 2
 x 2
 y 7
 end
-arch button_small
-invisible 1
-connected 2
+arch woodfloor2
 x 2
 y 7
 end
@@ -704,13 +700,12 @@ arch woodfloor2
 x 10
 y 1
 end
-arch woodfloor2
+arch button_small
+connected 3
 x 10
 y 2
 end
-arch button_small
-invisible 1
-connected 3
+arch woodfloor2
 x 10
 y 2
 end
@@ -723,28 +718,26 @@ connected 3
 x 10
 y 3
 end
-arch woodfloor2
-x 10
-y 4
-end
 arch button_small
-invisible 1
 connected 3
 x 10
 y 4
 end
 arch woodfloor2
 x 10
-y 5
+y 4
 end
 arch button_small
-invisible 1
 connected 4
 x 10
 y 5
 end
 arch woodfloor2
 x 10
+y 5
+end
+arch woodfloor2
+x 10
 y 6
 end
 arch mdoor_closed_1
@@ -752,13 +745,12 @@ connected 4
 x 10
 y 6
 end
-arch woodfloor2
+arch button_small
+connected 4
 x 10
 y 7
 end
-arch button_small
-invisible 1
-connected 4
+arch woodfloor2
 x 10
 y 7
 end
@@ -1230,13 +1222,12 @@ arch woodfloor2
 x 18
 y 4
 end
-arch woodfloor2
+arch button_small
+connected 5
 x 18
 y 5
 end
-arch button_small
-invisible 1
-connected 5
+arch woodfloor2
 x 18
 y 5
 end
@@ -1249,13 +1240,12 @@ connected 5
 x 18
 y 6
 end
-arch woodfloor2
+arch button_small
+connected 5
 x 18
 y 7
 end
-arch button_small
-invisible 1
-connected 5
+arch woodfloor2
 x 18
 y 7
 end
diff --git a/marksel/mines b/marksel/mines
index f181c03fb..f7eb7dde3 100644
--- a/marksel/mines
+++ b/marksel/mines
@@ -446,10 +446,6 @@ arch cave14
 x 5
 y 13
 end
-arch medium_stones
-x 5
-y 14
-end
 arch magic_mouth
 msg
 You hear mumbled curses in dwarvish
@@ -461,6 +457,10 @@ y 14
 end
 arch medium_stones
 x 5
+y 14
+end
+arch medium_stones
+x 5
 y 15
 end
 arch cave16
@@ -1209,10 +1209,6 @@ arch cave4
 x 13
 y 10
 end
-arch medium_stones
-x 13
-y 11
-end
 arch magic_mouth
 msg
 You hear the dwarves singing an old mining
@@ -1224,6 +1220,10 @@ y 11
 end
 arch medium_stones
 x 13
+y 11
+end
+arch medium_stones
+x 13
 y 12
 end
 arch cave2
@@ -1823,10 +1823,6 @@ arch medium_stones
 x 17
 y 7
 end
-arch medium_stones
-x 17
-y 8
-end
 arch magic_mouth
 msg
 A dwarf shouts excitedly, "By the anvil of
@@ -1839,6 +1835,10 @@ y 8
 end
 arch medium_stones
 x 17
+y 8
+end
+arch medium_stones
+x 17
 y 9
 end
 arch medium_stones