diff --git a/navar_city/temples/mostrai b/navar_city/temples/mostrai
index 0b856d10f..c6f1fde2f 100644
--- a/navar_city/temples/mostrai
+++ b/navar_city/temples/mostrai
@@ -1,5 +1,5 @@
 arch map
-name Mostrai Cathedral
+name Cathedral of Mostrai
 difficulty 4
 region navar
 width 30
@@ -8,7 +8,7 @@ enter_x 14
 enter_y 33
 msg
 Created:  1993-11-10 Cater & Wade (john_cater@yahoo.com)
-Modified: 2012-05-12 Nicolas Weeger
+Modified: 2013-08-18 Kevin Zheng
 endmsg
 outdoor 1
 end
diff --git a/navar_city/temples/sorig b/navar_city/temples/sorig
index da632dca9..85f9e203b 100644
--- a/navar_city/temples/sorig
+++ b/navar_city/temples/sorig
@@ -1,14 +1,16 @@
 arch map
-name Temple of Sorig
+name Church of Sorig
 difficulty 1
 region navar
 width 15
-height 15
+height 20
 enter_x 7
-enter_y 13
+enter_y 16
 msg
 Created:  2003-01-11 Avion
+Modified: 2013-08-18 Kevin Zheng
 endmsg
+outdoor 1
 end
 arch grass
 end
@@ -55,6 +57,21 @@ arch grass
 y 14
 end
 arch grass
+y 15
+end
+arch grass
+y 16
+end
+arch grass
+y 17
+end
+arch grass
+y 18
+end
+arch grass
+y 19
+end
+arch grass
 x 1
 end
 arch grass
@@ -145,17 +162,57 @@ arch dungeon_floor
 x 1
 y 12
 end
+arch westcwall_win1
+x 1
+y 12
+end
+arch dungeon_floor
+x 1
+y 13
+end
+arch westcwall_2_1_1
+x 1
+y 13
+end
+arch dungeon_floor
+x 1
+y 14
+end
+arch westcwall_2_1_1
+x 1
+y 14
+end
+arch dungeon_floor
+x 1
+y 15
+end
+arch westcwall_2_1_1
+x 1
+y 15
+end
+arch dungeon_floor
+x 1
+y 16
+end
+arch westcwall_2_1_1
+x 1
+y 16
+end
+arch dungeon_floor
+x 1
+y 17
+end
 arch westcwall_2_2_1
 x 1
-y 12
+y 17
 end
 arch grass
 x 1
-y 13
+y 18
 end
 arch grass
 x 1
-y 14
+y 19
 end
 arch grass
 x 2
@@ -176,6 +233,11 @@ arch dungeon_floor
 x 2
 y 3
 end
+arch director_3
+x 2
+y 3
+invisible 1
+end
 arch dungeon_floor
 x 2
 y 4
@@ -184,19 +246,29 @@ arch dungeon_floor
 x 2
 y 5
 end
+arch lightningwall_1
+x 2
+y 5
+arch spell_sm_lightning
+end
+end
 arch dungeon_floor
 x 2
 y 6
 end
+arch swall_1_4
+x 2
+y 6
+end
 arch dungeon_floor
 x 2
 y 7
 end
-arch dungeon_floor
+arch brazier
 x 2
-y 8
+y 7
 end
-arch chair_1.3
+arch dungeon_floor
 x 2
 y 8
 end
@@ -204,15 +276,11 @@ arch dungeon_floor
 x 2
 y 9
 end
-arch chair_1.3
-x 2
-y 9
-end
 arch dungeon_floor
 x 2
 y 10
 end
-arch chair_1.3
+arch brazier
 x 2
 y 10
 end
@@ -220,25 +288,49 @@ arch dungeon_floor
 x 2
 y 11
 end
-arch chair_1.3
-x 2
-y 11
-end
 arch dungeon_floor
 x 2
 y 12
 end
