diff --git a/scorn/crow/train/train b/scorn/crow/train/train
index 53f272ef7..8afea2e17 100644
--- a/scorn/crow/train/train
+++ b/scorn/crow/train/train
@@ -7,10 +7,10 @@ darkness 3
 width 10
 height 20
 enter_x 4
-enter_y 17
+enter_y 18
 msg
 Created:  2003-06-19 Preston Crow
-Modified: 2008-09-27 Rick Tanner
+Modified: 2008-11-30 Rick Tanner
 endmsg
 end
 arch flagstone
@@ -461,7 +461,7 @@ arch flagstone
 x 3
 y 19
 end
-arch dwall_2_2_1
+arch dwall_1_2
 x 3
 y 19
 end
@@ -565,18 +565,18 @@ arch flagstone
 x 4
 y 18
 end
-arch oakdoor
-slaying /world/world_104_115
-hp 48
-sp 25
-x 4
-y 18
-end
 arch flagstone
 x 4
 y 19
 end
-arch dwall_2_1_2
+arch invis_exit
+slaying /world/world_104_115
+hp 48
+sp 25
+x 4
+y 19
+end
+arch door_2
 x 4
 y 19
 end
@@ -684,18 +684,18 @@ arch flagstone
 x 5
 y 18
 end
-arch oakdoor
-slaying /world/world_104_115
-hp 49
-sp 25
-x 5
-y 18
-end
 arch flagstone
 x 5
 y 19
 end
-arch dwall_2_1_2
+arch invis_exit
+slaying /world/world_104_115
+hp 49
+sp 25
+x 5
+y 19
+end
+arch door_2
 x 5
 y 19
 end
@@ -811,7 +811,7 @@ arch flagstone
 x 6
 y 19
 end
-arch dwall_2_2_4
+arch dwall_1_2
 x 6
 y 19
 end
diff --git a/scorn/mansion/entrance b/scorn/mansion/entrance
index c03d7017a..f7b1260b7 100644
--- a/scorn/mansion/entrance
+++ b/scorn/mansion/entrance
@@ -7,7 +7,7 @@ height 50
 enter_x 14
 msg
 Created:  1994-12-27
-Modified: 2008-09-28 Rick Tanner
+Modified: 2008-11-30 Rick Tanner
 endmsg
 end
 arch woodfloor
@@ -3562,12 +3562,15 @@ end
 arch woodfloor
 x 14
 end
-arch oakdoor
+arch invis_exit
 slaying /world/world_105_115
 hp 19
 sp 40
 x 14
 end
+arch door_2
+x 14
+end
 arch woodfloor
 x 14
 y 1
diff --git a/scorn/shops/scorn.sale1 b/scorn/shops/scorn.sale1
index 2a3864927..2364190d6 100644
--- a/scorn/shops/scorn.sale1
+++ b/scorn/shops/scorn.sale1
@@ -10,7 +10,7 @@ enter_x 10
 enter_y 17
 msg
 Created:  2004-07-01 Gene Alexander
-Modified: 2008-09-29 Rick Tanner
+Modified: 2008-11-30 Rick Tanner
 endmsg
 outdoor 1
 end
@@ -1245,13 +1245,14 @@ arch woodfloor
 x 9
 y 18
 end
-arch dwall_2_1_2
+arch dwall_1_3
 x 9
 y 18
 end
 arch cobblestones2
 x 9
 y 19
+move_block all
 end
 arch woodfloor
 x 10
@@ -1433,27 +1434,25 @@ arch woodfloor
 x 10
 y 17
 end
-arch oakdoor
-slaying /world/world_105_115
-msg
-Thanks for your business!
-endmsg
-hp 1
-sp 32
-x 10
-y 17
-end
 arch woodfloor
 x 10
 y 18
 end
-arch dwall_2_1_2
+arch invis_exit
+slaying /world/world_105_115
+hp 1
+sp 32
+x 10
+y 18
+end
+arch door_2
 x 10
 y 18
 end
 arch cobblestones2
 x 10
 y 19
+move_block all
 end
 arch woodfloor
 x 11
@@ -1595,13 +1594,14 @@ arch woodfloor
 x 11
 y 18
 end
-arch dwall_2_1_2
+arch dwall_1_4
 x 11
 y 18
 end
 arch cobblestones2
 x 11
 y 19
+move_block all
 end
 arch woodfloor
 x 12
diff --git a/scorn/shops/weaponshop b/scorn/shops/weaponshop
index aa155f31b..2c1d3a7d6 100644
--- a/scorn/shops/weaponshop
+++ b/scorn/shops/weaponshop
@@ -7,11 +7,11 @@ shopitems weapon:80;*:-50
 shopmax 3000
 width 16
 height 16
-enter_x 1
+enter_x 2
 enter_y 14
 msg
 Created:  1993-10-15
-Modified: 2008-09-29 Rick Tanner
+Modified: 2008-11-30 Rick Tanner
 endmsg
 end
 arch shop_empty
@@ -195,18 +195,11 @@ arch woodfloor
 x 1
 y 14
 end
-arch oakdoor
-slaying /world/world_104_115
-hp 45
-sp 32
-x 1
-y 14
-end
 arch shop_empty
 x 1
 y 15
 end
-arch wall_2_1_2
+arch wall_1_3
 x 1
 y 15
 end
@@ -292,7 +285,14 @@ arch shop_empty
 x 2
 y 15
 end
-arch wall_2_1_2
+arch invis_exit
+slaying /world/world_104_115
+hp 45
+sp 32
+x 2
+y 15
+end
+arch door_2
 x 2
 y 15
 end
@@ -386,7 +386,7 @@ arch swall_1_2_half
 x 3
 y 15
 end
-arch wall_2_1_2
+arch wall_1_4
 x 3
 y 15
 end