diff --git a/scorn/taverns/goths b/scorn/taverns/goths
index f9bac82aa..7bb1bda03 100644
--- a/scorn/taverns/goths
+++ b/scorn/taverns/goths
@@ -527,6 +527,10 @@ arch woodfloor
 x 1
 y 21
 end
+arch cwall_0
+x 1
+y 21
+end
 arch woodfloor
 x 1
 y 22
@@ -535,50 +539,22 @@ arch woodfloor
 x 1
 y 23
 end
-arch chair_1.1
-x 1
-y 23
-end
-arch woman
-x 1
-y 23
-friendly 1
-end
 arch woodfloor
 x 1
 y 24
 end
-arch woman
-x 1
-y 24
-friendly 1
-end
 arch woodfloor
 x 1
 y 25
 end
-arch chair_1.1
-x 1
-y 25
-end
-arch woman
-x 1
-y 25
-friendly 1
-end
 arch woodfloor
 x 1
 y 26
 end
-arch chair_1.1
+arch cwall_0
 x 1
 y 26
 end
-arch woman
-x 1
-y 26
-friendly 1
-end
 arch woodfloor
 x 1
 y 27
@@ -591,10 +567,6 @@ arch woodfloor
 x 1
 y 29
 end
-arch chair_1.1
-x 1
-y 29
-end
 arch woodfloor
 x 1
 y 30
@@ -603,6 +575,10 @@ arch woodfloor
 x 1
 y 31
 end
+arch cwall_0
+x 1
+y 31
+end
 arch woodfloor
 x 1
 y 32
@@ -788,58 +764,30 @@ arch woodfloor
 x 2
 y 23
 end
-arch table_2
-x 2
-y 23
-end
 arch woodfloor
 x 2
 y 24
 end
-arch table_2
-x 2
-y 24
-end
 arch woodfloor
 x 2
 y 25
 end
-arch table_2
-x 2
-y 25
-end
 arch woodfloor
 x 2
 y 26
 end
-arch table_2
-x 2
-y 26
-end
 arch woodfloor
 x 2
 y 27
 end
-arch table_2
-x 2
-y 27
-end
 arch woodfloor
 x 2
 y 28
 end
-arch table_2
-x 2
-y 28
-end
 arch woodfloor
 x 2
 y 29
 end
-arch table_2
-x 2
-y 29
-end
 arch woodfloor
 x 2
 y 30
@@ -852,7 +800,7 @@ arch woodfloor
 x 2
 y 32
 end
-arch wall_2_1_2
+arch wall_1_3
 x 2
 y 32
 end
@@ -975,66 +923,36 @@ arch woodfloor
 x 3
 y 23
 end
-arch chair_1.2
-x 3
-y 23
-end
-arch man
-x 3
-y 23
-friendly 1
-end
 arch woodfloor
 x 3
 y 24
 end
-arch chair_1.2
-x 3
-y 24
-end
-arch man
-x 3
-y 24
-friendly 1
-end
 arch woodfloor
 x 3
 y 25
 end
-arch chair_1.2
-x 3
-y 25
-end
-arch man
-x 3
-y 25
-friendly 1
-end
 arch woodfloor
 x 3
 y 26
 end
-arch chair_1.2
-x 3
-y 26
-end
-arch man
-x 3
-y 26
-friendly 1
-end
 arch woodfloor
 x 3
 y 27
 end
-arch chair_1.2
-x 3
-y 27
-end
 arch man
+msg
+@match *
+Howdy
+endmsg
 x 3
 y 27
 friendly 1
+unaggressive 0
+arch event_say
+name event_say
+title Python
+slaying /python/IPO/seen.py
+end
 end
 arch woodfloor
 x 3
@@ -1044,10 +962,6 @@ arch woodfloor
 x 3
 y 29
 end
-arch chair_1.2
-x 3
-y 29
-end
 arch woodfloor
 x 3
 y 30
@@ -1060,7 +974,10 @@ arch woodfloor
 x 3
 y 32
 end
-arch wall_2_1_2
+arch oakdoor_2
+slaying /world/world_105_115
+hp 19
+sp 35
 x 3
 y 32
 end
@@ -1162,7 +1079,7 @@ arch woodfloor
 x 4
 y 20
 end
-arch wall_2_1_2
+arch wall_1_3
 x 4
 y 20
 end
@@ -1178,63 +1095,22 @@ arch woodfloor
 x 4
 y 23
 end
