diff --git a/navar_city/misc/aliscave b/navar_city/misc/aliscave
index 9ab7434f8..aa22dcdf5 100644
--- a/navar_city/misc/aliscave
+++ b/navar_city/misc/aliscave
@@ -1,14 +1,16 @@
 arch map
 name Ali's Cave
 reset_timeout 7200
-difficulty 1
+difficulty 40
+region navar
 darkness 3
 width 64
 height 64
-enter_x 1
-enter_y 1
+enter_x 53
+enter_y 54
 msg
 Created:  2004-08-03 Mikeeusa
+Modified: 2008-09-20 Rick Tanner
 endmsg
 end
 arch unholy_ground
diff --git a/navar_city/misc/aliswell b/navar_city/misc/aliswell
index 902541dcc..e6ba496a3 100644
--- a/navar_city/misc/aliswell
+++ b/navar_city/misc/aliswell
@@ -1,15 +1,16 @@
 arch map
 name Dried Up Well
 reset_timeout 7200
-difficulty 1
+difficulty 40
+region navar
 darkness 3
 width 53
 height 51
-enter_x 1
-enter_y 1
+enter_x 9
+enter_y 8
 msg
 Created:  2004-08-03 Mikeeusa
-Modified: 2008-05-29 Arvid Norlander
+Modified: 2008-09-20 Rick Tanner
 endmsg
 end
 arch blocked
diff --git a/navar_city/misc/bowyer b/navar_city/misc/bowyer
index 2fde9a2ed..11967593a 100644
--- a/navar_city/misc/bowyer
+++ b/navar_city/misc/bowyer
@@ -8,7 +8,8 @@ height 15
 enter_x 6
 enter_y 14
 msg
-Created:  2002-02-28
+Created:  2002-12-28
+Modified: 2008-09-20 Rick Tanner
 endmsg
 end
 arch grass
diff --git a/navar_city/misc/buildshop b/navar_city/misc/buildshop
index 073456b77..47aa25d03 100644
--- a/navar_city/misc/buildshop
+++ b/navar_city/misc/buildshop
@@ -1,6 +1,6 @@
 arch map
 name Ye ol' Home Depote
-difficulty 1
+difficulty 5
 region navar
 shopitems building material:95;item builder:95;*:-100
 shopgreed 1.00000
@@ -9,10 +9,11 @@ shopmax 20000
 shoprace human
 width 23
 height 13
-enter_x 17
-enter_y 19
+enter_x 6
+enter_y 11
 msg
 Created:  2004-01-25 Ryo Saeba
+Modified: 2008-09-20 Rick Tanner
 endmsg
 end
 arch tile_white_floor
diff --git a/navar_city/misc/city1armour b/navar_city/misc/city1armour
index e4403d252..773be05e1 100644
--- a/navar_city/misc/city1armour
+++ b/navar_city/misc/city1armour
@@ -10,8 +10,11 @@ shopmax 10000
 shoprace dwarf
 width 19
 height 16
+enter_x 1
+enter_y 1
 msg
 Created:  1993-10-27
+Modified: 2008-09-20 Rick Tanner
 endmsg
 end
 arch flagstone
diff --git a/navar_city/misc/city1bank b/navar_city/misc/city1bank
index 8ea672442..fe3a91cb3 100644
--- a/navar_city/misc/city1bank
+++ b/navar_city/misc/city1bank
@@ -4,8 +4,11 @@ difficulty 5
 region navar
 width 17
 height 16
+enter_x 8
+enter_y 14
 msg
 Created:  1993-11-17
+Modified: 2008-09-20 Rick Tanner
 endmsg
 end
 arch cobblestones
diff --git a/navar_city/misc/city1mermaid b/navar_city/misc/city1mermaid
index 2736ac6f5..83ddf9cab 100644
--- a/navar_city/misc/city1mermaid
+++ b/navar_city/misc/city1mermaid
@@ -1,12 +1,14 @@
 arch map
 name The Frolicing Mermaid
