diff --git a/navar_city/city1church1 b/navar_city/city1church1
index e5db019a8..fade80361 100644
--- a/navar_city/city1church1
+++ b/navar_city/city1church1
@@ -1,11 +1,14 @@
 arch map
 name Mostrai Cathedral
-difficulty 1
+difficulty 4
 region navar
 width 18
 height 26
+enter_x 8
+enter_y 25
 msg
 Created:  1993-11-10 Cater & Wade (john_cater@yahoo.com)
+Modified: 2008-09-21 Rick Tanner
 endmsg
 end
 arch stonefloor2
diff --git a/navar_city/city1court b/navar_city/city1court
index da4d15fc5..afdf1261a 100644
--- a/navar_city/city1court
+++ b/navar_city/city1court
@@ -4,9 +4,11 @@ difficulty 1
 region navar
 width 21
 height 19
+enter_x 10
+enter_y 16
 msg
 Created:  1993-11-01 (john_cater@yahoo.com)
-Modified: 2008-06-03 Arvid Norlander
+Modified: 2008-09-21 Rick Tanner
 endmsg
 end
 arch cobblestones2
diff --git a/navar_city/city1enter b/navar_city/city1enter
index d5d71d876..0482e983c 100644
--- a/navar_city/city1enter
+++ b/navar_city/city1enter
@@ -6,10 +6,10 @@ region navar
 width 20
 height 13
 enter_x 1
-enter_y 1
+enter_y 5
 msg
 Created:  1993-10-28
-Modified: 2008-05-23 Arvid Norlander
+Modified: 2008-09-21 Rick Tanner
 endmsg
 end
 arch dungeon_floor
diff --git a/navar_city/city1prison b/navar_city/city1prison
index 22e3d0feb..e2ab6cc57 100644
--- a/navar_city/city1prison
+++ b/navar_city/city1prison
@@ -1,10 +1,13 @@
 arch map
 name Prison
+difficulty 10
 region navar
 width 26
 height 23
+enter_y 1
 msg
 Created:  1993-10-27
+Modified: 2008-09-21 Rick Tanner
 endmsg
 end
 arch dungeon_floor
diff --git a/navar_city/collosium b/navar_city/collosium
index 1751072aa..140d9ed17 100644
--- a/navar_city/collosium
+++ b/navar_city/collosium
@@ -1,11 +1,14 @@
 arch map
 name Collosium
-difficulty 1
+difficulty 20
 region navar
 width 36
 height 26
+enter_x 17
+enter_y 22
 msg
 Created:  1999-01-22 Cater & Wade (john_cater@yahoo.com)
+Modified: 2008-09-21 Rick Tanner
 endmsg
 end
 arch grassmedium
diff --git a/navar_city/spyhouse b/navar_city/spyhouse
index 04553ad9d..1d51c70bb 100644
--- a/navar_city/spyhouse
+++ b/navar_city/spyhouse
@@ -1,15 +1,15 @@
 arch map
 name Small House
 reset_timeout 7200
-difficulty 1
+difficulty 15
 region navar
 width 23
 height 21
-enter_x 1
-enter_y 1
+enter_x 4
+enter_y 8
 msg
 Created:  2004-08-03 Mikeeusa
-Modified: 2008-05-29 Arvid Norlander
+Modified: 2008-09-21 Rick Tanner
 endmsg
 end
 arch dungeon_floor
diff --git a/navar_city/warehouse1 b/navar_city/warehouse1
index 019972744..5331b5b63 100644
--- a/navar_city/warehouse1
+++ b/navar_city/warehouse1
@@ -1,11 +1,14 @@
 arch map
 name Warehouse #1
-difficulty 1
+difficulty 15
 region navar
 width 16
 height 25
+enter_x 7
+enter_y 24
 msg
 Created:  1993-11-09
+Modified: 2008-09-21 Rick Tanner
 endmsg
 end
 arch woodfloor
diff --git a/navar_city/warehouse2 b/navar_city/warehouse2
index 3c90b37d6..94784da3d 100644
--- a/navar_city/warehouse2
+++ b/navar_city/warehouse2
@@ -1,11 +1,14 @@
 arch map
 name Warehouse #2
-difficulty 1
+difficulty 7
 region navar
 width 16
 height 26
+enter_x 12
+enter_y 23
 msg
 Created:  1993-11-10
+Modified: 2008-09-21 Rick Tanner
 endmsg
 end
 arch woodfloor
diff --git a/navar_city/warehouse3 b/navar_city/warehouse3
index 94cbafbed..6ef47fa06 100644
--- a/navar_city/warehouse3
+++ b/navar_city/warehouse3
@@ -1,12 +1,14 @@
 arch map
 name Warehouse #3
-difficulty 1
+difficulty 9
 region navar
 width 20
 height 35
+enter_x 2
+enter_y 34
 msg
 Created:  1993-11-10
-Modified: 2007-11-04 Andreas Kirschbaum
+Modified: 2008-09-21 Rick Tanner
 endmsg
 end
 arch woodfloor
diff --git a/navar_city/warehouse4 b/navar_city/warehouse4
index f25365282..aef0ec21f 100644
--- a/navar_city/warehouse4
+++ b/navar_city/warehouse4
@@ -1,11 +1,14 @@
 arch map
 name Warehouse #4
-difficulty 1
+difficulty 3
 region navar
 width 30
 height 16
+enter_x 27
+enter_y 15
 msg
 Created:  1993-11-12
+Modified: 2008-09-21 Rick Tanner
 endmsg
 end
 arch woodfloor
diff --git a/navar_city/warehouse5 b/navar_city/warehouse5
index 4131e8c94..0113acc63 100644
--- a/navar_city/warehouse5
+++ b/navar_city/warehouse5
@@ -1,11 +1,14 @@
 arch map
 name Warehouse #5
-difficulty 1
+difficulty 17
 region navar
 width 25
 height 21
+enter_x 24
+enter_y 9
 msg
 Created:  1993-11-15
+Modified: 2008-09-21 Rick Tanner
 endmsg
 end
 arch woodfloor
diff --git a/navar_city/warehouse6 b/navar_city/warehouse6
index feb45f03e..e02fe9e4d 100644
--- a/navar_city/warehouse6
+++ b/navar_city/warehouse6
@@ -1,11 +1,14 @@
 arch map
 name Warehouse #6
-difficulty 1
+difficulty 15
 region navar
 width 23
 height 28
+enter_x 4
+enter_y 27
 msg
 Created:  1993-11-15
+Modified: 2008-09-21 Rick Tanner
 endmsg
 end
 arch woodfloor
diff --git a/navar_city/warehouse7 b/navar_city/warehouse7
index 8e3b9424d..a814ddf14 100644
--- a/navar_city/warehouse7
+++ b/navar_city/warehouse7
@@ -1,11 +1,13 @@
 arch map
 name Warehouse #8
-difficulty 1
+difficulty 20
 region navar
 width 17
 height 27
+enter_x 7
 msg
 Created:  1993-11-15
+Modified: 2008-09-21 Rick Tanner
 endmsg
 end
 arch woodfloor
diff --git a/navar_city/warehouse8 b/navar_city/warehouse8
index 362d61198..09ab4d3ff 100644
--- a/navar_city/warehouse8
+++ b/navar_city/warehouse8
@@ -1,11 +1,13 @@
 arch map
 name Deserted Warehouse
-difficulty 1
+difficulty 15
 region navar
 width 28
 height 21
+enter_y 1
 msg
 Created:  1993-11-15
+Modified: 2008-09-21 Rick Tanner
 endmsg
 end
 arch woodfloor