-arch chair_1.1
-x 4
-y 23
-end
-arch woman
-x 4
-y 23
-friendly 1
-end
 arch woodfloor
 x 4
 y 24
 end
-arch chair_1.1
-x 4
-y 24
-end
-arch woman
-x 4
-y 24
-friendly 1
-end
 arch woodfloor
 x 4
 y 25
 end
-arch woman
-x 4
-y 25
-friendly 1
-end
 arch woodfloor
 x 4
 y 26
 end
-arch chair_1.1
-x 4
-y 26
-end
-arch woman
-x 4
-y 26
-friendly 1
-end
 arch woodfloor
 x 4
 y 27
 end
-arch chair_1.1
-x 4
-y 27
-end
-arch woman
-x 4
-y 27
-friendly 1
-end
 arch woodfloor
 x 4
 y 28
@@ -1255,7 +1131,7 @@ arch woodfloor
 x 4
 y 32
 end
-arch wall_2_1_2
+arch wall_1_4
 x 4
 y 32
 end
@@ -1360,10 +1236,6 @@ arch woodfloor
 x 5
 y 20
 end
-arch wall_2_1_2
-x 5
-y 20
-end
 arch woodfloor
 x 5
 y 21
@@ -1376,66 +1248,34 @@ arch woodfloor
 x 5
 y 23
 end
-arch table_2
-x 5
-y 23
-end
 arch woodfloor
 x 5
 y 24
 end
-arch table_2
-x 5
-y 24
-end
 arch woodfloor
 x 5
 y 25
 end
-arch table_2
-x 5
-y 25
-end
 arch woodfloor
 x 5
 y 26
 end
-arch table_2
-x 5
-y 26
-end
 arch woodfloor
 x 5
 y 27
 end
-arch table_2
-x 5
-y 27
-end
 arch woodfloor
 x 5
 y 28
 end
-arch table_2
-x 5
-y 28
-end
 arch woodfloor
 x 5
 y 29
 end
-arch table_4
-x 5
-y 29
-end
 arch woodfloor
 x 5
 y 30
 end
-arch altar
-x 5
-y 30
-end
 arch woodfloor
 x 5
 y 31
@@ -1543,10 +1383,6 @@ arch woodfloor
 x 6
 y 20
 end
-arch wall_1_3
-x 6
-y 20
-end
 arch woodfloor
 x 6
 y 21
@@ -1559,50 +1395,18 @@ arch woodfloor
 x 6
 y 23
 end
-arch chair_1.2
-x 6
-y 23
-end
-arch man
-x 6
-y 23
-friendly 1
-end
 arch woodfloor
 x 6
 y 24
 end
-arch man
-x 6
-y 24
-friendly 1
-end
 arch woodfloor
 x 6
 y 25
 end
-arch chair_1.2
-x 6
-y 25
-end
-arch man
-x 6
-y 25
-friendly 1
-end
 arch woodfloor
 x 6
 y 26
 end
-arch chair_1.2
-x 6
-y 26
-end
-arch man
-x 6
-y 26
-friendly 1
-end
 arch woodfloor
 x 6
 y 27
@@ -1611,10 +1415,6 @@ arch woodfloor
 x 6
 y 28
 end
-arch chair_1.2
-x 6
-y 28
-end
 arch woodfloor
 x 6
 y 29
@@ -1627,24 +1427,6 @@ arch woodfloor
 x 6
 y 31
 end
-arch c_man
-msg
-@match job
-We're playing Bingo here!  I am the Bingo Master!
-@match name
-Jack.  Just call me Jack...  A - 3
-@match bingo
-Yes!  A great contest today, I am going to be rich, just look at this crowd!  SUCKERS! ... C - 3
-@match crowd
-Oh, WE HAVE A WINNER, next game in 10 minutes.
-@match *
-B - 5 ... B -
-endmsg
-x 6
-y 31
-friendly 1
-unaggressive 0
-end
 arch woodfloor
 x 6
 y 32
@@ -1758,6 +1540,10 @@ arch woodfloor
 x 7
 y 20
 end
+arch wall_1_4
+x 7
+y 20
+end
 arch woodfloor
 x 7
 y 21
@@ -1770,63 +1556,22 @@ arch woodfloor
 x 7
 y 23
 end
-arch chair_1.1
-x 7
-y 23
-end
-arch woman
-x 7
-y 23
-friendly 1
-end
 arch woodfloor
 x 7
 y 24
 end