-difficulty 1
+difficulty 8
 region navar
 width 21
 height 13
+enter_x 10
+enter_y 12
 msg
 Created:  1993-10-27
-Modified: 2008-05-23 Arvid Norlander
+Modified: 2008-09-20 Rick Tanner
 endmsg
 end
 arch woodfloor
diff --git a/navar_city/misc/city1smith b/navar_city/misc/city1smith
index 9c8fcc3c8..be095eca3 100644
--- a/navar_city/misc/city1smith
+++ b/navar_city/misc/city1smith
@@ -10,8 +10,11 @@ shoprace dwarf
 darkness 1
 width 16
 height 10
+enter_x 8
+enter_y 8
 msg
 Created:  1993-10-27
+Modified: 2008-09-20 Rick Tanner
 endmsg
 end
 arch stonefloor2
diff --git a/navar_city/misc/city1weapon b/navar_city/misc/city1weapon
index 8986b5084..67aa071c1 100644
--- a/navar_city/misc/city1weapon
+++ b/navar_city/misc/city1weapon
@@ -10,8 +10,11 @@ shopmax 10000
 shoprace human
 width 21
 height 11
+enter_x 1
+enter_y 1
 msg
 Created:  1993-10-27
+Modified: 2008-09-20 Rick Tanner
 endmsg
 end
 arch flagstone
diff --git a/navar_city/misc/dragon_guild b/navar_city/misc/dragon_guild
index 5599b55de..5a7c608d1 100644
--- a/navar_city/misc/dragon_guild
+++ b/navar_city/misc/dragon_guild
@@ -11,9 +11,10 @@ shoprace dragon
 width 16
 height 16
 enter_x 7
-enter_y 14
+enter_y 15
 msg
 Created:  2002-02-28
+Modified: 2008-09-20 Rick Tanner
 endmsg
 end
 arch flagstone
diff --git a/navar_city/misc/midane b/navar_city/misc/midane
index 52c712792..8ae70188c 100644
--- a/navar_city/misc/midane
+++ b/navar_city/misc/midane
@@ -4,8 +4,11 @@ difficulty 1
 region navar
 width 12
 height 24
+enter_x 6
+enter_y 2
 msg
 Created:  2007-04-16
+Modified: 2008-09-20 Rick Tanner
 endmsg
 outdoor 1
 end
diff --git a/navar_city/misc/navarwiz b/navar_city/misc/navarwiz
index f72bc9a54..0b8c53acc 100644
--- a/navar_city/misc/navarwiz
+++ b/navar_city/misc/navarwiz
@@ -5,8 +5,11 @@ region navar
 darkness 4
 width 7
 height 7
+enter_x 5
+enter_y 5
 msg
 Created:  2006-08-11 Alex Schultz
+Modified: 2008-09-20 Rick Tanner
 endmsg
 end
 arch dungeon_magic
diff --git a/navar_city/misc/theater b/navar_city/misc/theater
index 88548b5cd..721de1958 100644
--- a/navar_city/misc/theater
+++ b/navar_city/misc/theater
@@ -5,11 +5,11 @@ difficulty 1
 region navar
 width 32
 height 32
-enter_x 1
-enter_y 1
+enter_x 15
+enter_y 28
 msg
 Created:  2004-08-03 Mikeeusa
-Modified: 2008-06-20 Arvid Norlander
+Modified: 2008-09-20 Rick Tanner
 endmsg
 outdoor 1
 end
diff --git a/navar_city/misc/theater2 b/navar_city/misc/theater2
index 20acbba41..a64834894 100644
--- a/navar_city/misc/theater2
+++ b/navar_city/misc/theater2
@@ -5,10 +5,11 @@ difficulty 1
 region navar
 width 32
 height 32
-enter_x 1
-enter_y 1
+enter_x 29
+enter_y 2
 msg
 Created:  2004-08-03 Mikeeusa
