diff --git a/world/world_121_116 b/world/world_121_116
index f8849b3a8..98661bc67 100644
--- a/world/world_121_116
+++ b/world/world_121_116
@@ -9,7 +9,7 @@ enter_x 1
 enter_y 1
 msg
 Created:  2002-06-02
-Modified: 2012-08-14 Rick Tanner
+Modified: 2013-08-18 Kevin Zheng
 endmsg
 outdoor 1
 tile_path_1 world_121_115
@@ -9057,9 +9057,9 @@ arch cobblestones
 x 32
 y 46
 end
-arch sign
+arch cross_sign
 msg
-Welcome to Navar City.
+Welcome to Navar City!
 To go to Darcap, take the road north 1065 chains.
 To go to Brest or Scorn, take the road south.
 endmsg
@@ -10645,7 +10645,7 @@ y 39
 move_block all
 end
 arch collesium
-name Collesium
+name Colosseum
 slaying /navar_city/collosium
 hp 17
 sp 22
@@ -11043,8 +11043,8 @@ x 38
 y 42
 end
 arch sign
-name Showing Today:
 msg
+Showing Today:
 Clash of the Titans
 endmsg
 x 38
@@ -13607,7 +13607,7 @@ arch grass
 x 45
 y 39
 end
-arch temple1
+arch gorokh_church
 name Temple of Gorokh
 slaying /navar_city/temples/gorokh
 hp 7
@@ -14764,18 +14764,14 @@ x 48
 y 46
 end
 arch sign
-name Welcome to Navar City
 msg
-Welcome to the city of Navar!
-Magic is suppressed in public streets by order of the city council.  Please be sure to visit:
+Welcome to Navar City!
+By order of the city council, magic is suppressed in public streets. Be sure to visit:
 Frolicing Mermaid
 All Shops
 Gunther's smithy
 Lighthouse
 Bank of Skud
-If you have any problems, contact someone from site and they should get back to me....
-Maxus.
-Bank of Skud
 endmsg
 x 48
 y 46
@@ -15094,7 +15090,7 @@ x 49
 y 39
 end
 arch house_up
-name Large house
+name Midane's House
 slaying /navar_city/misc/midane
 hp 6
 sp 2
diff --git a/world/world_121_117 b/world/world_121_117
index 47a0786a9..08ea210f3 100644
--- a/world/world_121_117
+++ b/world/world_121_117
@@ -8,7 +8,7 @@ height 50
 enter_x 1
 enter_y 1
 msg
-Modified: 2012-10-05 Rick Tanner
+Modified: 2013-08-18 Kevin Zheng
 endmsg
 outdoor 1
 tile_path_1 world_121_116
@@ -7496,7 +7496,7 @@ y 36
 elevation 4602
 end
 arch barn
-name dragon hangar - Navar
+name Navar Dragon Hangar
 slaying /navar_city/dragon_hangar/hangar
 hp 15
 sp 1
@@ -9973,10 +9973,6 @@ arch dungeon_magic
 x 37
 y 1
 end
-arch grass
-x 37
-y 1
-end
 arch cobblestones2
 x 37
 y 1
@@ -10097,7 +10093,6 @@ end
 arch guard
 x 37
 y 10
-speed_left -4.000000
 end
 arch dungeon_magic
 x 37
@@ -10739,7 +10734,7 @@ arch grass
 x 39
 end
 arch house_up
-name Crazy house
+name Crazy House
 slaying ../navar_city/houses/crazyhouse
 hp 3
 sp 15
@@ -10857,7 +10852,6 @@ end
 arch guard
 x 39
 y 10
-speed_left -4.000000
 end
 arch dungeon_magic
 x 39
@@ -11210,7 +11204,7 @@ x 40
 y 7
 end
 arch slum3
-name Rockgardens
+name Rock Gardens
 slaying /navar_city/slums/rockgardens
 hp 21
 sp 2
@@ -11851,8 +11845,7 @@ arch grass
 x 42
 y 4
 end
-arch temple1
-name Temple of Sorig
+arch sorig_church
 slaying /navar_city/temples/sorig
 hp 7
 sp 13
@@ -11912,7 +11905,7 @@ x 42
 y 10
 end
 arch woodhouse
-name Rundown House
+name Run-down House
 slaying ../navar_city/houses/rundownhouse
 hp 4
 sp 11
@@ -12155,8 +12148,7 @@ end
 arch grass
 x 43
 end
-arch small_temple
-name Temple of Ruggilli
+arch ruggilli_temple
 slaying /navar_city/temples/ruggilli
 hp 11
 sp 22
@@ -12518,6 +12510,10 @@ arch grass
 x 44
 y 5
 end
+arch well
+x 44
+y 5
+end
 arch dungeon_magic
 x 44
 y 6
@@ -12631,7 +12627,7 @@ x 44
 y 15
 end
 arch gravestone2
-name Cross of St Hathwaite
+name Cross of St. Hathwaite
 x 44
 y 15
 end
@@ -12889,10 +12885,6 @@ arch cobblestones2
 x 45
 y 6
 end
-arch well
-x 45
-y 6
-end
 arch dungeon_magic
 x 45
 y 7
@@ -13172,7 +13164,7 @@ x 46
 y 1
 end
 arch tavern
-name Family house
+name Family House
 slaying /navar_city/magara/houses/family_house
 hp 1
 sp 1
@@ -13276,7 +13268,6 @@ x 46
 y 11
 end
 arch mostrai_cathedral
-name Mostrai Cathedral
 slaying ../navar_city/temples/mostrai
 hp 14
 sp 33
@@ -13836,7 +13827,7 @@ arch grass
 x 48
 end
 arch rl_house_west
-name Private apartments
+name Private Apartments
 slaying /navar_city/apartments/apartment
 hp 10
 sp 13
