diff --git a/pup_land/lone_town/town b/pup_land/lone_town/town
index d678b47b0..309d4f04c 100644
--- a/pup_land/lone_town/town
+++ b/pup_land/lone_town/town
@@ -8,6 +8,7 @@ enter_x 5
 enter_y 18
 msg
 Created:  1996-02-25
+Modified: 2008-03-23 leaf
 endmsg
 end
 arch grass
@@ -131,12 +132,12 @@ end
 arch dwall_2_1_2
 x 1
 end
-arch evergreen
-name laurel
+arch dungeon_magic
 x 1
 y 1
 end
-arch dungeon_magic
+arch evergreen
+name laurel
 x 1
 y 1
 end
@@ -148,11 +149,11 @@ sp 14
 x 1
 y 1
 end
-arch pstone_1
+arch dungeon_magic
 x 1
 y 2
 end
-arch dungeon_magic
+arch pstone_1
 x 1
 y 2
 end
@@ -195,11 +196,11 @@ arch grass
 x 1
 y 8
 end
-arch grass
+arch dungeon_magic
 x 1
 y 9
 end
-arch dungeon_magic
+arch grass
 x 1
 y 9
 end
@@ -211,11 +212,11 @@ sp 10
 x 1
 y 9
 end
-arch grass
+arch dungeon_magic
 x 1
 y 10
 end
-arch dungeon_magic
+arch grass
 x 1
 y 10
 end
@@ -325,19 +326,19 @@ arch grass
 x 2
 y 8
 end
-arch grass
-x 2
-y 9
-end
 arch dungeon_magic
 x 2
 y 9
 end
 arch grass
 x 2
+y 9
+end
+arch dungeon_magic
+x 2
 y 10
 end
-arch dungeon_magic
+arch grass
 x 2
 y 10
 end
@@ -628,11 +629,11 @@ arch grass
 x 5
 y 8
 end
-arch grass
+arch dungeon_magic
 x 5
 y 9
 end
-arch dungeon_magic
+arch grass
 x 5
 y 9
 end
@@ -644,11 +645,11 @@ sp 1
 x 5
 y 9
 end
-arch grass
+arch dungeon_magic
 x 5
 y 10
 end
-arch dungeon_magic
+arch grass
 x 5
 y 10
 end
@@ -737,19 +738,19 @@ arch grass
 x 6
 y 8
 end
-arch grass
-x 6
-y 9
-end
 arch dungeon_magic
 x 6
 y 9
 end
 arch grass
 x 6
+y 9
+end
+arch dungeon_magic
+x 6
 y 10
 end
-arch dungeon_magic
+arch grass
 x 6
 y 10
 end
@@ -757,11 +758,11 @@ arch cobblestones
 x 6
 y 11
 end
-arch grass
+arch dungeon_magic
 x 6
 y 12
 end
-arch dungeon_magic
+arch grass
 x 6
 y 12
 end
@@ -773,18 +774,22 @@ sp 19
 x 6
 y 12
 end
-arch grass
-x 6
-y 13
-end
 arch dungeon_magic
 x 6
 y 13
 end
 arch grass
 x 6
+y 13
+end
+arch grass
+x 6
 y 14
 end
+arch dungeon_magic
+x 6
+y 15
+end
 arch grass
 x 6
 y 15
@@ -797,10 +802,6 @@ sp 21
 x 6
 y 15
 end
-arch dungeon_magic
-x 6
-y 15
-end
 arch cobblestones
 x 6
 y 16
@@ -903,19 +904,19 @@ arch cobblestones
 x 7
 y 11
 end
-arch grass
-x 7
-y 12
-end
 arch dungeon_magic
 x 7
 y 12
 end
 arch grass
 x 7
+y 12
+end
+arch dungeon_magic
+x 7
 y 13
 end
-arch dungeon_magic
+arch grass
 x 7
 y 13
 end
@@ -923,6 +924,10 @@ arch evergreens
 x 7
 y 14
 end
+arch dungeon_magic
+x 7
+y 15
+end
 arch grass
 x 7
 y 15
@@ -935,10 +940,6 @@ sp 21
 x 7
 y 15
 end
-arch dungeon_magic
-x 7
-y 15
-end
 arch cobblestones
 x 7
 y 16
@@ -1087,6 +1088,10 @@ arch woods_2
 x 9
 y 7
 end
+arch dungeon_magic
+x 9
+y 8
+end
 arch grass
 x 9
 y 8
@@ -1096,10 +1101,6 @@ name Thieves' Den
 x 9
 y 8
 end