-arch chair_1.1
-x 7
-y 24
-end
-arch woman
-x 7
-y 24
-friendly 1
-end
 arch woodfloor
 x 7
 y 25
 end
-arch woman
-x 7
-y 25
-friendly 1
-end
 arch woodfloor
 x 7
 y 26
 end
-arch chair_1.1
-x 7
-y 26
-end
-arch woman
-x 7
-y 26
-friendly 1
-end
 arch woodfloor
 x 7
 y 27
 end
-arch chair_1.1
-x 7
-y 27
-end
-arch woman
-x 7
-y 27
-friendly 1
-end
 arch woodfloor
 x 7
 y 28
@@ -1839,10 +1584,6 @@ arch woodfloor
 x 7
 y 30
 end
-arch chair_1.1
-x 7
-y 30
-end
 arch woodfloor
 x 7
 y 31
@@ -1945,6 +1686,24 @@ arch woodfloor
 x 8
 y 18
 end
+arch check_floor
+hp 1
+x 8
+y 19
+arch event_trigger
+name scorn/GatePassword 0-10>20
+title Python
+slaying /python/quests/QuestAdvance.py
+end
+end
+arch magic_mouth
+msg
+You see some graffiti on the wall.
+It says : The Gate Password is "Chain"
+endmsg
+x 8
+y 19
+end
 arch woodfloor
 x 8
 y 19
@@ -1953,10 +1712,18 @@ arch woodfloor
 x 8
 y 20
 end
+arch wall_2_1_2
+x 8
+y 20
+end
 arch woodfloor
 x 8
 y 21
 end
+arch cwall_0
+x 8
+y 21
+end
 arch woodfloor
 x 8
 y 22
@@ -1965,31 +1732,19 @@ arch woodfloor
 x 8
 y 23
 end
-arch table_2
-x 8
-y 23
-end
 arch woodfloor
 x 8
 y 24
 end
-arch table_2
-x 8
-y 24
-end
 arch woodfloor
 x 8
 y 25
 end
-arch table_2
-x 8
-y 25
-end
 arch woodfloor
 x 8
 y 26
 end
-arch table_2
+arch cwall_0
 x 8
 y 26
 end
@@ -1997,26 +1752,14 @@ arch woodfloor
 x 8
 y 27
 end
-arch table_2
-x 8
-y 27
-end
 arch woodfloor
 x 8
 y 28
 end
-arch table_2
-x 8
-y 28
-end
 arch woodfloor
 x 8
 y 29
 end
-arch table_2
-x 8
-y 29
-end
 arch woodfloor
 x 8
 y 30
@@ -2025,6 +1768,10 @@ arch woodfloor
 x 8
 y 31
 end
+arch cwall_0
+x 8
+y 31
+end
 arch woodfloor
 x 8
 y 32
@@ -2192,7 +1939,7 @@ arch woodfloor
 x 9
 y 20
 end
-arch wall_1_4
+arch wall_3_3
 x 9
 y 20
 end
@@ -2200,105 +1947,72 @@ arch woodfloor
 x 9
 y 21
 end
+arch wall_2_1_1
+x 9
+y 21
+end
 arch woodfloor
 x 9
 y 22
 end
+arch wall_2_1_1
+x 9
+y 22
+end
 arch woodfloor
 x 9
 y 23
 end
-arch chair_1.2
+arch wall_2_1_1
 x 9
 y 23
 end
-arch man
-x 9
-y 23
-friendly 1
-end
 arch woodfloor
 x 9
 y 24
 end
-arch chair_1.2
+arch wall_2_1_1
 x 9
 y 24
 end
-arch man
-x 9
-y 24
-friendly 1
-end
 arch woodfloor
 x 9
 y 25
 end
-arch chair_1.2
+arch wall_2_1_1
 x 9
 y 25
 end
-arch man
-x 9
-y 25
-friendly 1
-end
 arch woodfloor
 x 9
 y 26
 end
-arch man
+arch wall_2_1_1
 x 9
 y 26
-friendly 1
 end
 arch woodfloor
 x 9
 y 27
 end
-arch chair_1.2
+arch wall_2_1_1
 x 9
 y 27
 end
-arch man
-x 9
-y 27
-friendly 1
-end
 arch woodfloor
 x 9
 y 28
 end
-arch man
+arch wall_1_2
+x 9
+y 28
+end
+arch magic_mouth
 msg
