diff --git a/scorn/misc/battle_arena/entrance b/scorn/misc/battle_arena/entrance
index 4ee8cb509..3a6e2b902 100644
--- a/scorn/misc/battle_arena/entrance
+++ b/scorn/misc/battle_arena/entrance
@@ -9,7 +9,7 @@ enter_x 11
 enter_y 24
 msg
 Created:  2000-11-08 Andreas Vogl (red.blaze@gmx.net)
-Modified: 2013-03-18 Kevin Zheng
+Modified: 2014-03-15 Kevin Zheng
 endmsg
 end
 arch pstone_2
@@ -685,7 +685,7 @@ arch man
 name ticket vendor
 msg
 @match *
-Buy an arena ticket! Watching the gladiators' duels is so much fun. It costs only 100 diamonds, and you get one bag of popcorn for free!
+Buy an arena ticket! Watching the gladiators duel is so much fun. It only costs 100 diamonds, and you get a bag of popcorn for free!
 endmsg
 hp 180
 maxhp 180
@@ -1122,18 +1122,6 @@ arch pstone_2
 x 5
 y 14
 end
-arch magic_mouth
-name 5
-msg
-The ticket vendor says: Here is your arena ticket. Now you can enter the terraces of the arena whenever you want!
-endmsg
-x 5
-y 15
-resist_physical 30
-resist_fire 30
-connected 5
-move_on 0
-end
 arch pstone_2
 x 5
 y 15
@@ -1141,6 +1129,9 @@ end
 arch altar_trigger
 name Buy Arena Ticket (100 diamonds)
 slaying diamond
+msg
+Here is your arena ticket. Now you can enter the terraces of the arena whenever you want!
+endmsg
 food 100
 x 5
 y 15
@@ -1687,9 +1678,7 @@ hp 12
 sp 41
 x 9
 y 2
-speed 0.000000
-resist_magic 30
-resist_electricity 30
+speed 0.0
 connected 10
 end
 arch dungeon_magic
@@ -1703,10 +1692,6 @@ end
 arch grate_closed_1
 x 9
 y 3
-speed 0.500000
-resist_physical 30
-resist_magic 30
-resist_fire 30
 connected 7
 end
 arch pstone_2
@@ -2362,9 +2347,7 @@ hp 22
 sp 41
 x 13
 y 2
-speed 0.000000
-resist_magic 30
-resist_electricity 30
+speed 0.0
 connected 10
 end
 arch dungeon_magic
@@ -2378,10 +2361,6 @@ end
 arch grate_closed_1
 x 13
 y 3
-speed 0.500000
-resist_physical 30
-resist_magic 30
-resist_fire 30
 connected 7
 end
 arch pstone_2
diff --git a/scorn/taverns/goths b/scorn/taverns/goths
index f9aaca5f2..d52b7ad55 100644
--- a/scorn/taverns/goths
+++ b/scorn/taverns/goths
@@ -9,7 +9,7 @@ enter_x 5
 enter_y 32
 msg
 Created:  1993-10-15
-Modified: 2012-04-02 Rick Tanner
+Modified: 2014-03-28 Kevin Zheng
 endmsg
 maplore
 @quest Scorn Royalty Quest
@@ -601,7 +601,7 @@ x 3
 y 8
 end
 arch man
-name Drunk
+name drunk
 msg
 @match name
 My name is Dilek.
@@ -700,30 +700,6 @@ arch woodfloor
 x 3
 y 16
 end
-arch magic_ear
-msg
-@match hard
-If you're 12th rank or better, you might want to seek the Temple of Darkness.  You need a strong fighter along on the quest:  their god has granted their prayer to ban magic in his temple proper.  I battled one of their adepts for a time.  He had such incredible reserves of power that I had to withdraw from the fight.  I'm sure that he must have had a Power Crystal.  The Temple is in a Dark Forest just north of the Great East Road.
-endmsg
-x 3
-y 16
-end
-arch magic_ear
-msg
-@match middle
-Well, if you're past the 9th Tier in your guilds, and you have some strong friends, you might want to stop Yqreth from desolating more land than he already has.  He got his hands on a new spell, he does, and he's abusing it.  Turned to evil for sure, he has.  I've heard what some of his former servants have said about him.  If his soul doesn't belong to the Dark already, it will soon.  He resides in the Tower of the Stars, which is south of Scorn.  It's hard going to get there.
-endmsg
-x 3
-y 16
-end
-arch magic_ear
-msg
-@match easy
-Okay, if you're not past the 5th rank, then you'll probably be very happy to do a bit of community service.  The pirates are getting uppity:  this used to be a respectable town, and they're getting out of hand.  Go look around in some of the buildings near the docks, there are unsavory sorts running amok up there who should be taught good behavior!  There's also supposed to be a pirate treasure on some islands you can get to if you take passage on a pirate ship, but they seem to have moved their base over near Wolfsburg.
-endmsg
-x 3
-y 16
-end
 arch wizard
 msg
 @match name
