diff --git a/scorn/houses/breezy_acres b/scorn/houses/breezy_acres
index ef490b05e..31e52e6f6 100644
--- a/scorn/houses/breezy_acres
+++ b/scorn/houses/breezy_acres
@@ -1084,6 +1084,7 @@ She's a loony,
 we don't have a
 basement.
 endmsg
+randomitems jail
 x 6
 y 20
 end
@@ -1670,17 +1671,6 @@ arch woodfloor
 x 10
 y 17
 end
-arch c_woman
-name Ethil
-msg
-@match *
-I hear something in
-the basement.
-Don't you hear it?
-endmsg
-x 10
-y 17
-end
 arch woodfloor
 x 10
 y 18
@@ -1822,6 +1812,17 @@ arch woodfloor
 x 11
 y 21
 end
+arch c_woman
+name Ethil
+msg
+@match *
+I hear something in
+the basement.
+Don't you hear it?
+endmsg
+x 11
+y 21
+end
 arch woodfloor
 x 11
 y 22
@@ -3255,6 +3256,10 @@ x 21
 y 9
 end
 arch charwoman
+msg
+@match *
+Oooo there's some lovely filth down 'ere.
+endmsg
 x 21
 y 9
 end
diff --git a/scorn/houses/cornerbrook b/scorn/houses/cornerbrook
index ebd12e5da..71230db3d 100644
--- a/scorn/houses/cornerbrook
+++ b/scorn/houses/cornerbrook
@@ -575,12 +575,13 @@ msg
 @match landlord|Witherspoon
 Yes old man Witherspoon is a real slum lord.
 @match move|leave|Move
-Bugs aren't so bad, 
-you should see the other 
+Bugs aren't so bad,
+you should see the other
 slums around here
 @match *
 I told the landlord about the bugs, but he's a tightwad.
 endmsg
+randomitems jail
 monster 0
 stand_still 1
 x 3
@@ -1035,6 +1036,7 @@ msg
 @match *
 Gods! I can't seem to find anything to eat around here!
 endmsg
+randomitems jail
 monster 0
 stand_still 1
 x 6
@@ -2720,6 +2722,7 @@ wise cracks about it.
 I never should have married her.
 I should have stayed at sea.
 endmsg
+randomitems jail
 monster 0
 stand_still 1
 x 17
@@ -2796,9 +2799,17 @@ y 20
 end
 arch woman
 msg
-@match *
+@match staff|Staff|stick|Stick
+You'll know its his because he carved
+his name on it.
+@match father|Father|ear|earhorn
 My father is a bit hard of hearing.
+He lost his earhorn too...
+@match *
+My father lost his walking stick,
+if you find it please bring it back to him.
 endmsg
+randomitems jail
 x 17
 y 20
 end
@@ -3052,6 +3063,7 @@ Said he found a treasure map.
 @match *
 Never marry an old pirate..
 endmsg
+randomitems jail
 monster 0
 unaggressive 1
 x 19
@@ -3370,6 +3382,7 @@ y 9
 end
 arch sheep
 name Chancy
+randomitems jail
 monster 0
 unaggressive 1
 sleep 1
@@ -3437,10 +3450,38 @@ arch woodfloor
 x 21
 y 18
 end
+arch check_inv
+slaying Gramp's walking stick
+connected 5
+last_heal 1
+x 21
+y 18
+end
+arch check_inv
+slaying Gramp's earhorn
+connected 6
+last_heal 1
+x 21
+y 18
+end
 arch woodfloor
 x 21
 y 19
 end
+arch check_inv
+slaying Gramp's walking stick
+connected 5
+last_heal 1
+x 21
+y 19
+end
+arch check_inv
+slaying Gramp's earhorn
+connected 6
+last_heal 1
+x 21
+y 19
+end
 arch woodfloor
 x 21
 y 20
@@ -3602,10 +3643,27 @@ x 22
 y 18
 end
 arch sage
+name Gramps Malone
 msg
+@match staff|Staff|walking|Walking
+Yup lost my walking stick - have ya seen it?
+@match stick|Stick
+Ya say yer sick?  That's a darn shame!
+I get a touch of the wind myself sometimes...
+@match ear|Ear
+You looking for deer?
+Used to be a woodsman myself.
+Try the woods to the east - lots of game there...
+match woods|east
+Don't mumble - out with it now...
 @match *
 Hunn?  Speak up there!
 endmsg
+randomitems jail
+level 2
+can_cast_spell 0
+monster 0
+stand_still 1
 x 22
 y 18
 end
@@ -3613,6 +3671,35 @@ arch woodfloor
 x 22
 y 19
 end
+arch magic_mouth
+msg
+You found my staff, thanks.
+Heres a little something for you.
+Don't spend it all on sweets now.
+endmsg
+connected 5
+walk_on 0
+fly_on 0
+food 1
+x 22
+y 19
+end
+arch magic_mouth
+msg
+My horn!  Thanks.
+Here's a little spending money for your trouble.
+Now I can hear again.
+....err drat now she'll be gabbin
+at me all day.  Maybe I better hide
+it again...
+endmsg
+connected 6
+walk_on 0
+fly_on 0
+food 1
+x 22
+y 19
+end
 arch woodfloor
 x 22
 y 20
@@ -3980,6 +4067,32 @@ x 24
 y 21
 end
 arch teleporter
+hp 20
+sp 18
+connected 6
+speed 0.0
+x 24
+y 22
+end
+arch gem
+nrof 3
+x 24
+y 22
+end
+arch teleporter
+hp 20
+sp 18
+connected 5
+speed 0.0
+x 24
+y 23
+end
+arch gem
+nrof 2
+x 24
+y 23
+end
+arch teleporter
 hp 22
 sp 1
 connected 6
diff --git a/scorn/houses/riverside_manor b/scorn/houses/riverside_manor
index 74edec3d6..0d04cd4b1 100644
--- a/scorn/houses/riverside_manor
+++ b/scorn/houses/riverside_manor
@@ -495,6 +495,17 @@ arch woodfloor
 x 2
 y 21
 end
+arch quarterstaff
+name Gramp's walking stick
+msg
+This staff says:
+Prpty of G Malone - hands off.
+endmsg
+type 21
+slaying Gramp's walking stick
+x 2
+y 21
+end
 arch table_3
 x 2
 y 21
@@ -582,6 +593,7 @@ msg
 @match *
 eeeek!  I think I saw a mouse.
 endmsg