-@match mark
-Ya that's me.  Bugger off, I'm on a roll here.
-O 47
-@match amy
-Ya my old lady, she's kind of mad at me right now...
-When I hit it big she'll sing a different tune though.
-@match goose|esmeralda
-Ok, ok, don't hurt me.  I took her.  Don't turn me in.  If you did they'd take the goose for evidence, and then you wouldn't get the reward.
-I hid the that bird at Amy's place.
-@match key|door
-Ok, ok, the key's hidden at Swabbie's house.
-Tell Chancy 'mumblypeg' and he'll fetch it for you.
-@match name
-(mumble) ...tell my... name... (grumble)  Scat!
-@match job
-Look, mate... Isn't it obvious?
-@match *
-Go away, I'm busy.
-N 15
+Cloak Room
 endmsg
 x 9
-y 28
-friendly 1
-arch event_say
-name scorn/taverns/mark.msg
-title Python
-slaying /python/dialog/npc_dialog.py
-end
+y 29
 end
 arch woodfloor
 x 9
@@ -2308,15 +2022,23 @@ arch woodfloor
 x 9
 y 30
 end
+arch wall_1_1
+x 9
+y 30
+end
 arch woodfloor
 x 9
 y 31
 end
+arch wall_2_1_1
+x 9
+y 31
+end
 arch woodfloor
 x 9
 y 32
 end
-arch wall_2_1_2
+arch wall_3_1
 x 9
 y 32
 end
@@ -2530,6 +2252,10 @@ arch woodfloor
 x 10
 y 21
 end
+arch bookshelf_left_close
+x 10
+y 21
+end
 arch woodfloor
 x 10
 y 22
@@ -2538,6 +2264,10 @@ arch woodfloor
 x 10
 y 23
 end
+arch bookshelf_left_close
+x 10
+y 23
+end
 arch woodfloor
 x 10
 y 24
@@ -2546,6 +2276,10 @@ arch woodfloor
 x 10
 y 25
 end
+arch bookshelf_left_close
+x 10
+y 25
+end
 arch woodfloor
 x 10
 y 26
@@ -2554,6 +2288,10 @@ arch woodfloor
 x 10
 y 27
 end
+arch bookshelf_left_close
+x 10
+y 27
+end
 arch woodfloor
 x 10
 y 28
@@ -2570,6 +2308,10 @@ arch woodfloor
 x 10
 y 31
 end
+arch bookshelf_left_close
+x 10
+y 31
+end
 arch woodfloor
 x 10
 y 32
@@ -2713,7 +2455,7 @@ arch woodfloor
 x 11
 y 20
 end
-arch wall_2_2_3
+arch wall_2_1_2
 x 11
 y 20
 end
@@ -2721,95 +2463,51 @@ arch woodfloor
 x 11
 y 21
 end
-arch wall_2_1_1
-x 11
-y 21
-end
 arch woodfloor
 x 11
 y 22
 end
-arch wall_2_1_1
-x 11
-y 22
-end
 arch woodfloor
 x 11
 y 23
 end
-arch wall_2_1_1
-x 11
-y 23
-end
 arch woodfloor
 x 11
 y 24
 end
-arch wall_2_1_1
-x 11
-y 24
-end
 arch woodfloor
 x 11
 y 25
 end
-arch wall_2_1_1
-x 11
-y 25
-end
 arch woodfloor
 x 11
 y 26
 end
-arch wall_2_1_1
-x 11
-y 26
-end
 arch woodfloor
 x 11
 y 27
 end
-arch wall_2_1_1
-x 11
-y 27
-end
 arch woodfloor
 x 11
 y 28
 end
-arch wall_2_1_1
-x 11
-y 28
-end
 arch woodfloor
 x 11
 y 29
 end
-arch wall_2_1_1
-x 11
-y 29
-end
 arch woodfloor
 x 11
 y 30
 end
-arch wall_2_1_1
-x 11
-y 30
-end
 arch woodfloor
 x 11
 y 31
 end
-arch wall_2_1_1
-x 11
-y 31
-end
 arch woodfloor
 x 11
 y 32
 end
-arch wall_3_1
+arch wall_2_1_2
 x 11
 y 32
 end
@@ -2927,10 +2625,18 @@ arch woodfloor
 x 12
 y 20
 end
+arch wall_2_1_2
+x 12
+y 20
+end
 arch woodfloor
 x 12
 y 21
 end