-arch dungeon_magic
-x 9
-y 8
-end
 arch grass
 x 9
 y 9
@@ -1198,6 +1199,10 @@ arch grass
 x 10
 y 5
 end
+arch dungeon_magic
+x 10
+y 6
+end
 arch grass
 x 10
 y 6
@@ -1210,31 +1215,27 @@ sp 8
 x 10
 y 6
 end
+arch grass
+x 10
+y 7
+end
+arch evergreens
+x 10
+y 7
+end
+arch grass
+x 10
+y 8
+end
+arch evergreens
+x 10
+y 8
+end
 arch dungeon_magic
 x 10
-y 6
-end
-arch grass
-x 10
-y 7
-end
-arch evergreens
-x 10
-y 7
-end
-arch grass
-x 10
-y 8
-end
-arch evergreens
-x 10
-y 8
-end
-arch grass
-x 10
 y 9
 end
-arch dungeon_magic
+arch grass
 x 10
 y 9
 end
@@ -1246,13 +1247,17 @@ sp 14
 x 10
 y 9
 end
+arch dungeon_magic
+x 10
+y 10
+end
 arch grass
 x 10
 y 10
 end
 arch dungeon_magic
 x 10
-y 10
+y 11
 end
 arch cobblestones
 x 10
@@ -1260,7 +1265,7 @@ y 11
 end
 arch dungeon_magic
 x 10
-y 11
+y 12
 end
 arch grass
 x 10
@@ -1272,7 +1277,7 @@ y 12
 end
 arch dungeon_magic
 x 10
-y 12
+y 13
 end
 arch grass
 x 10
@@ -1284,7 +1289,7 @@ y 13
 end
 arch dungeon_magic
 x 10
-y 13
+y 14
 end
 arch grass
 x 10
@@ -1294,10 +1299,6 @@ arch evergreens2
 x 10
 y 14
 end
-arch dungeon_magic
-x 10
-y 14
-end
 arch grass
 x 10
 y 15
@@ -1376,27 +1377,27 @@ arch evergreens
 x 11
 y 8
 end
-arch grass
-x 11
-y 9
-end
 arch dungeon_magic
 x 11
 y 9
 end
 arch grass
 x 11
-y 10
+y 9
 end
 arch dungeon_magic
 x 11
 y 10
 end
-arch cobblestones
+arch grass
+x 11
+y 10
+end
+arch dungeon_magic
 x 11
 y 11
 end
-arch dungeon_magic
+arch cobblestones
 x 11
 y 11
 end
@@ -1425,13 +1426,17 @@ arch dungeon_magic
 x 11
 y 13
 end
+arch dungeon_magic
+x 11
+y 14
+end
 arch footpath_3_2
 x 11
 y 14
 end
 arch dungeon_magic
 x 11
-y 14
+y 15
 end
 arch cobblestones
 x 11
@@ -1439,7 +1444,7 @@ y 15
 end
 arch dungeon_magic
 x 11
-y 15
+y 16
 end
 arch cobblestones
 x 11
@@ -1447,7 +1452,7 @@ y 16
 end
 arch dungeon_magic
 x 11
-y 16
+y 17
 end
 arch grass
 x 11
@@ -1455,13 +1460,9 @@ y 17
 end
 arch dungeon_magic
 x 11
-y 17
-end
-arch grass
-x 11
 y 18
 end
-arch dungeon_magic
+arch grass
 x 11
 y 18
 end
@@ -1531,14 +1532,14 @@ arch cobblestones
 x 12
 y 10
 end
+arch dungeon_magic
+x 12
+y 11
+end
 arch cobblestones
 x 12
 y 11
 end
-arch dungeon_magic
-x 12
-y 11
-end
 arch grass
 x 12
 y 12
@@ -1555,13 +1556,17 @@ arch dungeon_magic
 x 12
 y 13
 end
+arch dungeon_magic
+x 12
+y 14
+end
 arch footpath_3_4
 x 12
 y 14
 end
 arch dungeon_magic
 x 12
-y 14
+y 15
 end
 arch cobblestones
 x 12
@@ -1569,13 +1574,9 @@ y 15
 end
 arch dungeon_magic
 x 12
-y 15
-end
-arch grass
-x 12
 y 16
 end
-arch dungeon_magic
+arch grass
 x 12
 y 16
 end
@@ -1587,11 +1588,11 @@ sp 23
 x 12
 y 16
 end
-arch grass
+arch dungeon_magic
 x 12
 y 17
 end
-arch dungeon_magic
+arch grass
 x 12
 y 17
 end