+arch dungeon_floor
+x 2
+y 13
+end
+arch brazier
+x 2
+y 13
+end
+arch dungeon_floor
+x 2
+y 14
+end
+arch dungeon_floor
+x 2
+y 15
+end
+arch dungeon_floor
+x 2
+y 16
+end
+arch brazier
+x 2
+y 16
+end
+arch dungeon_floor
+x 2
+y 17
+end
 arch westcwall_2_1_2
 x 2
-y 12
+y 17
 end
 arch evergreen
 x 2
-y 13
+y 18
 end
 arch grass
 x 2
-y 14
+y 19
 end
 arch grass
 x 3
@@ -259,6 +351,11 @@ arch dungeon_floor
 x 3
 y 3
 end
+arch director_5
+x 3
+y 3
+invisible 1
+end
 arch dungeon_floor
 x 3
 y 4
@@ -267,14 +364,14 @@ arch dungeon_floor
 x 3
 y 5
 end
-arch westcwall_0
-x 3
-y 5
-end
 arch dungeon_floor
 x 3
 y 6
 end
+arch swall_2_1_2
+x 3
+y 6
+end
 arch dungeon_floor
 x 3
 y 7
@@ -283,15 +380,11 @@ arch dungeon_floor
 x 3
 y 8
 end
-arch chair_1.3
-x 3
-y 8
-end
 arch dungeon_floor
 x 3
 y 9
 end
-arch chair_1.3
+arch chair_2.3
 x 3
 y 9
 end
@@ -299,10 +392,6 @@ arch dungeon_floor
 x 3
 y 10
 end
-arch chair_1.3
-x 3
-y 10
-end
 arch dungeon_floor
 x 3
 y 11
@@ -315,18 +404,46 @@ arch dungeon_floor
 x 3
 y 12
 end
-arch westcwall_win2
-x 3
-y 12
-end
-arch grass
+arch dungeon_floor
 x 3
 y 13
 end
-arch grass
+arch chair_1.3
+x 3
+y 13
+end
+arch dungeon_floor
 x 3
 y 14
 end
+arch dungeon_floor
+x 3
+y 15
+end
+arch chair_1.3
+x 3
+y 15
+end
+arch dungeon_floor
+x 3
+y 16
+end
+arch dungeon_floor
+x 3
+y 17
+end
+arch westcwall_win2
+x 3
+y 17
+end
+arch grass
+x 3
+y 18
+end
+arch grass
+x 3
+y 19
+end
 arch grass
 x 4
 end
@@ -346,18 +463,34 @@ arch dungeon_floor
 x 4
 y 3
 end
+arch swall_1_1
+x 4
+y 3
+end
 arch dungeon_floor
 x 4
 y 4
 end
+arch swall_2_1_1
+x 4
+y 4
+end
 arch dungeon_floor
 x 4
 y 5
 end
+arch swall_2_1_1
+x 4
+y 5
+end
 arch dungeon_floor
 x 4
 y 6
 end
+arch swall_2_2_4
+x 4
+y 6
+end
 arch dungeon_floor
 x 4
 y 7
@@ -366,15 +499,11 @@ arch dungeon_floor
 x 4
 y 8
 end
-arch chair_1.3
-x 4
-y 8
-end
 arch dungeon_floor
 x 4
 y 9
 end
-arch chair_1.3
+arch chair_2.3
 x 4
 y 9
 end
@@ -382,10 +511,6 @@ arch dungeon_floor
 x 4
 y 10
 end
-arch chair_1.3
-x 4
-y 10
-end
 arch dungeon_floor
 x 4
 y 11
@@ -398,18 +523,46 @@ arch dungeon_floor
 x 4
 y 12
 end
-arch westcwall_2_1_2
-x 4
-y 12
-end
-arch grass
+arch dungeon_floor
 x 4
 y 13
 end
-arch grass
+arch chair_1.3
+x 4
+y 13
+end
+arch dungeon_floor
 x 4
 y 14
 end
+arch dungeon_floor
+x 4
+y 15
+end
+arch chair_1.3
+x 4
+y 15
+end
+arch dungeon_floor
+x 4
+y 16
+end
+arch dungeon_floor
+x 4
+y 17
+end
+arch westcwall_2_1_2
+x 4
+y 17
+end
+arch grass
+x 4
+y 18
+end
+arch grass
+x 4
+y 19
+end
 arch grass
 x 5
 end