+randomitems jail
 x 3
 y 7
 end
@@ -1098,9 +1110,16 @@ Otherwise he's a bum.
 She runs the place for that rat Witherspoon.
 @match Witherspoon|rat
 Witherspoon owns all these slum..er 'condos'.
+@match Gramps|gramps|Malone|Staff|staff
+Ya ol Gramps Malone is right duffer.
+Plays a good game of orc knuckles.
+I think he left his walking stick here
+last time he came round.
+Think it's under the table...
 @match *
 Darn bird keeps me awake all night...
 endmsg
+randomitems jail
 x 6
 y 21
 end
@@ -2341,6 +2360,7 @@ Mark always keeps the key to that door with him.
 @match *
 Whatda want?
 endmsg
+randomitems jail
 x 14
 y 15
 end
diff --git a/scorn/taverns/barking_mule b/scorn/taverns/barking_mule
index c67420e20..d9363491c 100644
--- a/scorn/taverns/barking_mule
+++ b/scorn/taverns/barking_mule
@@ -6,22 +6,17 @@ CF Java Map Editor
 Date:    4/27/2003
 endmsg
 width 24
-height 16
+height 17
+end
+arch grass
+end
+arch grass
+y 1
 end
 arch woodfloor
+y 2
 end
 arch wall_2_2_2
-end
-arch woodfloor
-y 1
-end
-arch wall_2_1_1
-y 1
-end
-arch woodfloor
-y 2
-end
-arch wall_2_1_1
 y 2
 end
 arch woodfloor
@@ -33,19 +28,19 @@ end
 arch woodfloor
 y 4
 end
+arch wall_2_1_1
+y 4
+end
+arch woodfloor
+y 5
+end
+arch wall_2_1_1
+y 5
+end
+arch woodfloor
+y 6
+end
 arch wall_3_2
-y 4
-end
-arch woodfloor
-y 5
-end
-arch wall_2_1_1
-y 5
-end
-arch woodfloor
-y 6
-end
-arch wall_2_1_1
 y 6
 end
 arch woodfloor
@@ -57,37 +52,64 @@ end
 arch woodfloor
 y 8
 end
-arch wall_2_2_1
+arch wall_2_1_1
 y 8
 end
-arch grass
+arch woodfloor
 y 9
 end
-arch grass
+arch wall_2_1_1
+y 9
+end
+arch woodfloor
+y 10
+end
+arch wall_3_2
 y 10
 end
 arch grass
 y 11
 end
+arch wall_2_1_1
+y 11
+end
 arch grass
 y 12
 end
+arch wall_2_1_1
+y 12
+end
 arch grass
 y 13
 end
+arch wall_2_1_1
+y 13
+end
 arch grass
 y 14
 end
+arch wall_2_1_1
+y 14
+end
 arch grass
 y 15
 end
-arch woodfloor
+arch wall_2_1_1
+y 15
+end
+arch grass
+y 16
+end
+arch wall_2_2_1
+y 16
+end
+arch grass
 x 1
 end
-arch wall_2_1_2
+arch faerie_dragon
 x 1
 end
-arch woodfloor
+arch grass
 x 1
 y 1
 end
@@ -95,30 +117,34 @@ arch woodfloor
 x 1
 y 2
 end
+arch wall_2_1_2
+x 1
+y 2
+end
 arch woodfloor
 x 1
 y 3
 end
+arch woodfloor
+x 1
+y 4
+end
+arch woodfloor
+x 1
+y 5
+end
 arch barrel
 x 1
-y 3
-end
-arch woodfloor
-x 1
-y 4
-end
-arch wall_1_3
-x 1
-y 4
-end
-arch woodfloor
-x 1
 y 5
 end
 arch woodfloor
 x 1
 y 6
 end
+arch wall_1_3
+x 1
+y 6
+end
 arch woodfloor
 x 1
 y 7
@@ -127,15 +153,15 @@ arch woodfloor
 x 1
 y 8
 end
-arch wall_2_1_2
-x 1
-y 8
-end
-arch grass
+arch woodfloor
 x 1
 y 9
 end
-arch grass
+arch woodfloor
+x 1
+y 10
+end
+arch wall_1_3
 x 1
 y 10
 end
@@ -143,14 +169,26 @@ arch grass
 x 1
 y 11
 end
+arch barrel
+x 1
+y 11
+end
 arch grass
 x 1
 y 12
 end
+arch barrel
+x 1
+y 12
+end
 arch grass
 x 1
 y 13
 end
+arch workbench
+x 1
+y 13
+end
 arch grass
 x 1
 y 14
@@ -159,13 +197,18 @@ arch grass
 x 1
 y 15
 end
-arch woodfloor
-x 2
+arch grass
+x 1
+y 16
 end
 arch wall_2_1_2
+x 1
+y 16
+end
+arch grass
 x 2
 end
-arch woodfloor
+arch grass
 x 2
 y 1
 end
@@ -173,6 +216,10 @@ arch woodfloor
 x 2
 y 2
 end
+arch wall_2_1_2
+x 2
+y 2
+end
 arch woodfloor
 x 2
 y 3
@@ -185,27 +232,44 @@ arch woodfloor
 x 2
 y 5
 end
+arch button_small
+invisible 1
+connected 4
+x 2
+y 5
+end
 arch woodfloor
 x 2
 y 6
 end
+arch mdoor_closed_1
+connected 4
+x 2
+y 6
+end
 arch woodfloor
 x 2
 y 7
 end
+arch button_small
+invisible 1
+connected 4
+x 2
+y 7
+end
 arch woodfloor
 x 2
 y 8
 end
-arch wall_2_1_2
-x 2
-y 8
-end
-arch grass
+arch woodfloor
 x 2
 y 9
 end
-arch grass
+arch woodfloor
+x 2
+y 10
+end
+arch door_2
 x 2
 y 10
 end
@@ -217,6 +281,10 @@ arch grass
 x 2
 y 12
 end
+arch barrel
+x 2
+y 12
+end
 arch grass
 x 2
 y 13
@@ -225,47 +293,79 @@ arch grass
 x 2
 y 14
 end
+arch barrel
+x 2
+y 14
+end
 arch grass
 x 2
 y 15
 end