@@ -1629,11 +1630,11 @@ arch cobblestones
 x 13
 y 2
 end
-arch grass
+arch dungeon_magic
 x 13
 y 3
 end
-arch dungeon_magic
+arch grass
 x 13
 y 3
 end
@@ -1644,19 +1645,19 @@ hp 4
 x 13
 y 3
 end
-arch grass
-x 13
-y 4
-end
 arch dungeon_magic
 x 13
 y 4
 end
 arch grass
 x 13
+y 4
+end
+arch dungeon_magic
+x 13
 y 5
 end
-arch dungeon_magic
+arch grass
 x 13
 y 5
 end
@@ -1667,11 +1668,11 @@ sp 8
 x 13
 y 5
 end
-arch grass
+arch dungeon_magic
 x 13
 y 6
 end
-arch dungeon_magic
+arch grass
 x 13
 y 6
 end
@@ -1683,11 +1684,11 @@ arch evergreen
 x 13
 y 8
 end
-arch grass
+arch dungeon_magic
 x 13
 y 9
 end
-arch dungeon_magic
+arch grass
 x 13
 y 9
 end
@@ -1699,13 +1700,17 @@ sp 7
 x 13
 y 9
 end
+arch dungeon_magic
+x 13
+y 10
+end
 arch grass
 x 13
 y 10
 end
 arch dungeon_magic
 x 13
-y 10
+y 11
 end
 arch cobblestones
 x 13
@@ -1713,7 +1718,7 @@ y 11
 end
 arch dungeon_magic
 x 13
-y 11
+y 12
 end
 arch grass
 x 13
@@ -1725,7 +1730,7 @@ y 12
 end
 arch dungeon_magic
 x 13
-y 12
+y 13
 end
 arch grass
 x 13
@@ -1737,7 +1742,7 @@ y 13
 end
 arch dungeon_magic
 x 13
-y 13
+y 14
 end
 arch grass
 x 13
@@ -1749,7 +1754,7 @@ y 14
 end
 arch dungeon_magic
 x 13
-y 14
+y 15
 end
 arch cobblestones
 x 13
@@ -1757,7 +1762,7 @@ y 15
 end
 arch dungeon_magic
 x 13
-y 15
+y 16
 end
 arch grass
 x 13
@@ -1765,13 +1770,9 @@ y 16
 end
 arch dungeon_magic
 x 13
-y 16
-end
-arch grass
-x 13
 y 17
 end
-arch dungeon_magic
+arch grass
 x 13
 y 17
 end
@@ -1797,6 +1798,10 @@ end
 arch dwall_2_1_2
 x 14
 end
+arch dungeon_magic
+x 14
+y 1
+end
 arch grass
 x 14
 y 1
@@ -1809,25 +1814,17 @@ sp 7
 x 14
 y 1
 end
-arch dungeon_magic
-x 14
-y 1
-end
 arch cobblestones
 x 14
 y 2
 end
-arch grass
-x 14
-y 3
-end
 arch dungeon_magic
 x 14
 y 3
 end
 arch grass
 x 14
-y 4
+y 3
 end
 arch dungeon_magic
 x 14
@@ -1835,7 +1832,7 @@ y 4
 end
 arch grass
 x 14
-y 5
+y 4
 end
 arch dungeon_magic
 x 14
@@ -1843,9 +1840,13 @@ y 5
 end
 arch grass
 x 14
+y 5
+end
+arch dungeon_magic
+x 14
 y 6
 end
-arch dungeon_magic
+arch grass
 x 14
 y 6
 end
@@ -1857,19 +1858,19 @@ arch tree
 x 14
 y 8
 end
-arch grass
-x 14
-y 9
-end
 arch dungeon_magic
 x 14
 y 9
 end
 arch grass
 x 14
+y 9
+end
+arch dungeon_magic
+x 14
 y 10
 end
-arch dungeon_magic
+arch grass
 x 14
 y 10
 end
@@ -1901,6 +1902,10 @@ arch river_n-s
 x 14
 y 14
 end
+arch dungeon_magic
+x 14
+y 15
+end
 arch pstone_1
 x 14
 y 15
@@ -1909,10 +1914,6 @@ arch bridge_we
 x 14
 y 15
 end
-arch dungeon_magic
-x 14
-y 15
-end
 arch pstone_1
 x 14
 y 16
@@ -1983,11 +1984,11 @@ arch evergreen
 x 15
 y 8
 end
-arch grass
+arch dungeon_magic
 x 15
 y 9
 end
-arch dungeon_magic
+arch grass
 x 15
 y 9
 end