@@ -429,23 +582,39 @@ arch dungeon_floor
 x 5
 y 3
 end
+arch slevel_2_2_2
+x 5
+y 3
+end
 arch dungeon_floor
 x 5
 y 4
 end
+arch slevel_3_2
+x 5
+y 4
+end
 arch dungeon_floor
 x 5
 y 5
 end
+arch slevel_3_2
+x 5
+y 5
+end
 arch dungeon_floor
 x 5
 y 6
 end
+arch slevel_3_2
+x 5
+y 6
+end
 arch dungeon_floor
 x 5
 y 7
 end
-arch chair_2.3
+arch slevel_2_2_1
 x 5
 y 7
 end
@@ -453,15 +622,11 @@ arch dungeon_floor
 x 5
 y 8
 end
-arch chair_1.3
-x 5
-y 8
-end
 arch dungeon_floor
 x 5
 y 9
 end
-arch chair_1.3
+arch chair_2.3
 x 5
 y 9
 end
@@ -469,10 +634,6 @@ arch dungeon_floor
 x 5
 y 10
 end
-arch chair_1.3
-x 5
-y 10
-end
 arch dungeon_floor
 x 5
 y 11
@@ -485,18 +646,46 @@ arch dungeon_floor
 x 5
 y 12
 end
-arch westcwall_2_1_2
-x 5
-y 12
-end
-arch grass
+arch dungeon_floor
 x 5
 y 13
 end
-arch grass
+arch chair_1.3
+x 5
+y 13
+end
+arch dungeon_floor
 x 5
 y 14
 end
+arch dungeon_floor
+x 5
+y 15
+end
+arch chair_1.3
+x 5
+y 15
+end
+arch dungeon_floor
+x 5
+y 16
+end
+arch dungeon_floor
+x 5
+y 17
+end
+arch westcwall_2_1_2
+x 5
+y 17
+end
+arch grass
+x 5
+y 18
+end
+arch grass
+x 5
+y 19
+end
 arch grass
 x 6
 end
@@ -516,50 +705,61 @@ arch dungeon_floor
 x 6
 y 3
 end
+arch slevel_3_3
+x 6
+y 3
+end
 arch dungeon_floor
 x 6
 y 4
 end
+arch slevel_4
+x 6
+y 4
+invisible 1
+end
 arch dungeon_floor
 x 6
 y 5
 end
+arch slevel_4
+x 6
+y 5
+invisible 1
+end
 arch dungeon_floor
 x 6
 y 6
 end
+arch slevel_4
+x 6
+y 6
+invisible 1
+end
 arch dungeon_floor
 x 6
 y 7
 end
+arch slevel_3_1
+x 6
+y 7
+end
+arch dungeon_floor
+x 6
+y 8
+end
+arch dungeon_floor
+x 6
+y 9
+end
 arch chair_2.3
 x 6
-y 7
-end
-arch dungeon_floor
-x 6
-y 8
-end
-arch chair_1.3
-x 6
-y 8
-end
-arch dungeon_floor
-x 6
-y 9
-end
-arch chair_1.3
-x 6
 y 9
 end
 arch dungeon_floor
 x 6
 y 10
 end
-arch chair_1.3
-x 6
-y 10
-end
 arch dungeon_floor
 x 6
 y 11
@@ -572,25 +772,53 @@ arch dungeon_floor
 x 6
 y 12
 end
+arch dungeon_floor
+x 6
+y 13
+end
+arch chair_1.3
+x 6
+y 13
+end
+arch dungeon_floor
+x 6
+y 14
+end
+arch dungeon_floor
+x 6
+y 15
+end
+arch chair_1.3
+x 6
+y 15
+end
+arch dungeon_floor
+x 6
+y 16
+end
+arch dungeon_floor
+x 6
+y 17
+end
 arch westcwall_1_3
 x 6
-y 12
+y 17
 end
 arch flagstone
 x 6
-y 13
+y 18
 end
 arch invis_exit
 slaying /world/world_121_117
 hp 43
 sp 5
 x 6