+arch horn2
+name Gramps' earhorn
+type 21
+slaying Gramp's earhorn
+x 2
+y 15
+end
+arch barrel
+x 2
+y 15
+end
+arch grass
+x 2
+y 16
+end
+arch wall_2_1_2
+x 2
+y 16
+end
+arch grass
+x 3
+end
+arch grass
+x 3
+y 1
+end
 arch woodfloor
 x 3
+y 2
 end
 arch wall_2_1_2
 x 3
+y 2
 end
 arch woodfloor
 x 3
-y 1
+y 3
 end
 arch stove
 is_cauldron 0
 x 3
-y 1
-end
-arch woodfloor
-x 3
-y 2
-end
-arch woodfloor
-x 3
 y 3
 end
+arch woodfloor
+x 3
+y 4
+end
+arch woodfloor
+x 3
+y 5
+end
 arch woman
 name Fran
 msg
-@match mark|Mark
+@match mark
 That bum, all this time he had a girl on the side.
 Too bad he was coming into some coin too...
 Some deal with that bird of his.
-@match Oled|oled
+@match Oled
 He's ok to work for, but he's a pincher if you know what I mean.
 He's usually pretty mellow, but lately he seems a bit tense.
 @match pincher
 You try it an I'll deck you I says to him...
-@match bird|bird
-Ya I heard he stole a goose.
+@match bird|goose
+Ya I heard Mark stole a goose.
 @match who|who
 Your pretty nosey there fella.
 @match service|order
@@ -276,26 +376,19 @@ Ya I work part time at Oled's Cafe too.
 Hey kitchen is off limits!
 Keep it in your scabbard and take a seat there chum.
 endmsg
+randomitems jail
 stand_still 1
 x 3
-y 3
-end
-arch woodfloor
-x 3
-y 4
-end
-arch wall_1_4
-x 3
-y 4
-end
-arch woodfloor
-x 3
 y 5
 end
 arch woodfloor
 x 3
 y 6
 end
+arch wall_1_4
+x 3
+y 6
+end
 arch woodfloor
 x 3
 y 7
@@ -304,15 +397,15 @@ arch woodfloor
 x 3
 y 8
 end
-arch wall_2_1_2
-x 3
-y 8
-end
-arch grass
+arch woodfloor
 x 3
 y 9
 end
-arch grass
+arch woodfloor
+x 3
+y 10
+end
+arch wall_2_2_2
 x 3
 y 10
 end
@@ -320,14 +413,26 @@ arch grass
 x 3
 y 11
 end
+arch wall_2_1_1
+x 3
+y 11
+end
 arch grass
 x 3
 y 12
 end
+arch wall_2_1_1
+x 3
+y 12
+end
 arch grass
 x 3
 y 13
 end
+arch wall_2_2_1
+x 3
+y 13
+end
 arch grass
 x 3
 y 14
@@ -336,47 +441,48 @@ arch grass
 x 3
 y 15
 end
+arch grass
+x 3
+y 16
+end
+arch wall_2_1_2
+x 3
+y 16
+end
+arch grass
+x 4
+end
+arch grass
+x 4
+y 1
+end
 arch woodfloor
 x 4
+y 2
 end
 arch wall_2_1_2
 x 4
+y 2
 end
 arch blocked
 blocksview 0
 x 4
-y 1
+y 3
 end
 arch woodfloor
 x 4
-y 1
+y 3
 end
 arch stove
 is_cauldron 0
 x 4
-y 1
-end
-arch woodfloor
-x 4
-y 2
-end
-arch wall_1_1
-x 4
-y 2
-end
-arch woodfloor
-x 4
-y 3
-end
-arch wall_2_1_1
-x 4
 y 3
 end
 arch woodfloor
 x 4
 y 4
 end
-arch wall_2_2_4
+arch wall_1_1
 x 4
 y 4
 end
@@ -384,10 +490,18 @@ arch woodfloor
 x 4
 y 5
 end
+arch wall_2_1_1
+x 4
+y 5
+end
 arch woodfloor
 x 4
 y 6
 end
+arch wall_2_2_4
+x 4
+y 6
+end
 arch woodfloor
 x 4
 y 7
@@ -396,15 +510,15 @@ arch woodfloor
 x 4
 y 8
 end
-arch window_win2
-x 4
-y 8
-end
-arch grass
+arch woodfloor
 x 4
 y 9
 end
-arch grass
+arch woodfloor
+x 4
+y 10
+end
+arch wall_2_1_2
 x 4
 y 10
 end
@@ -412,7 +526,7 @@ arch grass
 x 4
 y 11
 end
-arch grass
+arch evergreen
 x 4
 y 12
 end
@@ -420,21 +534,38 @@ arch grass
 x 4
 y 13
 end
+arch wall_2_2_3
+x 4
+y 13
+end
 arch grass
 x 4
 y 14
 end
+arch wall_2_1_1
+x 4
+y 14
+end
 arch grass
 x 4
 y 15
 end
-arch woodfloor
+arch wall_2_1_1
+x 4
+y 15
+end
+arch grass
+x 4
+y 16
+end
+arch wall_2_2_4
+x 4
+y 16
+end
+arch grass
 x 5
 end
-arch wall_2_1_2
-x 5
-end
-arch woodfloor
+arch grass
 x 5
 y 1
 end
@@ -442,17 +573,21 @@ arch woodfloor
 x 5
 y 2
 end
+arch wall_2_1_2
+x 5
+y 2
+end
+arch woodfloor
+x 5
+y 3
+end
+arch woodfloor
+x 5
+y 4
+end
 arch longtable_1_4
 no_pass 1
 x 5
-y 2
-end
-arch woodfloor
-x 5
-y 3
-end
-arch woodfloor
-x 5
 y 4
 end
 arch woodfloor
@@ -471,15 +606,15 @@ arch woodfloor
 x 5
 y 8
 end
-arch wall_2_1_2
-x 5
-y 8
-end
-arch grass
+arch woodfloor
 x 5
 y 9
 end
-arch grass
+arch woodfloor
+x 5
+y 10
+end
+arch window_win2
 x 5
 y 10
 end
@@ -503,15 +638,28 @@ arch grass
 x 5
 y 15
 end
+arch grass
+x 5
+y 16
+end
+arch grass
+x 6
+end
+arch grass
+x 6
+y 1
+end
 arch woodfloor
 x 6
+y 2
 end
 arch wall_2_1_2
 x 6
+y 2
 end
 arch woodfloor
 x 6
-y 1
+y 3
 end
 arch merchant
 name Jagger