+arch close_dresser2
+x 12
+y 21
+end
 arch woodfloor
 x 12
 y 22
@@ -2939,6 +2645,10 @@ arch woodfloor
 x 12
 y 23
 end
+arch close_dresser2
+x 12
+y 23
+end
 arch woodfloor
 x 12
 y 24
@@ -2947,6 +2657,10 @@ arch woodfloor
 x 12
 y 25
 end
+arch close_dresser2
+x 12
+y 25
+end
 arch woodfloor
 x 12
 y 26
@@ -2955,6 +2669,10 @@ arch woodfloor
 x 12
 y 27
 end
+arch close_dresser2
+x 12
+y 27
+end
 arch woodfloor
 x 12
 y 28
@@ -2963,6 +2681,10 @@ arch woodfloor
 x 12
 y 29
 end
+arch close_dresser2
+x 12
+y 29
+end
 arch woodfloor
 x 12
 y 30
@@ -2971,6 +2693,10 @@ arch woodfloor
 x 12
 y 31
 end
+arch close_dresser2
+x 12
+y 31
+end
 arch woodfloor
 x 12
 y 32
@@ -3097,55 +2823,103 @@ arch woodfloor
 x 13
 y 20
 end
+arch wall_3_3
+x 13
+y 20
+end
 arch woodfloor
 x 13
 y 21
 end
+arch wall_2_1_1
+x 13
+y 21
+end
 arch woodfloor
 x 13
 y 22
 end
+arch wall_2_1_1
+x 13
+y 22
+end
 arch woodfloor
 x 13
 y 23
 end
+arch wall_2_1_1
+x 13
+y 23
+end
 arch woodfloor
 x 13
 y 24
 end
+arch wall_2_1_1
+x 13
+y 24
+end
 arch woodfloor
 x 13
 y 25
 end
+arch wall_2_1_1
+x 13
+y 25
+end
 arch woodfloor
 x 13
 y 26
 end
+arch wall_2_1_1
+x 13
+y 26
+end
 arch woodfloor
 x 13
 y 27
 end
+arch wall_2_1_1
+x 13
+y 27
+end
 arch woodfloor
 x 13
 y 28
 end
+arch wall_2_1_1
+x 13
+y 28
+end
 arch woodfloor
 x 13
 y 29
 end
+arch wall_2_1_1
+x 13
+y 29
+end
 arch woodfloor
 x 13
 y 30
 end
+arch wall_2_1_1
+x 13
+y 30
+end
 arch woodfloor
 x 13
 y 31
 end
+arch wall_2_1_1
+x 13
+y 31
+end
 arch woodfloor
 x 13
 y 32
 end
-arch wall_2_1_2
+arch wall_3_1
 x 13
 y 32
 end
@@ -3305,11 +3079,11 @@ arch woodfloor
 x 14
 y 20
 end
-arch woodfloor
+arch wall_2_1_2
 x 14
-y 21
+y 20
 end
-arch cwall_0
+arch woodfloor
 x 14
 y 21
 end
@@ -3321,23 +3095,51 @@ arch woodfloor
 x 14
 y 23
 end
+arch chair_1.1
+x 14
+y 23
+end
+arch woman
+x 14
+y 23
+friendly 1
+end
 arch woodfloor
 x 14
 y 24
 end
+arch woman
+x 14
+y 24
+friendly 1
+end
 arch woodfloor
 x 14
 y 25
 end
+arch chair_1.1
+x 14
+y 25
+end
+arch woman
+x 14
+y 25
+friendly 1
+end
 arch woodfloor
 x 14
 y 26
 end
-arch woodfloor
+arch chair_1.1
 x 14
-y 27
+y 26
 end
-arch cwall_0
+arch woman
+x 14
+y 26
+friendly 1
+end
+arch woodfloor
 x 14
 y 27
 end
@@ -3349,6 +3151,10 @@ arch woodfloor
 x 14
 y 29
 end
+arch chair_1.1
+x 14
+y 29
+end
 arch woodfloor
 x 14
 y 30
@@ -3506,6 +3312,10 @@ arch woodfloor
 x 15
 y 20
 end
+arch wall_2_1_2
+x 15
+y 20
+end
 arch woodfloor
 x 15
 y 21
@@ -3518,30 +3328,58 @@ arch woodfloor
 x 15
 y 23
 end