-y 14
+y 19
 move_on walk
 end
 arch flagstone
 x 6
-y 14
+y 19
 end
 arch grass
 x 7
@@ -611,90 +839,23 @@ arch dungeon_floor
 x 7
 y 3
 end
+arch slevel_3_3
+x 7
+y 3
+end
 arch dungeon_floor
 x 7
 y 4
 end
+arch slevel_4
+x 7
+y 4
+invisible 1
+end
 arch chair_2.1
 x 7
 y 4
 end
-arch dungeon_floor
-x 7
-y 5
-end
-arch altar_sorig
-x 7
-y 5
-level 120
-end
-arch dungeon_floor
-x 7
-y 6
-end
-arch dungeon_floor
-x 7
-y 7
-end
-arch dungeon_floor
-x 7
-y 8
-end
-arch dungeon_floor
-x 7
-y 9
-end
-arch dungeon_floor
-x 7
-y 10
-end
-arch dungeon_floor
-x 7
-y 11
-end
-arch dungeon_floor
-x 7
-y 12
-end
-arch flagstone
-x 7
-y 13
-end
-arch invis_exit
-slaying /world/world_121_117
-hp 43
-sp 5
-x 7
-y 14
-move_on walk
-end
-arch flagstone
-x 7
-y 14
-end
-arch grass
-x 8
-end
-arch grass
-x 8
-y 1
-end
-arch dungeon_floor
-x 8
-y 2
-end
-arch westcwall_2_1_2
-x 8
-y 2
-end
-arch dungeon_floor
-x 8
-y 3
-end
-arch dungeon_floor
-x 8
-y 4
-end
 arch conjurer
 name high priest of Sorig
 msg
@@ -705,50 +866,180 @@ The kingdom of Sorig has no limits.
 @match *
 Fear the wrath of Sorig!
 endmsg
-x 8
+x 7
 y 4
 unaggressive 1
 end
 arch dungeon_floor
+x 7
+y 5
+end
+arch slevel_4
+x 7
+y 5
+invisible 1
+end
+arch light4
+x 7
+y 5
+glow_radius 6
+end
+arch altar_sorig
+x 7
+y 5
+level 120
+end
+arch dungeon_floor
+x 7
+y 6
+end
+arch slevel_4
+x 7
+y 6
+invisible 1
+end
+arch dungeon_floor
+x 7
+y 7
+end
+arch slevel_3_1
+x 7
+y 7
+end
+arch dungeon_floor
+x 7
+y 8
+end
+arch dungeon_floor
+x 7
+y 9
+end
+arch dungeon_floor
+x 7
+y 10
+end
+arch dungeon_floor
+x 7
+y 11
+end
+arch dungeon_floor
+x 7
+y 12
+end
+arch light4
+x 7
+y 12
+end
+arch dungeon_floor
+x 7
+y 13
+end
+arch dungeon_floor
+x 7
+y 14
+end
+arch dungeon_floor
+x 7
+y 15
+end
+arch dungeon_floor
+x 7
+y 16
+end
+arch dungeon_floor
+x 7
+y 17
+end
+arch flagstone
+x 7
+y 18
+end
+arch invis_exit
+slaying /world/world_121_117
+hp 43
+sp 5
+x 7
+y 19
+move_on walk
+end
+arch flagstone
+x 7
+y 19
+end
+arch grass
+x 8
+end
+arch grass
+x 8
+y 1
+end
+arch dungeon_floor
+x 8
+y 2
+end
+arch westcwall_2_1_2
+x 8
+y 2
+end
+arch dungeon_floor
+x 8
+y 3
+end
+arch slevel_3_3
+x 8
+y 3
+end
+arch dungeon_floor
+x 8
+y 4
+end
+arch slevel_4
+x 8
+y 4
+invisible 1
+end
+arch dungeon_floor
 x 8
 y 5
 end
+arch slevel_4
+x 8
+y 5
+invisible 1
+end
 arch dungeon_floor
 x 8
 y 6
 end
+arch slevel_4
+x 8
+y 6
+invisible 1
+end
 arch dungeon_floor
 x 8
 y 7
 end