@@ -734,9 +710,14 @@ You'd think I was running an information booth the way some people act...
 Yes?  Adventurers eh?  Well what do you want?  Information?
 @match yes|info
 Yeah, that is what everyone does.  They walk in here, and just because I'm sitting all alone they think they can pump me for information.  Well, you're lucky, I'm actually in a talkative mood.  So, what type of adventure are you looking for?  An easy adventure?  A hard one?  Or something in the middle?
+@match easy
+Okay, if you're not past the 5th rank, then you'll probably be very happy to do a bit of community service.  The pirates are getting uppity:  this used to be a respectable town, and they're getting out of hand.  Go look around in some of the buildings near the docks, there are unsavory sorts running amok up there who should be taught good behavior!  There's also supposed to be a pirate treasure on some islands you can get to if you take passage on a pirate ship, but they seem to have moved their base over near Wolfsburg.
+@match middle
+Well, if you're past the 9th Tier in your guilds, and you have some strong friends, you might want to stop Yqreth from desolating more land than he already has.  He got his hands on a new spell, he does, and he's abusing it.  Turned to evil for sure, he has.  I've heard what some of his former servants have said about him.  If his soul doesn't belong to the Dark already, it will soon.  He resides in the Tower of the Stars, which is south of Scorn.  It's hard going to get there.
+@match hard
+If you're 12th rank or better, you might want to seek the Temple of Darkness.  You need a strong fighter along on the quest:  their god has granted their prayer to ban magic in his temple proper.  I battled one of their adepts for a time.  He had such incredible reserves of power that I had to withdraw from the fight.  I'm sure that he must have had a Power Crystal.  The Temple is in a Dark Forest just north of the Great East Road.
 endmsg
 face wizard.151
-Str 15
 Con 5
 Pow 20
 hp 500
@@ -747,7 +728,6 @@ ac -3
 x 3
 y 16
 level 10
-type 0
 resist_magic 30
 move_type walk
 monster 1
@@ -766,15 +746,6 @@ arch woodfloor
 x 3
 y 19
 end
-arch magic_ear
-msg
-@match mountain
-I'll never forget that mountain.  I fought a battle atop it with a dark spirit.  His evil had begun to poison the land around his lair, so I challenged him to battle. When he issued forth from his cave to do battle with me, I rose up into the air above him, and blasted him with fire.  He somehow survived that first blast, so I threw yet a greater at him.  He survived that one too, so I stretched myself.  The next blast of fire scorched the mountain black (it remains so to this day).  Yet still he stood against me, so I thought he must somehow be immune.  Using the last of my strength, I blasted him with lightning.  He was destroyed, but I never looked into his cave.
-endmsg
-x 3
-y 20
-connected 7
-end
 arch woodfloor
 x 3
 y 20
@@ -783,16 +754,6 @@ arch chair_1.4
 x 3
 y 20
 end
-arch magic_ear
-msg
-@match sword
-You've heard the rumors about the goings on in Navar, at the end of the Great East Road?
-Well, Morkov, the former Wizard there, has turned to darkness.  He's out-and-out sold his soul.  Kill him and take his Sword.  He got it when he betrayed Navar and opened a gate for Evil to come through.  The flood of undead has taken over his Tower already.  The idiot city council there hasn't taken action yet.  Perhaps they're waiting for someone of the 13th or 14th Tier in their guilds to go kick Morkov out.
-endmsg
-x 3
-y 21
-connected 7
-end
 arch woodfloor
 x 3
 y 21
@@ -807,9 +768,15 @@ Yes?  What do you want?
 All you adventurers are all alike.  Greedy as hell.  You probably want me to tell you how to get your hands on some powerful magic, don't you?  Well, that can be hard and dangerous.  Got a deathwish?  Eh?
 @match yes|yup|aye
 Well, maybe your greed will keep you alive, then.  I've known some people who have dragged their bones out of the grave for greed.  Smelly, and grumpy, every one!  Never underestimate the power of greed!  Well, I know of two places where you can get your hands on a powerful item.  One I know for sure:  a powerful magical Sword.  The other I'm not sure of, but it's inside a mountain, I bet.  Which do you want to hear about?