+arch table_2
+x 15
+y 23
+end
 arch woodfloor
 x 15
 y 24
 end
+arch table_2
+x 15
+y 24
+end
 arch woodfloor
 x 15
 y 25
 end
+arch table_2
+x 15
+y 25
+end
 arch woodfloor
 x 15
 y 26
 end
+arch table_2
+x 15
+y 26
+end
 arch woodfloor
 x 15
 y 27
 end
+arch table_2
+x 15
+y 27
+end
 arch woodfloor
 x 15
 y 28
 end
+arch table_2
+x 15
+y 28
+end
 arch woodfloor
 x 15
 y 29
 end
+arch table_2
+x 15
+y 29
+end
 arch woodfloor
 x 15
 y 30
@@ -3680,6 +3518,10 @@ arch woodfloor
 x 16
 y 20
 end
+arch wall_2_1_2
+x 16
+y 20
+end
 arch woodfloor
 x 16
 y 21
@@ -3692,36 +3534,66 @@ arch woodfloor
 x 16
 y 23
 end
+arch chair_1.2
+x 16
+y 23
+end
+arch man
+x 16
+y 23
+friendly 1
+end
 arch woodfloor
 x 16
 y 24
 end
+arch chair_1.2
+x 16
+y 24
+end
+arch man
+x 16
+y 24
+friendly 1
+end
 arch woodfloor
 x 16
 y 25
 end
+arch chair_1.2
+x 16
+y 25
+end
+arch man
+x 16
+y 25
+friendly 1
+end
 arch woodfloor
 x 16
 y 26
 end
+arch chair_1.2
+x 16
+y 26
+end
+arch man
+x 16
+y 26
+friendly 1
+end
 arch woodfloor
 x 16
 y 27
 end
+arch chair_1.2
+x 16
+y 27
+end
 arch man
-msg
-@match *
-Howdy
-endmsg
 x 16
 y 27
 friendly 1
-unaggressive 0
-arch event_say
-name event_say
-title Python
-slaying /python/IPO/seen.py
-end
 end
 arch woodfloor
 x 16
@@ -3731,6 +3603,10 @@ arch woodfloor
 x 16
 y 29
 end
+arch chair_1.2
+x 16
+y 29
+end
 arch woodfloor
 x 16
 y 30
@@ -3743,7 +3619,7 @@ arch woodfloor
 x 16
 y 32
 end
-arch wall_1_3
+arch wall_2_1_2
 x 16
 y 32
 end
@@ -3886,6 +3762,10 @@ arch woodfloor
 x 17
 y 20
 end
+arch wall_2_1_2
+x 17
+y 20
+end
 arch woodfloor
 x 17
 y 21
@@ -3898,22 +3778,63 @@ arch woodfloor
 x 17
 y 23
 end
+arch chair_1.1
+x 17
+y 23
+end
+arch woman
+x 17
+y 23
+friendly 1
+end
 arch woodfloor
 x 17
 y 24
 end
+arch chair_1.1
+x 17
+y 24
+end
+arch woman
+x 17
+y 24
+friendly 1
+end
 arch woodfloor
 x 17
 y 25
 end
+arch woman
+x 17
+y 25
+friendly 1
+end
 arch woodfloor
 x 17
 y 26
 end
+arch chair_1.1
+x 17
+y 26
+end
+arch woman
+x 17
+y 26
+friendly 1
+end
 arch woodfloor
 x 17
 y 27
 end
+arch chair_1.1
+x 17
+y 27
+end
+arch woman
+x 17
+y 27
+friendly 1
+end
 arch woodfloor
 x 17
 y 28
@@ -3934,10 +3855,7 @@ arch woodfloor
 x 17
 y 32
 end
-arch oakdoor_2
-slaying /world/world_105_115
-hp 19
-sp 35
+arch wall_2_1_2
 x 17
 y 32
 end
@@ -4073,6 +3991,10 @@ arch woodfloor
 x 18
 y 20
 end
+arch wall_2_1_2
+x 18
+y 20
+end
 arch woodfloor
 x 18
 y 21
@@ -4085,34 +4007,66 @@ arch woodfloor
 x 18
 y 23
 end
+arch table_2
+x 18
+y 23
+end
 arch woodfloor
 x 18
 y 24
 end
+arch table_2
+x 18
+y 24
+end
 arch woodfloor
 x 18
 y 25
 end