+arch slevel_3_1
+x 8
+y 7
+end
+arch dungeon_floor
+x 8
+y 8
+end
+arch dungeon_floor
+x 8
+y 9
+end
 arch chair_2.3
 x 8
-y 7
-end
-arch dungeon_floor
-x 8
-y 8
-end
-arch chair_1.3
-x 8
-y 8
-end
-arch dungeon_floor
-x 8
-y 9
-end
-arch chair_1.3
-x 8
 y 9
 end
 arch dungeon_floor
 x 8
 y 10
 end
-arch chair_1.3
-x 8
-y 10
-end
 arch dungeon_floor
 x 8
 y 11
@@ -761,25 +1052,53 @@ arch dungeon_floor
 x 8
 y 12
 end
+arch dungeon_floor
+x 8
+y 13
+end
+arch chair_1.3
+x 8
+y 13
+end
+arch dungeon_floor
+x 8
+y 14
+end
+arch dungeon_floor
+x 8
+y 15
+end
+arch chair_1.3
+x 8
+y 15
+end
+arch dungeon_floor
+x 8
+y 16
+end
+arch dungeon_floor
+x 8
+y 17
+end
 arch westcwall_1_4
 x 8
-y 12
+y 17
 end
 arch flagstone
 x 8
-y 13
+y 18
 end
 arch invis_exit
 slaying /world/world_121_117
 hp 43
 sp 5
 x 8
-y 14
+y 19
 move_on walk
 end
 arch flagstone
 x 8
-y 14
+y 19
 end
 arch grass
 x 9
@@ -800,50 +1119,58 @@ arch dungeon_floor
 x 9
 y 3
 end
+arch slevel_2_2_3
+x 9
+y 3
+end
 arch dungeon_floor
 x 9
 y 4
 end
+arch slevel_3_4
+x 9
+y 4
+end
 arch dungeon_floor
 x 9
 y 5
 end
+arch slevel_3_4
+x 9
+y 5
+end
 arch dungeon_floor
 x 9
 y 6
 end
+arch slevel_3_4
+x 9
+y 6
+end
 arch dungeon_floor
 x 9
 y 7
 end
+arch slevel_2_2_4
+x 9
+y 7
+end
+arch dungeon_floor
+x 9
+y 8
+end
+arch dungeon_floor
+x 9
+y 9
+end
 arch chair_2.3
 x 9
-y 7
-end
-arch dungeon_floor
-x 9
-y 8
-end
-arch chair_1.3
-x 9
-y 8
-end
-arch dungeon_floor
-x 9
-y 9
-end
-arch chair_1.3
-x 9
 y 9
 end
 arch dungeon_floor
 x 9
 y 10
 end
-arch chair_1.3
-x 9
-y 10
-end
 arch dungeon_floor
 x 9
 y 11
@@ -856,18 +1183,46 @@ arch dungeon_floor
 x 9
 y 12
 end
-arch westcwall_2_1_2
-x 9
-y 12
-end
-arch grass
+arch dungeon_floor
 x 9
 y 13
 end
-arch grass
+arch chair_1.3
+x 9
+y 13
+end
+arch dungeon_floor
 x 9
 y 14
 end
+arch dungeon_floor
+x 9
+y 15
+end
+arch chair_1.3
+x 9
+y 15
+end
+arch dungeon_floor
+x 9
+y 16
+end
+arch dungeon_floor
+x 9
+y 17
+end
+arch westcwall_2_1_2
+x 9
+y 17
+end
+arch grass
+x 9
+y 18
+end
+arch grass
+x 9
+y 19
+end
 arch grass
 x 10
 end
@@ -887,18 +1242,34 @@ arch dungeon_floor
 x 10
 y 3
 end
+arch swall_1_1
+x 10
+y 3
+end
 arch dungeon_floor
 x 10
 y 4
 end
+arch swall_2_1_1
+x 10
+y 4
+end
 arch dungeon_floor
 x 10
 y 5
 end
+arch swall_2_1_1
+x 10
+y 5
+end
 arch dungeon_floor
 x 10
 y 6
 end