diff --git a/world/world_122_116 b/world/world_122_116
index 50bf4b3d0..f340bc407 100644
--- a/world/world_122_116
+++ b/world/world_122_116
@@ -9,7 +9,7 @@ enter_x 1
 enter_y 1
 msg
 Created:  2002-06-02
-Modified: 2012-08-06 Rick Tanner
+Modified: 2013-08-18 Kevin Zheng
 endmsg
 outdoor 1
 tile_path_1 world_122_115
@@ -938,6 +938,7 @@ y 39
 move_block all
 end
 arch university
+name Navar University
 slaying /navar_city/university
 hp 24
 sp 37
@@ -7834,7 +7835,7 @@ y 45
 move_block all
 end
 arch big_galleon
-name to Wolfsburg
+name To Wolfsburg
 slaying /world/world_128_109
 hp 43
 sp 25
diff --git a/world/world_122_117 b/world/world_122_117
index 2e99a8c6f..4a7777999 100644
--- a/world/world_122_117
+++ b/world/world_122_117
@@ -9,7 +9,7 @@ enter_x 1
 enter_y 1
 msg
 Created:  2002-06-02
-Modified: 2013-07-26 Kevin Zheng
+Modified: 2013-08-18 Kevin Zheng
 endmsg
 outdoor 1
 tile_path_1 world_122_116
@@ -37,7 +37,7 @@ arch grass
 y 2
 end
 arch tavern
-name Kaisa's place
+name Kaisa's Place
 slaying /navar_city/magara/houses/kaisas_place
 hp 1
 sp 3
@@ -56,7 +56,6 @@ arch grass
 y 4
 end
 arch valriel_church
-name Temple of Valriel
 slaying /navar_city/temples/valriel
 hp 9
 sp 27
@@ -119,6 +118,7 @@ arch grass
 y 11
 end
 arch market1
+name Condemned Market
 slaying /navar_city/misc/market2
 hp 2
 sp 10
@@ -146,7 +146,7 @@ arch grass
 y 14
 end
 arch s_house1
-name Iscar's house
+name Iscar's House
 slaying /navar_city/iscar
 hp 2
 sp 9
@@ -433,6 +433,7 @@ x 1
 y 9
 end
 arch market2
+name Navar Market
 slaying /navar_city/misc/market1
 hp 2
 sp 10
@@ -456,6 +457,7 @@ x 1
 y 11
 end
 arch market2
+name Condemned Market
 slaying /navar_city/misc/market2
 hp 2
 sp 10
@@ -790,6 +792,7 @@ x 2
 y 9
 end
 arch market2
+name Navar Market
 slaying /navar_city/misc/market1
 hp 14
 sp 10
@@ -837,7 +840,7 @@ x 2
 y 13
 end
 arch hovels
-name A Large house
+name Large House
 slaying /navar_city/magara/houses/large_house
 hp 1
 sp 1
@@ -852,7 +855,7 @@ arch grass
 x 2
 y 14
 end
-arch guild_west
+arch Dragon Guild 2
 name Navar Dragon Guild
 slaying /navar_city/misc/dragon_guild
 hp 9
@@ -1162,8 +1165,7 @@ arch grass
 x 3
 y 7
 end
-arch small_temple2
-name Temple of Lythander
+arch lyth_temple
 slaying /navar_city/temples/templelyth
 hp 7
 sp 13
@@ -1187,6 +1189,7 @@ x 3
 y 9
 end
 arch market2
+name Navar Market
 slaying /navar_city/misc/market1
 hp 30
 sp 10
@@ -1210,6 +1213,7 @@ x 3
 y 11
 end
 arch market2
+name Condemned Market
 slaying /navar_city/misc/market2
 hp 30
 sp 10
@@ -1541,6 +1545,7 @@ x 4
 y 9
 end
 arch market2
+name Navar Market
 slaying /navar_city/misc/market1
 hp 45
 sp 10
@@ -1564,6 +1569,7 @@ x 4
 y 11
 end
 arch market2
+name Condemned Market
 slaying /navar_city/misc/market2
 hp 45
 sp 10
@@ -1923,6 +1929,7 @@ x 5
 y 9
 end
 arch market2
+name Navar Market
 slaying /navar_city/misc/market1
 hp 45
 sp 10
@@ -1946,6 +1953,7 @@ x 5
 y 11
 end
 arch market2
+name Condemned Market
 slaying /navar_city/misc/market2
 hp 45
 sp 10
@@ -2297,6 +2305,7 @@ x 6
 y 9
 end
 arch market3
+name Navar Market
 slaying /navar_city/misc/market1
 hp 57
 sp 10
@@ -2320,6 +2329,7 @@ x 6
 y 11
 end
 arch market3
+name Condemned Market
 slaying /navar_city/misc/market2
 hp 57
 sp 10
@@ -3320,8 +3330,8 @@ arch brush
 x 9
 y 5
 end
-arch shrine
-name Gaea's shrine
+arch gaea_temple
+name Gaea's Shrine
 slaying /navar_city/temples/gaea
 hp 14
 sp 18
@@ -4118,8 +4128,7 @@ arch grass_only
 x 11
 y 14
 end
-arch small_temple
-name Church of Valkyrie
+arch valkyrie_temple
 slaying ../navar_city/temples/valkyrie
 hp 12
 sp 21
@@ -5599,7 +5608,7 @@ y 31
 elevation 4298
 end
 arch barn2
-name The Old Warehouse
+name Old Warehouse
 slaying /navar_city/smugglers_cove/sc_warehouse
 hp 7
 sp 18
@@ -7587,7 +7596,7 @@ x 22
 y 4
 end
 arch big_galleon
-name Smugglers Boat
+name Smugglers' Boat
 x 22
 y 4
 end