+arch table_2
+x 18
+y 25
+end
 arch woodfloor
 x 18
 y 26
 end
+arch table_2
+x 18
+y 26
+end
 arch woodfloor
 x 18
 y 27
 end
+arch table_2
+x 18
+y 27
+end
 arch woodfloor
 x 18
 y 28
 end
+arch table_2
+x 18
+y 28
+end
 arch woodfloor
 x 18
 y 29
 end
+arch table_4
+x 18
+y 29
+end
 arch woodfloor
 x 18
 y 30
 end
+arch altar
+x 18
+y 30
+end
 arch woodfloor
 x 18
 y 31
@@ -4121,10 +4075,7 @@ arch woodfloor
 x 18
 y 32
 end
-arch oakdoor_2
-slaying /world/world_105_115
-hp 19
-sp 35
+arch window_win2
 x 18
 y 32
 end
@@ -4274,6 +4225,10 @@ arch woodfloor
 x 19
 y 20
 end
+arch wall_1_3
+x 19
+y 20
+end
 arch woodfloor
 x 19
 y 21
@@ -4286,18 +4241,50 @@ arch woodfloor
 x 19
 y 23
 end
+arch chair_1.2
+x 19
+y 23
+end
+arch man
+x 19
+y 23
+friendly 1
+end
 arch woodfloor
 x 19
 y 24
 end
+arch man
+x 19
+y 24
+friendly 1
+end
 arch woodfloor
 x 19
 y 25
 end
+arch chair_1.2
+x 19
+y 25
+end
+arch man
+x 19
+y 25
+friendly 1
+end
 arch woodfloor
 x 19
 y 26
 end
+arch chair_1.2
+x 19
+y 26
+end
+arch man
+x 19
+y 26
+friendly 1
+end
 arch woodfloor
 x 19
 y 27
@@ -4306,6 +4293,10 @@ arch woodfloor
 x 19
 y 28
 end
+arch chair_1.2
+x 19
+y 28
+end
 arch woodfloor
 x 19
 y 29
@@ -4318,11 +4309,29 @@ arch woodfloor
 x 19
 y 31
 end
+arch c_man
+msg
+@match job
+We're playing Bingo here!  I am the Bingo Master!
+@match name
+Jack.  Just call me Jack...  A - 3
+@match bingo
+Yes!  A great contest today, I am going to be rich, just look at this crowd!  SUCKERS! ... C - 3
+@match crowd
+Oh, WE HAVE A WINNER, next game in 10 minutes.
+@match *
+B - 5 ... B -
+endmsg
+x 19
+y 31
+friendly 1
+unaggressive 0
+end
 arch woodfloor
 x 19
 y 32
 end
-arch wall_1_4
+arch wall_2_1_2
 x 19
 y 32
 end
@@ -4483,22 +4492,63 @@ arch woodfloor
 x 20
 y 23
 end
+arch chair_1.1
+x 20
+y 23
+end
+arch woman
+x 20
+y 23
+friendly 1
+end
 arch woodfloor
 x 20
 y 24
 end
+arch chair_1.1
+x 20
+y 24
+end
+arch woman
+x 20
+y 24
+friendly 1
+end
 arch woodfloor
 x 20
 y 25
 end
+arch woman
+x 20
+y 25
+friendly 1
+end
 arch woodfloor
 x 20
 y 26
 end
+arch chair_1.1
+x 20
+y 26
+end
+arch woman
+x 20
+y 26
+friendly 1
+end
 arch woodfloor
 x 20
 y 27
 end
+arch chair_1.1
+x 20
+y 27
+end
+arch woman
+x 20
+y 27
+friendly 1
+end
 arch woodfloor
 x 20
 y 28
@@ -4511,6 +4561,10 @@ arch woodfloor
 x 20
 y 30
 end
+arch chair_1.1
+x 20
+y 30
+end
 arch woodfloor
 x 20
 y 31
@@ -4665,10 +4719,6 @@ arch woodfloor
 x 21
 y 21
 end
-arch cwall_0
-x 21
-y 21
-end
 arch woodfloor
 x 21
 y 22
@@ -4677,23 +4727,39 @@ arch woodfloor
 x 21
 y 23
 end
+arch table_2
+x 21
+y 23
+end
 arch woodfloor
 x 21
 y 24
 end
+arch table_2
+x 21
+y 24
+end
 arch woodfloor
 x 21
 y 25
 end