+@match cave
+I never explored his cave.  If you can get past his pets and into his Chamber, you'll probably find something interesting.  After the battle, the mountain was far too hot to be near, and I've had better things to do since then.  I don't think you'll be able to pass his vicious pets unless you're at least 15th Tier in your guild.  The mountain can be found north of the bend in the Great East Road.
+@match mountain
+I'll never forget that mountain.  I fought a battle atop it with a dark spirit.  His evil had begun to poison the land around his lair, so I challenged him to battle. When he issued forth from his cave to do battle with me, I rose up into the air above him, and blasted him with fire.  He somehow survived that first blast, so I threw yet a greater at him.  He survived that one too, so I stretched myself.  The next blast of fire scorched the mountain black (it remains so to this day).  Yet still he stood against me, so I thought he must somehow be immune.  Using the last of my strength, I blasted him with lightning.  He was destroyed, but I never looked into his cave.
+@match sword
+You've heard the rumors about the goings on in Navar, at the end of the Great East Road?
+Well, Morkov, the former Wizard there, has turned to darkness.  He's out-and-out sold his soul.  Kill him and take his Sword.  He got it when he betrayed Navar and opened a gate for Evil to come through.  The flood of undead has taken over his Tower already.  The idiot city council there hasn't taken action yet.  Perhaps they're waiting for someone of the 13th or 14th Tier in their guilds to go kick Morkov out.
 endmsg
 face wizard_blue.131
-Str 20
 Con 10
 Pow 50
 hp 10000
@@ -818,9 +785,8 @@ dam 50
 wc -5
 x 3
 y 21
-speed 1.500000
+speed 1.5
 level 49
-type 0
 resist_physical 30
 resist_magic 30
 resist_fire 30
@@ -836,7 +802,6 @@ resist_slow 30
 resist_paralyze 30
 resist_turn_undead 30
 resist_fear 30
-resist_cancellation 30
 resist_deplete 30
 resist_death 30
 move_type walk
@@ -946,7 +911,6 @@ x 4
 y 3
 end
 arch stair_down
-name Stairs to the Cellar
 slaying goths0
 hp 4
 sp 1
@@ -974,7 +938,6 @@ end
 arch igate_closed_1
 x 4
 y 5
-speed 0.500000
 connected 1
 end
 arch woodfloor
@@ -1055,15 +1018,6 @@ arch woodfloor
 x 4
 y 19
 end
-arch magic_ear
-msg
-@match cave
-I never explored his cave.  If you can get past his pets and into his Chamber, you'll probably find something interesting.  After the battle, the mountain was far too hot to be near, and I've had better things to do since then.  I don't think you'll be able to pass his vicious pets unless you're at least 15th Tier in your guild.  The mountain can be found north of the bend in the Great East Road.
-endmsg
-x 4
-y 20
-connected 7
-end
 arch woodfloor
 x 4
 y 20
@@ -1072,15 +1026,6 @@ arch table_3
 x 4
 y 20
 end
-arch magic_ear
-msg
-@match fubar
-baz
-endmsg
-x 4
-y 21
-connected 7
-end
 arch woodfloor
 x 4
 y 21
@@ -1668,6 +1613,7 @@ x 7
 y 19
 end
 arch a_townsman
+name townsman
 x 7
 y 19
 end
@@ -2395,11 +2341,11 @@ x 11
 y 14
 end
 arch dwarf
-name Lumberjack
+name lumberjack
 msg
 @match name
 Limyat
-@match hello|job
+@match hi|hello|job
 I chop down trees in the forest.
 @match trees|forest
 I chop them down in the great forest to the east.  I wandered across a great tower one time.
@@ -2664,18 +2610,17 @@ x 12
 y 10
 end
 arch priest
-name Drachnak the Priest
+name Drachnak
+title the Priest
 msg
 @match hi|hello
 You seem surprised to see a priest here drowning his sorrows in drink.  Well, my friends, I'm near despair.  Evil has taken my church from me; what was once holy is now perverted to evil.  Are you going to help me or are you here to just laugh at me?
 @match help
 Well, thank you.  I hope you have passed the Third Tier in your guilds otherwise helping me will be the death of you. My church is overrun by zombies.  If you can get rid of them, you may take anything of value you find there as a reward.  It's on the south side of town.
 endmsg