@@ -524,73 +672,65 @@ I don't take credit.
 endmsg
 stand_still 1
 x 6
-y 1
-end
-arch woodfloor
-x 6
-y 2
-end
-arch longtable_2_1_2
-no_pass 1
-x 6
-y 2
-end
-arch woodfloor
-x 6
-y 3
-end
-arch booze_table
-slaying money
-food 30
-invisible 1
-x 6
-y 3
-end
-arch chair_1.3
-x 6
 y 3
 end
 arch woodfloor
 x 6
 y 4
 end
+arch longtable_2_1_2
+no_pass 1
+x 6
+y 4
+end
 arch woodfloor
 x 6
 y 5
 end
+arch booze_table
+slaying money
+food 30
+invisible 1
+x 6
+y 5
+end
+arch chair_1.3
+x 6
+y 5
+end
+arch woodfloor
+x 6
+y 6
+end
+arch woodfloor
+x 6
+y 7
+end
 arch chair_1.4
 x 6
-y 5
-end
-arch woodfloor
-x 6
-y 6
-end
-arch woodfloor
-x 6
 y 7
 end
 arch woodfloor
 x 6
 y 8
 end
-arch wall_2_1_2
-x 6
-y 8
-end
-arch brush
+arch woodfloor
 x 6
 y 9
 end
-arch barrel
-x 6
-y 9
-end
-arch grass
+arch woodfloor
 x 6
 y 10
 end
-arch grass
+arch wall_2_1_2
+x 6
+y 10
+end
+arch brush
+x 6
+y 11
+end
+arch barrel
 x 6
 y 11
 end
@@ -606,21 +746,22 @@ arch grass
 x 6
 y 14
 end
-arch grass
+arch evergreen
 x 6
 y 15
 end
-arch woodfloor
+arch grass
+x 6
+y 16
+end
+arch grass
 x 7
 end
-arch wall_2_1_2
-x 7
-end
-arch woodfloor
+arch grass
 x 7
 y 1
 end
-arch light4
+arch mover_7
 x 7
 y 1
 end
@@ -628,8 +769,7 @@ arch woodfloor
 x 7
 y 2
 end
-arch longtable_2_1_2
-no_pass 1
+arch wall_2_1_2
 x 7
 y 2
 end
@@ -637,34 +777,31 @@ arch woodfloor
 x 7
 y 3
 end
+arch light4
+x 7
+y 3
+end
+arch woodfloor
+x 7
+y 4
+end
+arch longtable_2_1_2
+no_pass 1
+x 7
+y 4
+end
+arch woodfloor
+x 7
+y 5
+end
 arch booze_table
 slaying money
 food 30
 invisible 1
 x 7
-y 3
-end
-arch chair_1.3
-x 7
-y 3
-end
-arch woodfloor
-x 7
-y 4
-end
-arch wall_0
-x 7
-y 4
-end
-arch light4
-x 7
-y 4
-end
-arch woodfloor
-x 7
 y 5
 end
-arch table_3
+arch chair_1.3
 x 7
 y 5
 end
@@ -672,54 +809,66 @@ arch woodfloor
 x 7
 y 6
 end
+arch wall_0
+x 7
+y 6
+end
+arch light4
+x 7
+y 6
+end
 arch woodfloor
 x 7
 y 7
 end
+arch table_3
+x 7
+y 7
+end
+arch woodfloor
+x 7
+y 8
+end
+arch woodfloor
+x 7
+y 9
+end
 arch wall_1_1
 x 7
-y 7
+y 9
 end
 arch woodfloor
 x 7
-y 8
+y 10
 end
 arch wall_3_4
 x 7
-y 8
+y 10
 end
 arch woodfloor
 x 7
-y 9
+y 11
 end
 arch wall_2_1_1
 x 7
-y 9
+y 11
 end
 arch woodfloor
 x 7
-y 10
+y 12
 end
 arch wall_2_2_1
 x 7
-y 10
-end
-arch grass
-x 7
-y 11
-end
-arch lamppost
-x 7
-y 11
-end
-arch grass
-x 7
 y 12
 end
 arch grass
 x 7
 y 13
 end
+arch lamppost
+x 7
+y 13
+end
 arch grass
 x 7
 y 14
@@ -728,52 +877,57 @@ arch grass
 x 7
 y 15
 end
+arch grass
+x 7
+y 16
+end
+arch grass
+x 8
+end
+arch grass
+x 8
+y 1
+end
 arch woodfloor
 x 8
+y 2
 end
 arch wall_2_1_2
 x 8
+y 2
 end
 arch woodfloor
 x 8
-y 1
+y 3
 end
 arch longtable_1_1
 no_pass 1
 x 8
-y 1
+y 3
 end
 arch woodfloor
 x 8
-y 2
+y 4
 end
 arch longtable_2_2_4
 no_pass 1
 x 8
-y 2
-end
-arch woodfloor
-x 8
-y 3
-end
-arch woodfloor
-x 8
 y 4
 end
 arch woodfloor
 x 8
 y 5
 end
+arch woodfloor
+x 8
+y 6
+end
+arch woodfloor
+x 8
+y 7
+end
 arch chair_1.2
 x 8
-y 5
-end
-arch woodfloor
-x 8
-y 6
-end
-arch woodfloor
-x 8
 y 7
 end
 arch woodfloor
@@ -788,15 +942,15 @@ arch woodfloor
 x 8
 y 10
 end
-arch wall_2_1_2
-x 8
-y 10
-end
-arch grass
+arch woodfloor
 x 8
 y 11
 end
-arch grass
+arch woodfloor
+x 8
+y 12
+end
+arch wall_2_1_2
 x 8
 y 12
 end
@@ -812,13 +966,30 @@ arch grass
 x 8
 y 15
 end
-arch woodfloor
+arch grass
+x 8
+y 16
+end
+arch grass
 x 9
 end
-arch wall_2_1_2
+arch elf_man
+name Celebrity lookalike
+face spock.111
+msg
+@match *
+Some guy named Avion paid
+me 30 gold to stand here
+and look busy...
+endmsg
+animation spock
 x 9
 end
-arch woodfloor
+arch grass
+x 9
+y 1
+end
+arch mover_7
 x 9
 y 1
 end
@@ -826,6 +997,10 @@ arch woodfloor
 x 9
 y 2
 end
+arch wall_2_1_2
+x 9
+y 2
+end
 arch woodfloor
 x 9
 y 3