+arch table_2
+x 21
+y 25
+end
 arch woodfloor
 x 21
 y 26
 end
+arch table_2
+x 21
+y 26
+end
 arch woodfloor
 x 21
 y 27
 end
-arch cwall_0
+arch table_2
 x 21
 y 27
 end
@@ -4701,10 +4767,18 @@ arch woodfloor
 x 21
 y 28
 end
+arch table_2
+x 21
+y 28
+end
 arch woodfloor
 x 21
 y 29
 end
+arch table_2
+x 21
+y 29
+end
 arch woodfloor
 x 21
 y 30
@@ -4839,6 +4913,10 @@ arch woodfloor
 x 22
 y 20
 end
+arch wall_1_4
+x 22
+y 20
+end
 arch woodfloor
 x 22
 y 21
@@ -4851,26 +4929,98 @@ arch woodfloor
 x 22
 y 23
 end
+arch chair_1.2
+x 22
+y 23
+end
+arch man
+x 22
+y 23
+friendly 1
+end
 arch woodfloor
 x 22
 y 24
 end
+arch chair_1.2
+x 22
+y 24
+end
+arch man
+x 22
+y 24
+friendly 1
+end
 arch woodfloor
 x 22
 y 25
 end
+arch chair_1.2
+x 22
+y 25
+end
+arch man
+x 22
+y 25
+friendly 1
+end
 arch woodfloor
 x 22
 y 26
 end
+arch man
+x 22
+y 26
+friendly 1
+end
 arch woodfloor
 x 22
 y 27
 end
+arch chair_1.2
+x 22
+y 27
+end
+arch man
+x 22
+y 27
+friendly 1
+end
 arch woodfloor
 x 22
 y 28
 end
+arch man
+msg
+@match mark
+Ya that's me.  Bugger off, I'm on a roll here.
+O 47
+@match amy
+Ya my old lady, she's kind of mad at me right now...
+When I hit it big she'll sing a different tune though.
+@match goose|esmeralda
+Ok, ok, don't hurt me.  I took her.  Don't turn me in.  If you did they'd take the goose for evidence, and then you wouldn't get the reward.
+I hid the that bird at Amy's place.
+@match key|door
+Ok, ok, the key's hidden at Swabbie's house.
+Tell Chancy 'mumblypeg' and he'll fetch it for you.
+@match name
+(mumble) ...tell my... name... (grumble)  Scat!
+@match job
+Look, mate... Isn't it obvious?
+@match *
+Go away, I'm busy.
+N 15
+endmsg
+x 22
+y 28
+friendly 1
+arch event_say
+name scorn/taverns/mark.msg
+title Python
+slaying /python/dialog/npc_dialog.py
+end
+end
 arch woodfloor
 x 22
 y 29
@@ -5019,28 +5169,14 @@ arch woodfloor
 x 23
 y 20
 end
+arch wall_2_1_2
+x 23
+y 20
+end
 arch woodfloor
 x 23
 y 21
 end
-arch check_floor
-hp 1
-x 23
-y 22
-arch event_trigger
-name scorn/GatePassword 0-10>20
-title Python
-slaying /python/quests/QuestAdvance.py
-end
-end
-arch magic_mouth
-msg
-You see some graffiti on the wall.
-It says : The Gate Password is "Chain"
-endmsg
-x 23
-y 22
-end
 arch woodfloor
 x 23
 y 22
@@ -5247,7 +5383,7 @@ arch woodfloor
 x 24
 y 20
 end
-arch wall_2_2_2
+arch wall_3_3
 x 24
 y 20
 end
@@ -6377,7 +6513,7 @@ arch woodfloor
 x 29
 y 32
 end
-arch wall_2_1_2
+arch window_win2
 x 29
 y 32
 end
diff --git a/world/world_105_115 b/world/world_105_115
index 79da5c6a8..8297a06af 100644
--- a/world/world_105_115
+++ b/world/world_105_115
@@ -9,7 +9,7 @@ enter_x 1
 enter_y 1
 msg
 Created:  2001-02-16
-Modified: 2011-08-27 Rick Tanner
+Modified: 2011-09-12 Rick Tanner
 endmsg
 outdoor 1
 tile_path_1 world_105_114
@@ -8692,8 +8692,8 @@ end
 arch l_shop1
 name Goth's Tavern
 slaying /scorn/taverns/goths
-hp 18
-sp 32
+hp 3
+sp 30
 x 19
 y 34
 end