+Modified: 2008-09-20 Rick Tanner
 endmsg
 outdoor 1
 end
diff --git a/navar_city/misc/theater3 b/navar_city/misc/theater3
index a1b765e92..3d8211bf6 100644
--- a/navar_city/misc/theater3
+++ b/navar_city/misc/theater3
@@ -5,10 +5,11 @@ difficulty 1
 region navar
 width 32
 height 32
-enter_x 1
-enter_y 1
+enter_x 8
+enter_y 8
 msg
 Created:  2004-08-03 Mikeeusa
+Modified: 2008-09-20 Rick Tanner
 endmsg
 outdoor 1
 end
diff --git a/navar_city/misc/theater4 b/navar_city/misc/theater4
index c715f5a6c..0b5de8f20 100644
--- a/navar_city/misc/theater4
+++ b/navar_city/misc/theater4
@@ -5,10 +5,11 @@ difficulty 1
 region navar
 width 32
 height 32
-enter_x 1
-enter_y 1
+enter_x 4
+enter_y 4
 msg
 Created:  2004-08-03 Mikeeusa
+Modified: 2008-09-20 Rick Tanner
 endmsg
 outdoor 1
 end
diff --git a/navar_city/misc/theaterb1 b/navar_city/misc/theaterb1
index d5a4c567a..5998544c5 100644
--- a/navar_city/misc/theaterb1
+++ b/navar_city/misc/theaterb1
@@ -1,15 +1,16 @@
 arch map
 name Civic Theater
 reset_timeout 7200
-difficulty 1
+difficulty 65
 region navar
 darkness 2
 width 32
 height 32
-enter_x 1
-enter_y 1
+enter_x 2
+enter_y 29
 msg
 Created:  2004-08-03 Mikeeusa
+Modified: 2008-09-20 Rick Tanner
 endmsg
 end
 arch blocked
diff --git a/navar_city/misc/theaterb2 b/navar_city/misc/theaterb2
index 38218d76a..737d3b793 100644
--- a/navar_city/misc/theaterb2
+++ b/navar_city/misc/theaterb2
@@ -1,15 +1,16 @@
 arch map
 name Civic Theater
 reset_timeout 7200
-difficulty 1
+difficulty 70
 region navar
 darkness 2
 width 32
 height 32
-enter_x 1
+enter_x 10
 enter_y 1
 msg
 Created:  2004-08-03 Mikeeusa
+Modified: 2008-09-20 Rick Tanner
 endmsg
 end
 arch marble
diff --git a/navar_city/misc/theaterb3 b/navar_city/misc/theaterb3
index e3df05899..18533bf30 100644
--- a/navar_city/misc/theaterb3
+++ b/navar_city/misc/theaterb3
@@ -1,16 +1,16 @@
 arch map
 name Civic Theater
 reset_timeout 7200
-difficulty 1
+difficulty 80
 region navar
 darkness 2
 width 32
 height 118
-enter_x 1
-enter_y 1
+enter_x 22
+enter_y 27
 msg
 Created:  2004-08-03 Mikeeusa
-Modified: 2007-11-04 Andreas Kirschbaum
+Modified: 2008-09-20 Rick Tanner
 endmsg
 tile_path_4 /navar_city/misc/theaterb4
 end
diff --git a/navar_city/misc/theaterb4 b/navar_city/misc/theaterb4
index 745786b03..f0f29b64c 100644
--- a/navar_city/misc/theaterb4
+++ b/navar_city/misc/theaterb4
@@ -6,11 +6,11 @@ region navar
 darkness 2
 width 32
 height 95
-enter_x 1
-enter_y 1
+enter_x 30
+enter_y 73
 msg
 Created:  2004-08-03 Mikeeusa
-Modified: 2008-05-29 Arvid Norlander
+Modified: 2008-09-20 Rick Tanner
 endmsg
 end
 arch blocked