@@ -854,57 +1029,61 @@ arch woodfloor
 x 9
 y 9
 end
+arch woodfloor
+x 9
+y 10
+end
+arch woodfloor
+x 9
+y 11
+end
 arch button_small
 invisible 1
 connected 1
 x 9
-y 9
+y 11
 end
 arch woodfloor
 x 9
-y 10
+y 12
 end
 arch wall_1_3
 x 9
-y 10
+y 12
 end
 arch flagstone
 x 9
-y 11
+y 13
 end
 arch button_small
 invisible 1
 connected 1
 x 9
-y 11
-end
-arch flagstone
-x 9
-y 12
-end
-arch flagstone
-x 9
 y 13
 end
 arch flagstone
 x 9
 y 14
 end
-arch grass
+arch flagstone
 x 9
 y 15
 end
-arch woodfloor
+arch grass
+x 9
+y 16
+end
+arch grass
 x 10
 end
-arch wall_2_1_2
+arch pixie
 x 10
 end
-arch woodfloor
+arch grass
 x 10
 y 1
 end
-arch chair_1.4
+arch mover_7
 x 10
 y 1
 end
@@ -912,16 +1091,20 @@ arch woodfloor
 x 10
 y 2
 end
+arch wall_2_1_2
+x 10
+y 2
+end
 arch woodfloor
 x 10
 y 3
 end
-arch woodfloor
-x 10
-y 4
-end
 arch chair_1.4
 x 10
+y 3
+end
+arch woodfloor
+x 10
 y 4
 end
 arch woodfloor
@@ -932,6 +1115,10 @@ arch woodfloor
 x 10
 y 6
 end
+arch chair_1.4
+x 10
+y 6
+end
 arch woodfloor
 x 10
 y 7
@@ -944,58 +1131,59 @@ arch woodfloor
 x 10
 y 9
 end
+arch woodfloor
+x 10
+y 10
+end
+arch woodfloor
+x 10
+y 11
+end
 arch button_small
 invisible 1
 connected 1
 x 10
-y 9
+y 11
 end
 arch woodfloor
 x 10
-y 10
+y 12
 end
 arch mdoor_closed_1
 connected 1
 x 10
-y 10
+y 12
 end
 arch flagstone
 x 10
-y 11
+y 13
 end
 arch button_small
 invisible 1
 connected 1
 x 10
-y 11
-end
-arch flagstone
-x 10
-y 12
-end
-arch flagstone
-x 10
 y 13
 end
 arch flagstone
 x 10
 y 14
 end
-arch grass
+arch flagstone
 x 10
 y 15
 end
-arch woodfloor
+arch grass
+x 10
+y 16
+end
+arch grass
 x 11
 end
-arch wall_2_1_2
-x 11
-end
-arch woodfloor
+arch grass
 x 11
 y 1
 end
-arch table_3
+arch mover_7
 x 11
 y 1
 end
@@ -1003,97 +1191,110 @@ arch woodfloor
 x 11
 y 2
 end
-arch woodfloor
+arch wall_2_1_2
 x 11
-y 3
-end
-arch chair_1.1
-x 11
-y 3
+y 2
 end
 arch woodfloor
 x 11
-y 4
+y 3
 end
 arch table_3
 x 11
+y 3
+end
+arch woodfloor
+x 11
 y 4
 end
 arch woodfloor
 x 11
 y 5
 end
+arch chair_1.1
+x 11
+y 5
+end
 arch woodfloor
 x 11
 y 6
 end
+arch table_3
+x 11
+y 6
+end
 arch woodfloor
 x 11
 y 7
 end
+arch woodfloor
+x 11
+y 8
+end
+arch woodfloor
+x 11
+y 9
+end
 arch light4
 x 11
-y 7
-end
-arch woodfloor
-x 11
-y 8
-end
-arch woodfloor
-x 11
-y 9
-end
-arch button_small
-invisible 1
-connected 1
-x 11
 y 9
 end
 arch woodfloor
 x 11
 y 10
 end
+arch woodfloor
+x 11
+y 11
+end
+arch button_small
+invisible 1
+connected 1
+x 11
+y 11
+end
+arch woodfloor
+x 11
+y 12
+end
 arch wall_1_4
 x 11
-y 10
+y 12
 end
 arch flagstone
 x 11
-y 11
+y 13
 end
 arch button_small
 invisible 1
 connected 1
 x 11
-y 11
-end
-arch flagstone
-x 11
-y 12
-end
-arch flagstone
-x 11
 y 13
 end
 arch flagstone
 x 11
 y 14
 end
-arch grass
+arch flagstone
 x 11
 y 15
 end
-arch woodfloor
+arch grass
+x 11
+y 16
+end
+arch grass
 x 12
 end
-arch wall_2_1_2
-x 12
-end
-arch woodfloor
+arch grass
 x 12
 y 1
 end
-arch chair_1.2
+arch mover_7
+x 12
+y 1
+end
+arch cherub
 x 12
 y 1
 end
@@ -1101,16 +1302,20 @@ arch woodfloor
 x 12
 y 2
 end
+arch wall_2_1_2
+x 12
+y 2
+end
 arch woodfloor
 x 12
 y 3
 end
-arch woodfloor
-x 12
-y 4
-end
 arch chair_1.2
 x 12
+y 3
+end
+arch woodfloor
+x 12
 y 4
 end
 arch woodfloor
@@ -1121,11 +1326,11 @@ arch woodfloor
 x 12
 y 6
 end
-arch woodfloor
+arch chair_1.2
 x 12
-y 7
+y 6
 end
-arch chair_1.4
+arch woodfloor
 x 12
 y 7
 end
@@ -1137,23 +1342,27 @@ arch woodfloor
 x 12
 y 9
 end
+arch chair_1.4
+x 12
+y 9
+end
 arch woodfloor
 x 12
 y 10
 end
-arch wall_2_1_2
-x 12
-y 10
-end
-arch grass
+arch woodfloor
 x 12
 y 11
 end
-arch grass
+arch woodfloor
 x 12
 y 12
 end
-arch flagstone
+arch wall_2_1_2
+x 12
+y 12
+end
+arch grass
 x 12
 y 13
 end
@@ -1161,30 +1370,39 @@ arch flagstone
 x 12
 y 14
 end
-arch grass
+arch flagstone
 x 12
 y 15
 end