+arch swall_2_2_1
+x 10
+y 6
+end
 arch dungeon_floor
 x 10
 y 7
@@ -907,15 +1278,11 @@ arch dungeon_floor
 x 10
 y 8
 end
-arch chair_1.3
-x 10
-y 8
-end
 arch dungeon_floor
 x 10
 y 9
 end
-arch chair_1.3
+arch chair_2.3
 x 10
 y 9
 end
@@ -923,10 +1290,6 @@ arch dungeon_floor
 x 10
 y 10
 end
-arch chair_1.3
-x 10
-y 10
-end
 arch dungeon_floor
 x 10
 y 11
@@ -939,18 +1302,46 @@ arch dungeon_floor
 x 10
 y 12
 end
-arch westcwall_2_1_2
-x 10
-y 12
-end
-arch grass
+arch dungeon_floor
 x 10
 y 13
 end
-arch grass
+arch chair_1.3
+x 10
+y 13
+end
+arch dungeon_floor
 x 10
 y 14
 end
+arch dungeon_floor
+x 10
+y 15
+end
+arch chair_1.3
+x 10
+y 15
+end
+arch dungeon_floor
+x 10
+y 16
+end
+arch dungeon_floor
+x 10
+y 17
+end
+arch westcwall_2_1_2
+x 10
+y 17
+end
+arch grass
+x 10
+y 18
+end
+arch grass
+x 10
+y 19
+end
 arch grass
 x 11
 end
@@ -970,6 +1361,11 @@ arch dungeon_floor
 x 11
 y 3
 end
+arch director_5
+x 11
+y 3
+invisible 1
+end
 arch dungeon_floor
 x 11
 y 4
@@ -978,14 +1374,14 @@ arch dungeon_floor
 x 11
 y 5
 end
-arch westcwall_0
-x 11
-y 5
-end
 arch dungeon_floor
 x 11
 y 6
 end
+arch swall_2_1_2
+x 11
+y 6
+end
 arch dungeon_floor
 x 11
 y 7
@@ -994,15 +1390,11 @@ arch dungeon_floor
 x 11
 y 8
 end
-arch chair_1.3
-x 11
-y 8
-end
 arch dungeon_floor
 x 11
 y 9
 end
-arch chair_1.3
+arch chair_2.3
 x 11
 y 9
 end
@@ -1010,10 +1402,6 @@ arch dungeon_floor
 x 11
 y 10
 end
-arch chair_1.3
-x 11
-y 10
-end
 arch dungeon_floor
 x 11
 y 11
@@ -1026,17 +1414,45 @@ arch dungeon_floor
 x 11
 y 12
 end
+arch dungeon_floor
+x 11
+y 13
+end
+arch chair_1.3
+x 11
+y 13
+end
+arch dungeon_floor
+x 11
+y 14
+end
+arch dungeon_floor
+x 11
+y 15
+end
+arch chair_1.3
+x 11
+y 15
+end
+arch dungeon_floor
+x 11
+y 16
+end
+arch dungeon_floor
+x 11
+y 17
+end
 arch westcwall_win2
 x 11
-y 12
+y 17
 end
 arch grass
 x 11
-y 13
+y 18
 end
 arch grass
 x 11
-y 14
+y 19
 end
 arch grass
 x 12
@@ -1057,6 +1473,11 @@ arch dungeon_floor
 x 12
 y 3
 end
+arch director_7
+x 12
+y 3
+invisible 1
+end
 arch dungeon_floor
 x 12
 y 4
@@ -1065,19 +1486,29 @@ arch dungeon_floor
 x 12
 y 5
 end
+arch lightningwall_1
+x 12
+y 5
+arch spell_sm_lightning
+end
+end
 arch dungeon_floor
 x 12
 y 6
 end
+arch swall_1_3
+x 12
+y 6
+end
 arch dungeon_floor
 x 12
 y 7
 end
-arch dungeon_floor
+arch brazier
 x 12
-y 8
+y 7
 end
-arch chair_1.3
+arch dungeon_floor
 x 12
 y 8
 end
