diff --git a/darcap/darcap/tavern b/darcap/darcap/tavern
index 0bb2e9b7f..7bc991008 100644
--- a/darcap/darcap/tavern
+++ b/darcap/darcap/tavern
@@ -1,15 +1,15 @@
 arch map
-region darcap
 name tavern
+region darcap
 msg
 Creator: Cater/Wade
 Email: john_cater@yahoo.com
 Date: Fri Jan 15 12:02:40 1999
 endmsg
-hp 19
-sp 13
-x 26
-y 19
+width 26
+height 19
+enter_x 19
+enter_y 13
 end
 arch cobblestones2
 end
@@ -503,11 +503,11 @@ x 5
 y 10
 end
 arch man
+face man.131
 msg
 @match *
 What can I get you?
 endmsg
-face man.131
 x 5
 y 10
 end
@@ -631,9 +631,9 @@ x 6
 y 7
 end
 arch table_4
+no_pass 1
 x 6
 y 7
-no_pass 1
 end
 arch magic_banned
 x 6
@@ -644,9 +644,9 @@ x 6
 y 8
 end
 arch table_4
+no_pass 1
 x 6
 y 8
-no_pass 1
 end
 arch magic_banned
 x 6
@@ -657,9 +657,9 @@ x 6
 y 9
 end
 arch table_4
+no_pass 1
 x 6
 y 9
-no_pass 1
 end
 arch magic_banned
 x 6
@@ -670,9 +670,9 @@ x 6
 y 10
 end
 arch table_4
+no_pass 1
 x 6
 y 10
-no_pass 1
 end
 arch magic_banned
 x 6
@@ -683,9 +683,9 @@ x 6
 y 11
 end
 arch table_4
+no_pass 1
 x 6
 y 11
-no_pass 1
 end
 arch magic_banned
 x 6
@@ -775,9 +775,9 @@ msg
 @match *
 Grr... Go away!
 endmsg
+friendly 1
 x 7
 y 5
-friendly 1
 end
 arch magic_banned
 x 7
@@ -812,15 +812,15 @@ x 7
 y 9
 end
 arch man
+face man.171
 msg
 @match *
 Buy me a drink
 endmsg
-face man.171
-x 7
-y 9
 friendly 1
 unaggressive 0
+x 7
+y 9
 end
 arch magic_banned
 x 7
@@ -864,10 +864,10 @@ Visit the well !!
 @match *
 I'm too busy to answer your queries.
 endmsg
-x 7
-y 13
 friendly 1
 unaggressive 0
+x 7
+y 13
 end
 arch woodfloor
 x 7
@@ -1056,10 +1056,10 @@ x 9
 y 6
 end
 arch woman
-x 9
-y 6
 friendly 1
 unaggressive 0
+x 9
+y 6
 end
 arch magic_banned
 x 9
@@ -1206,11 +1206,11 @@ y 7
 end
 arch guildmaster
 name Old Man
-x 10
-y 7
 monster 0
 friendly 1
 unaggressive 0
+x 10
+y 7
 end
 arch magic_banned
 x 10
@@ -1455,10 +1455,10 @@ x 12
 y 7
 end
 arch woman
-x 12
-y 7
 friendly 1
 unaggressive 0
+x 12
+y 7
 end
 arch magic_banned
 x 12
@@ -1646,11 +1646,11 @@ on the northeast edge of the continent.
 I've heard about incredible artifacts
 in there.
 endmsg
-x 13
-y 10
 is_animated 0
 friendly 1
 unaggressive 0
+x 13
+y 10
 end
 arch magic_banned
 x 13
@@ -1766,10 +1766,10 @@ poses the fire-part...
 I've devoted myself to the elemental
 quest.
 endmsg
-x 14
-y 7
 friendly 1
 unaggressive 0
+x 14
+y 7
 end
 arch magic_banned
 x 14
@@ -2094,11 +2094,11 @@ continent, you should buy yourself a
 permanent apartment in Caterham
 first.
 endmsg
-x 16
-y 12
 monster 0
 friendly 1
 unaggressive 0
+x 16
+y 12
 end
 arch magic_banned
 x 16
@@ -2164,10 +2164,18 @@ x 17
 y 5
 end
 arch ninja2
-x 17
-y 5
+msg
+@match [Ll]and|[Ee]xiled
+I lived north-east from here, untill I took a
+boat out to talk to a forginer like you.
+They didn't let me go back.
+@match *
+Ive been exiled from my land.
+endmsg
 friendly 1
 unaggressive 0
+x 17
+y 5
 end
 arch magic_banned
 x 17
@@ -2550,6 +2558,7 @@ y 5
 end
 arch wizard
 name old wizard
+face wizard_yellow.151
 msg
 @match no|library|spell
 It's located in a mountain village,
@@ -2560,16 +2569,15 @@ charge for a small entrance fee.
 Did you know that there is a huge
 spellbook library on dtabb?
 endmsg
-face wizard_yellow.151
+type 0
 hp 100
 maxhp 100
-x 20
-y 5
 level 10
-type 0
 randomitems none
 monster 1
 friendly 1
+x 20
+y 5
 end
 arch magic_banned
 x 20
@@ -2600,11 +2608,11 @@ x 20
 y 8
 end
 arch sailor
-x 20
-y 8
 friendly 1
 unaggressive 0
 random_movement 0
+x 20
+y 8
 end
 arch magic_banned
 x 20
@@ -2631,11 +2639,11 @@ x 20
 y 10
 end
 arch sailor
-x 20
-y 10
 friendly 1
 unaggressive 0
 random_movement 0
+x 20
+y 10
 end
 arch magic_banned
 x 20