+arch grass
+x 12
+y 16
+end
+arch grass
+x 13
+end
+arch grass
+x 13
+y 1
+end
+arch mover_7
+x 13
+y 1
+end
 arch woodfloor
 x 13
+y 2
 end
 arch wall_2_1_2
 x 13
+y 2
 end
 arch woodfloor
 x 13
-y 1
+y 3
 end
 arch fireplace
 x 13
-y 1
-end
-arch woodfloor
-x 13
-y 2
-end
-arch woodfloor
-x 13
 y 3
 end
 arch woodfloor
@@ -1199,43 +1417,43 @@ arch woodfloor
 x 13
 y 6
 end
-arch chair_1.1
-x 13
-y 6
-end
 arch woodfloor
 x 13
 y 7
 end
-arch table_3
-x 13
-y 7
-end
 arch woodfloor
 x 13
 y 8
 end
+arch chair_1.1
+x 13
+y 8
+end
 arch woodfloor
 x 13
 y 9
 end
+arch table_3
+x 13
+y 9
+end
 arch woodfloor
 x 13
 y 10
 end
-arch wall_2_1_2
-x 13
-y 10
-end
-arch grass
+arch woodfloor
 x 13
 y 11
 end
-arch grass
+arch woodfloor
 x 13
 y 12
 end
-arch flagstone
+arch wall_2_1_2
+x 13
+y 12
+end
+arch grass
 x 13
 y 13
 end
@@ -1243,17 +1461,22 @@ arch flagstone
 x 13
 y 14
 end
-arch grass
+arch flagstone
 x 13
 y 15
 end
-arch woodfloor
+arch grass
+x 13
+y 16
+end
+arch grass
 x 14
 end
-arch wall_2_1_2
+arch grass
 x 14
+y 1
 end
-arch woodfloor
+arch mover_7
 x 14
 y 1
 end
@@ -1261,11 +1484,11 @@ arch woodfloor
 x 14
 y 2
 end
-arch woodfloor
+arch wall_2_1_2
 x 14
-y 3
+y 2
 end
-arch chair_1.4
+arch woodfloor
 x 14
 y 3
 end
@@ -1277,6 +1500,10 @@ arch woodfloor
 x 14
 y 5
 end
+arch chair_1.4
+x 14
+y 5
+end
 arch woodfloor
 x 14
 y 6
@@ -1285,47 +1512,47 @@ arch woodfloor
 x 14
 y 7
 end
+arch woodfloor
+x 14
+y 8
+end
+arch woodfloor
+x 14
+y 9
+end
 arch chair_1.2
 x 14
-y 7
+y 9
 end
 arch c_man
 msg
-@match work
-I hear the fellow at the 
+@match work|job
+I hear the fellow at the
 coffee shop is looking for
 someone to do a job.
 @match *
 Nother day, nother ale...
 endmsg
 x 14
-y 7
-end
-arch woodfloor
-x 14
-y 8
-end
-arch woodfloor
-x 14
 y 9
 end
 arch woodfloor
 x 14
 y 10
 end
-arch wall_2_1_2
-x 14
-y 10
-end
-arch grass
+arch woodfloor
 x 14
 y 11
 end
-arch grass
+arch woodfloor
 x 14
 y 12
 end
-arch flagstone
+arch wall_2_1_2
+x 14
+y 12
+end
+arch grass
 x 14
 y 13
 end
@@ -1333,17 +1560,22 @@ arch flagstone
 x 14
 y 14
 end
-arch grass
+arch flagstone
 x 14
 y 15
 end
-arch woodfloor
+arch grass
+x 14
+y 16
+end
+arch grass
 x 15
 end
-arch wall_2_1_2
+arch grass
 x 15
+y 1
 end
-arch woodfloor
+arch mover_7
 x 15
 y 1
 end
@@ -1351,7 +1583,7 @@ arch woodfloor
 x 15
 y 2
 end
-arch chair_1.1
+arch wall_2_1_2
 x 15
 y 2
 end
@@ -1359,97 +1591,106 @@ arch woodfloor
 x 15
 y 3
 end
-arch table_3
-x 15
-y 3
-end
 arch woodfloor
 x 15
 y 4
 end
+arch chair_1.1
+x 15
+y 4
+end
+arch woodfloor
+x 15
+y 5
+end
+arch table_3
+x 15
+y 5
+end
+arch woodfloor
+x 15
+y 6
+end
 arch wall_0
 x 15
-y 4
+y 6
 end
 arch light4
 x 15
-y 4
-end
-arch woodfloor
-x 15
-y 5
-end
-arch woodfloor
-x 15
 y 6
 end
 arch woodfloor
 x 15
 y 7
 end
+arch woodfloor
+x 15
+y 8
+end
+arch woodfloor
+x 15
+y 9
+end
 arch wall_1_1
 x 15
-y 7
+y 9
 end
 arch woodfloor
 x 15
-y 8
+y 10
 end
 arch wall_3_2
 x 15
-y 8
+y 10
 end
 arch woodfloor
 x 15
-y 9
+y 11
 end
 arch wall_2_1_1
 x 15
-y 9
+y 11
 end
 arch woodfloor
 x 15
-y 10
+y 12
 end
 arch wall_2_2_4
 x 15
-y 10
+y 12
 end
 arch grass
 x 15
-y 11
+y 13
 end
 arch lamppost
 x 15
-y 11
-end
-arch grass
-x 15
-y 12
-end
-arch flagstone
-x 15
-y 13
-end
-arch flagstone
-x 15
 y 13
 end
 arch flagstone
 x 15
 y 14
 end
-arch grass
+arch flagstone
+x 15
+y 14
+end
+arch flagstone
 x 15
 y 15
 end
-arch woodfloor
+arch grass
+x 15
+y 16
+end
+arch grass
 x 16
 end
-arch wall_2_1_2
+arch grass
 x 16
+y 1
 end
-arch woodfloor
+arch mover_7
 x 16
 y 1
 end
@@ -1457,11 +1698,11 @@ arch woodfloor
 x 16
 y 2
 end
-arch woodfloor
+arch wall_2_1_2
 x 16
-y 3
+y 2
 end
-arch chair_1.2
+arch woodfloor
 x 16
 y 3
 end
@@ -1473,6 +1714,10 @@ arch woodfloor
 x 16
 y 5
 end
+arch chair_1.2
+x 16
+y 5
+end
 arch woodfloor
 x 16
 y 6