@@ -1085,15 +1516,11 @@ arch dungeon_floor
 x 12
 y 9
 end
-arch chair_1.3
-x 12
-y 9
-end
 arch dungeon_floor
 x 12
 y 10
 end
-arch chair_1.3
+arch brazier
 x 12
 y 10
 end
@@ -1101,26 +1528,50 @@ arch dungeon_floor
 x 12
 y 11
 end
-arch chair_1.3
-x 12
-y 11
-end
 arch dungeon_floor
 x 12
 y 12
 end
-arch westcwall_2_1_2
-x 12
-y 12
-end
-arch evergreen
+arch dungeon_floor
 x 12
 y 13
 end
-arch grass
+arch brazier
+x 12
+y 13
+end
+arch dungeon_floor
 x 12
 y 14
 end
+arch dungeon_floor
+x 12
+y 15
+end
+arch dungeon_floor
+x 12
+y 16
+end
+arch brazier
+x 12
+y 16
+end
+arch dungeon_floor
+x 12
+y 17
+end
+arch westcwall_2_1_2
+x 12
+y 17
+end
+arch evergreen
+x 12
+y 18
+end
+arch grass
+x 12
+y 19
+end
 arch grass
 x 13
 end
@@ -1212,18 +1663,58 @@ arch dungeon_floor
 x 13
 y 12
 end
-arch westcwall_2_2_4
+arch westcwall_win1
 x 13
 y 12
 end
-arch grass
+arch dungeon_floor
 x 13
 y 13
 end
-arch grass
+arch westcwall_2_1_1
+x 13
+y 13
+end
+arch dungeon_floor
 x 13
 y 14
 end
+arch westcwall_2_1_1
+x 13
+y 14
+end
+arch dungeon_floor
+x 13
+y 15
+end
+arch westcwall_2_1_1
+x 13
+y 15
+end
+arch dungeon_floor
+x 13
+y 16
+end
+arch westcwall_2_1_1
+x 13
+y 16
+end
+arch dungeon_floor
+x 13
+y 17
+end
+arch westcwall_2_2_4
+x 13
+y 17
+end
+arch grass
+x 13
+y 18
+end
+arch grass
+x 13
+y 19
+end
 arch grass
 x 14
 end
@@ -1279,7 +1770,27 @@ arch grass
 x 14
 y 13
 end
-arch evergreen
+arch grass
 x 14
 y 14
 end
+arch grass
+x 14
+y 15
+end
+arch grass
+x 14
+y 16
+end
+arch grass
+x 14
+y 17
+end
+arch grass
+x 14
+y 18
+end
+arch evergreen
+x 14
+y 19
+end
diff --git a/navar_city/temples/valriel b/navar_city/temples/valriel
index 981061f6f..c2a4c6e3d 100644
--- a/navar_city/temples/valriel
+++ b/navar_city/temples/valriel
@@ -1,5 +1,5 @@
 arch map
-name Temple of Valriel
+name Church of Valriel
 difficulty 1
 region navar
 width 20
@@ -8,7 +8,7 @@ enter_x 9
 enter_y 28
 msg
 Created:  1999-01-18 Raphael Quinet (quinet@gamers.org)
-Modified: 2012-02-19 Rick Tanner
+Modified: 2013-08-18 Kevin Zheng
 endmsg
 end
 arch grass
diff --git a/world/world_121_117 b/world/world_121_117
index 08ea210f3..6fad4d908 100644
--- a/world/world_121_117
+++ b/world/world_121_117
@@ -11848,7 +11848,7 @@ end
 arch sorig_church
 slaying /navar_city/temples/sorig
 hp 7
-sp 13
+sp 16
 x 42
 y 4
 end
diff --git a/world/world_122_117 b/world/world_122_117
index 4a7777999..f87c32c50 100644
--- a/world/world_122_117
+++ b/world/world_122_117
@@ -4128,7 +4128,8 @@ arch grass_only
 x 11
 y 14
 end
-arch valkyrie_temple
+arch small_temple
+name Church of Valkyrie
 slaying ../navar_city/temples/valkyrie
 hp 12
 sp 21