-Str 10
 Con 5
 Wis 25
 Pow 5
-Cha 20
 exp 300
 dam 10
 wc 15
@@ -2683,7 +2628,6 @@ ac 3
 x 12
 y 10
 level 5
-type 0
 resist_magic 100
 move_type walk
 monster 1
@@ -2727,7 +2671,8 @@ x 12
 y 18
 end
 arch courier
-name Joey the scribe
+name Joey
+title the scribe
 msg
 @match mark
 Mark loves to gamble... owes me a bunch.  Always first in line to the bingo.
@@ -3113,10 +3058,6 @@ x 14
 y 6
 invisible 1
 end
-arch chair_1.3
-x 14
-y 6
-end
 arch woodfloor
 x 14
 y 7
@@ -3596,7 +3537,6 @@ x 16
 y 13
 end
 arch warrior_1
-name 1st Tier warrior
 msg
 @match job
 Umm... professional adventurer?
@@ -3819,10 +3759,6 @@ x 17
 y 6
 invisible 1
 end
-arch chair_1.3
-x 17
-y 6
-end
 arch woodfloor
 x 17
 y 7
@@ -4059,10 +3995,6 @@ x 18
 y 6
 invisible 1
 end
-arch chair_1.3
-x 18
-y 6
-end
 arch woodfloor
 x 18
 y 7
@@ -4280,7 +4212,7 @@ x 19
 y 4
 end
 arch warrior_1
-name Bar Tender
+name bar tender
 msg
 @match drink|booze|beer
 If you want something to drink, it will be 3 gp.
@@ -4561,7 +4493,7 @@ x 20
 y 6
 end
 arch woman
-name Bar Maid
+name bar maid
 msg
 @match hello|hi
 I'll be with you in a sec.
@@ -4793,10 +4725,6 @@ x 21
 y 6
 invisible 1
 end
-arch chair_1.3
-x 21
-y 6
-end
 arch woodfloor
 x 21
 y 7
@@ -5126,7 +5054,7 @@ x 22
 y 19
 end
 arch fighter
-name Wounded fighter
+name wounded fighter
 msg
 @match name
 Apanu...  Aaeeia! ...ugak
@@ -5322,10 +5250,6 @@ x 23
 y 6
 invisible 1
 end
-arch chair_1.3
-x 23
-y 6
-end
 arch woodfloor
 x 23
 y 7
@@ -6366,7 +6290,6 @@ endmsg
 face elf.151
 x 27
 y 17
-is_animated 0
 friendly 1
 unaggressive 0
 end
@@ -6615,7 +6538,6 @@ arch elf_1
 face elf.171
 x 28
 y 18
-is_animated 0
 friendly 1
 unaggressive 0
 end
@@ -6771,10 +6693,6 @@ arch woodfloor
 x 29
 y 6
 end
-arch table_3
-x 29
-y 6
-end
 arch booze_table
 slaying money
 food 30
@@ -7194,11 +7112,13 @@ x 31
 y 12
 end
 arch c_sage
-name Old man
+name old man
 msg
 @match name
 Sonny...  please... this is important...
-@match studying|important
+@match no
+Well, I am, and it's important.
+@match studying|important|yes
 Yes, I'm looking over my notes about a ruined building in the middle of the desert.
 @match building
 Don't know much about it.  It is probably full of nasty monsters after all of this time.
@@ -7640,7 +7560,6 @@ arch block_door_closed
 face table_3.111
 x 33
 y 19
-speed 0.500000
 connected 123
 end
 arch woodfloor
diff --git a/world/world_111_117 b/world/world_111_117
index e58e27210..ca56f61a3 100644
--- a/world/world_111_117
+++ b/world/world_111_117
@@ -3,7 +3,7 @@ name world_111_117
 width 50
 height 50
 msg
-Modified: 2012-01-15 Nicolas Weeger
+Modified: 2014-03-28 Kevin Zheng
 endmsg
 outdoor 1
 tile_path_1 world_111_116
@@ -10284,7 +10284,6 @@ hp 1
 sp 7
 x 31
 y 43
-is_floor 0
 end
 arch mountain
 x 31
@@ -12403,7 +12402,6 @@ dungeon_depth 12
 endmsg
 x 39
 y 42
-is_floor 0
 arch quest_advance_apply
 name scorn/DragonWhisker 10-40>50
 end