@@ -1485,27 +1730,27 @@ arch woodfloor
 x 16
 y 8
 end
-arch wall_2_1_2
-x 16
-y 8
-end
-arch brush
+arch woodfloor
 x 16
 y 9
 end
-arch brush
+arch woodfloor
 x 16
 y 10
 end
-arch grass
+arch wall_2_1_2
+x 16
+y 10
+end
+arch brush
 x 16
 y 11
 end
-arch grass
+arch brush
 x 16
 y 12
 end
-arch flagstone
+arch grass
 x 16
 y 13
 end
@@ -1513,17 +1758,22 @@ arch flagstone
 x 16
 y 14
 end
-arch grass
+arch flagstone
 x 16
 y 15
 end
-arch woodfloor
+arch grass
+x 16
+y 16
+end
+arch grass
 x 17
 end
-arch wall_2_1_2
+arch grass
 x 17
+y 1
 end
-arch woodfloor
+arch mover_7
 x 17
 y 1
 end
@@ -1531,59 +1781,63 @@ arch woodfloor
 x 17
 y 2
 end
+arch wall_2_1_2
+x 17
+y 2
+end
+arch woodfloor
+x 17
+y 3
+end
+arch woodfloor
+x 17
+y 4
+end
 arch chair_1.4
 x 17
-y 2
-end
-arch woodfloor
-x 17
-y 3
-end
-arch woodfloor
-x 17
 y 4
 end
 arch woodfloor
 x 17
 y 5
 end
+arch woodfloor
+x 17
+y 6
+end
+arch woodfloor
+x 17
+y 7
+end
 arch chair_1.4
 x 17
-y 5
-end
-arch woodfloor
-x 17
-y 6
-end
-arch woodfloor
-x 17
 y 7
 end
 arch woodfloor
 x 17
 y 8
 end
+arch woodfloor
+x 17
+y 9
+end
+arch woodfloor
+x 17
+y 10
+end
 arch wall_2_1_2
 x 17
-y 8
+y 10
 end
 arch brush
 x 17
-y 9
-end
-arch grass
-x 17
-y 10
-end
-arch grass
-x 17
 y 11
 end
 arch grass
 x 17
 y 12
 end
-arch flagstone
+arch grass
 x 17
 y 13
 end
@@ -1591,21 +1845,22 @@ arch flagstone
 x 17
 y 14
 end
-arch grass
+arch flagstone
 x 17
 y 15
 end
-arch woodfloor
+arch grass
+x 17
+y 16
+end
+arch grass
 x 18
 end
-arch wall_2_1_2
-x 18
-end
-arch woodfloor
+arch grass
 x 18
 y 1
 end
-arch chair_1.1
+arch mover_7
 x 18
 y 1
 end
@@ -1613,7 +1868,7 @@ arch woodfloor
 x 18
 y 2
 end
-arch table_3
+arch window_win2
 x 18
 y 2
 end
@@ -1621,43 +1876,51 @@ arch woodfloor
 x 18
 y 3
 end
-arch woodfloor
-x 18
-y 4
-end
 arch chair_1.1
 x 18
-y 4
+y 3
 end
 arch woodfloor
 x 18
-y 5
+y 4
 end
 arch table_3
 x 18
+y 4
+end
+arch woodfloor
+x 18
 y 5
 end
 arch woodfloor
 x 18
 y 6
 end
+arch chair_1.1
+x 18
+y 6
+end
 arch woodfloor
 x 18
 y 7
 end
+arch table_3
+x 18
+y 7
+end
 arch woodfloor
 x 18
 y 8
 end
-arch wall_2_1_2
-x 18
-y 8
-end
-arch grass
+arch woodfloor
 x 18
 y 9
 end
-arch grass
+arch woodfloor
+x 18
+y 10
+end
+arch wall_2_1_2
 x 18
 y 10
 end
@@ -1665,11 +1928,11 @@ arch grass
 x 18
 y 11
 end
-arch grass
+arch evergreen
 x 18
 y 12
 end
-arch flagstone
+arch grass
 x 18
 y 13
 end
@@ -1677,17 +1940,22 @@ arch flagstone
 x 18
 y 14
 end
-arch grass
+arch flagstone
 x 18
 y 15
 end
-arch woodfloor
+arch grass
+x 18
+y 16
+end
+arch grass
 x 19
 end
-arch wall_2_1_2
+arch grass
 x 19
+y 1
 end
-arch woodfloor
+arch mover_7
 x 19
 y 1
 end
@@ -1695,7 +1963,7 @@ arch woodfloor
 x 19
 y 2
 end
-arch chair_1.2
+arch wall_2_1_2
 x 19
 y 2
 end
@@ -1707,12 +1975,26 @@ arch woodfloor
 x 19
 y 4
 end
-arch woodfloor
-x 19
-y 5
-end
 arch chair_1.2
 x 19
+y 4
+end
+arch farmer
+msg
+@match *
+Sure I had a bit too much,
+but at least I'm not seeing things....
+Hey what was that?
+endmsg
+randomitems jail
+monster 0
+stand_still 1
+will_apply 0
+x 19
+y 4
+end
+arch woodfloor
+x 19
 y 5
 end
 arch woodfloor
@@ -1723,20 +2005,24 @@ arch woodfloor
 x 19
 y 7
 end
+arch chair_1.2
+x 19
+y 7
+end
 arch woodfloor
 x 19
 y 8
 end
+arch woodfloor
+x 19
+y 9
+end
+arch woodfloor
+x 19
+y 10
+end
 arch window_win2
 x 19
-y 8
-end
-arch grass
-x 19
-y 9
-end
-arch grass
-x 19
 y 10
 end
 arch grass
@@ -1747,7 +2033,7 @@ arch grass
 x 19
 y 12
 end
-arch flagstone
+arch grass
 x 19
 y 13
 end
@@ -1755,17 +2041,18 @@ arch flagstone
 x 19
 y 14
 end
-arch grass
+arch flagstone
 x 19
 y 15
 end
-arch woodfloor
+arch grass
+x 19
+y 16
+end
+arch grass
 x 20
 end
-arch wall_2_1_2
-x 20
-end
-arch woodfloor
+arch grass
 x 20
 y 1
 end
@@ -1773,32 +2060,32 @@ arch woodfloor
 x 20
 y 2
 end
+arch wall_2_1_2
+x 20
+y 2
+end
+arch woodfloor
+x 20
+y 3
+end
+arch woodfloor
+x 20
+y 4
+end
 arch light4
 x 20