@@ -1999,11 +2000,11 @@ sp 7
 x 15
 y 9
 end
-arch grass
+arch dungeon_magic
 x 15
 y 10
 end
-arch dungeon_magic
+arch grass
 x 15
 y 10
 end
@@ -2027,6 +2028,10 @@ arch river_sw-ne_l
 x 15
 y 13
 end
+arch dungeon_magic
+x 15
+y 14
+end
 arch grass
 x 15
 y 14
@@ -2039,10 +2044,6 @@ sp 14
 x 15
 y 14
 end
-arch dungeon_magic
-x 15
-y 14
-end
 arch cobblestones
 x 15
 y 15
@@ -2113,19 +2114,19 @@ arch grass
 x 16
 y 8
 end
-arch grass
-x 16
-y 9
-end
 arch dungeon_magic
 x 16
 y 9
 end
 arch grass
 x 16
+y 9
+end
+arch dungeon_magic
+x 16
 y 10
 end
-arch dungeon_magic
+arch grass
 x 16
 y 10
 end
@@ -2157,11 +2158,11 @@ arch cobblestones
 x 16
 y 15
 end
-arch grass
+arch dungeon_magic
 x 16
 y 16
 end
-arch dungeon_magic
+arch grass
 x 16
 y 16
 end
@@ -2259,6 +2260,10 @@ arch river_nw-e
 x 17
 y 13
 end
+arch dungeon_magic
+x 17
+y 14
+end
 arch grass
 x 17
 y 14
@@ -2271,19 +2276,15 @@ sp 15
 x 17
 y 14
 end
-arch dungeon_magic
-x 17
-y 14
-end
 arch pstone_1
 x 17
 y 15
 end
-arch grass
+arch dungeon_magic
 x 17
 y 16
 end
-arch dungeon_magic
+arch grass
 x 17
 y 16
 end
@@ -2353,6 +2354,10 @@ arch grass
 x 18
 y 10
 end
+arch dungeon_magic
+x 18
+y 11
+end
 arch grass
 x 18
 y 11
@@ -2364,10 +2369,6 @@ hp 1
 x 18
 y 11
 end
-arch dungeon_magic
-x 18
-y 11
-end
 arch pstone_1
 x 18
 y 12
@@ -2710,27 +2711,27 @@ arch evergreen
 x 21
 y 10
 end
-arch pstone_1
+arch dungeon_magic
 x 21
 y 11
 end
-arch dungeon_magic
+arch pstone_1
 x 21
 y 11
 end
 arch dragon_exit
 name Pup Airline
-slaying ../terminal
+slaying /quests/pupland/terminal
 hp 2
 sp 9
 x 21
 y 11
 end
-arch pstone_1
+arch dungeon_magic
 x 21
 y 12
 end
-arch dungeon_magic
+arch pstone_1
 x 21
 y 12
 end
@@ -2832,19 +2833,19 @@ arch pstone_1
 x 22
 y 10
 end
-arch pstone_1
-x 22
-y 11
-end
 arch dungeon_magic
 x 22
 y 11
 end
 arch pstone_1
 x 22
+y 11
+end
+arch dungeon_magic
+x 22
 y 12
 end
-arch dungeon_magic
+arch pstone_1
 x 22
 y 12
 end
@@ -2872,11 +2873,11 @@ arch pstone_1
 x 22
 y 16
 end
-arch grass
+arch dungeon_magic
 x 22
 y 17
 end
-arch dungeon_magic
+arch grass
 x 22
 y 17
 end
@@ -2888,11 +2889,11 @@ sp 1
 x 22
 y 17
 end
-arch grass
+arch dungeon_magic
 x 22
 y 18
 end
-arch dungeon_magic
+arch grass
 x 22
 y 18
 end
@@ -2950,19 +2951,19 @@ arch evergreen
 x 23
 y 10
 end
-arch pstone_1
-x 23
-y 11
-end
 arch dungeon_magic
 x 23
 y 11
 end
 arch pstone_1
 x 23
+y 11
+end
+arch dungeon_magic
+x 23
 y 12
 end
-arch dungeon_magic
+arch pstone_1
 x 23
 y 12
 end
@@ -2994,19 +2995,19 @@ arch pstone_1
 x 23
 y 16
 end
-arch grass
-x 23
-y 17
-end
 arch dungeon_magic
 x 23
 y 17
 end
 arch grass
 x 23
+y 17
+end
+arch dungeon_magic
+x 23
 y 18
 end
-arch dungeon_magic
+arch grass
 x 23
 y 18
 end