-y 2
-end
-arch woodfloor
-x 20
-y 3
-end
-arch chair_1.4
-x 20
-y 3
-end
-arch woodfloor
-x 20
 y 4
 end
 arch woodfloor
 x 20
 y 5
 end
-arch woodfloor
-x 20
-y 6
-end
 arch chair_1.4
 x 20
+y 5
+end
+arch woodfloor
+x 20
 y 6
 end
 arch woodfloor
@@ -1809,15 +2096,19 @@ arch woodfloor
 x 20
 y 8
 end
-arch wall_2_1_2
+arch chair_1.4
 x 20
 y 8
 end
-arch grass
+arch woodfloor
 x 20
 y 9
 end
-arch grass
+arch woodfloor
+x 20
+y 10
+end
+arch wall_2_1_2
 x 20
 y 10
 end
@@ -1829,7 +2120,7 @@ arch grass
 x 20
 y 12
 end
-arch flagstone
+arch grass
 x 20
 y 13
 end
@@ -1837,17 +2128,18 @@ arch flagstone
 x 20
 y 14
 end
-arch grass
+arch flagstone
 x 20
 y 15
 end
-arch woodfloor
+arch grass
+x 20
+y 16
+end
+arch grass
 x 21
 end
-arch wall_2_1_2
-x 21
-end
-arch woodfloor
+arch grass
 x 21
 y 1
 end
@@ -1855,7 +2147,7 @@ arch woodfloor
 x 21
 y 2
 end
-arch chair_1.1
+arch wall_2_1_2
 x 21
 y 2
 end
@@ -1863,47 +2155,51 @@ arch woodfloor
 x 21
 y 3
 end
-arch table_3
-x 21
-y 3
-end
 arch woodfloor
 x 21
 y 4
 end
-arch woodfloor
-x 21
-y 5
-end
 arch chair_1.1
 x 21
-y 5
+y 4
 end
 arch woodfloor
 x 21
-y 6
+y 5
 end
 arch table_3
 x 21
+y 5
+end
+arch woodfloor
+x 21
 y 6
 end
 arch woodfloor
 x 21
 y 7
 end
+arch chair_1.1
+x 21
+y 7
+end
 arch woodfloor
 x 21
 y 8
 end
-arch wall_2_1_2
+arch table_3
 x 21
 y 8
 end
-arch grass
+arch woodfloor
 x 21
 y 9
 end
-arch grass
+arch woodfloor
+x 21
+y 10
+end
+arch wall_2_1_2
 x 21
 y 10
 end
@@ -1915,7 +2211,7 @@ arch grass
 x 21
 y 12
 end
-arch flagstone
+arch grass
 x 21
 y 13
 end
@@ -1923,34 +2219,35 @@ arch flagstone
 x 21
 y 14
 end
-arch grass
+arch flagstone
 x 21
 y 15
 end
+arch grass
+x 21
+y 16
+end
+arch grass
+x 22
+end
+arch grass
+x 22
+y 1
+end
 arch woodfloor
 x 22
+y 2
 end
 arch wall_2_1_2
 x 22
+y 2
 end
 arch woodfloor
 x 22
-y 1
+y 3
 end
 arch clock
 x 22
-y 1
-end
-arch woodfloor
-x 22
-y 2
-end
-arch woodfloor
-x 22
-y 3
-end
-arch chair_1.2
-x 22
 y 3
 end
 arch woodfloor
@@ -1961,12 +2258,12 @@ arch woodfloor
 x 22
 y 5
 end
-arch woodfloor
-x 22
-y 6
-end
 arch chair_1.2
 x 22
+y 5
+end
+arch woodfloor
+x 22
 y 6
 end
 arch woodfloor
@@ -1977,27 +2274,31 @@ arch woodfloor
 x 22
 y 8
 end
+arch chair_1.2
+x 22
+y 8
+end
+arch woodfloor
+x 22
+y 9
+end
+arch woodfloor
+x 22
+y 10
+end
 arch wall_2_1_2
 x 22
-y 8
-end
-arch grass
-x 22
-y 9
-end
-arch grass
-x 22
 y 10
 end
 arch grass
 x 22
 y 11
 end
-arch grass
+arch evergreen
 x 22
 y 12
 end
-arch flagstone
+arch grass
 x 22
 y 13
 end
@@ -2005,30 +2306,31 @@ arch flagstone
 x 22
 y 14
 end
-arch grass
+arch flagstone
 x 22
 y 15
 end
+arch grass
+x 22
+y 16
+end
+arch grass
+x 23
+end
+arch grass
+x 23
+y 1
+end
+arch spider
+x 23
+y 1
+end
 arch woodfloor
 x 23
+y 2
 end
 arch wall_2_2_3
 x 23
-end
-arch woodfloor
-x 23
-y 1
-end
-arch wall_2_1_1
-x 23
-y 1
-end
-arch woodfloor
-x 23
-y 2
-end
-arch wall_2_1_1
-x 23
 y 2
 end
 arch woodfloor
@@ -2075,15 +2377,23 @@ arch woodfloor
 x 23
 y 8
 end
-arch wall_2_2_4
+arch wall_2_1_1
 x 23
 y 8
 end
-arch grass
+arch woodfloor
 x 23
 y 9
 end
-arch grass
+arch wall_2_1_1
+x 23
+y 9
+end
+arch woodfloor
+x 23
+y 10
+end
+arch wall_2_2_4
 x 23
 y 10
 end
@@ -2095,29 +2405,37 @@ arch grass
 x 23
 y 12
 end
-arch flagstone
-x 23
-y 13
-end
-arch invis_exit
-slaying /world/world_104_116
-hp 42
-sp 3
-x 23
-y 13
-end
-arch flagstone
-x 23
-y 14
-end
-arch invis_exit
-slaying /world/world_104_116
-hp 42
-sp 3
-x 23
-y 14
-end
 arch grass
 x 23
+y 13
+end
+arch flagstone
+x 23
+y 14
+end
+arch invis_exit
+slaying /world/world_104_116
+hp 42
+sp 3
+x 23
+y 14
+end
+arch flagstone
+x 23
 y 15
 end
+arch invis_exit
+slaying /world/world_104_116
+hp 42
+sp 3
+x 23
+y 15
+end
+arch grass
+x 23
+y 16
+end
+arch dragon
+x 8
+y 1
+end