diff --git a/quests/peterm/FireTemple/Entrance b/quests/peterm/FireTemple/Entrance
index ce2e5f877..b3fe54f39 100644
--- a/quests/peterm/FireTemple/Entrance
+++ b/quests/peterm/FireTemple/Entrance
@@ -1,12 +1,13 @@
 arch map
-name Entrance
+name Fire Temple -- Entrance
+difficulty 1
+width 25
+height 28
 msg
 Creator: Gnat the Gnu
 Email: gnu@foo.bar
 Date: Tue Oct  8 21:01:29 1996
 endmsg
-width 25
-height 28
 end
 arch blocked
 y 3
@@ -1329,6 +1330,10 @@ arch cave18
 x 8
 y 1
 end
+arch pstone_1
+x 8
+y 2
+end
 arch cave3
 x 8
 y 2
@@ -2948,10 +2953,18 @@ arch cave6
 x 15
 y 13
 end
+arch pstone_1
+x 15
+y 14
+end
 arch cave1
 x 15
 y 14
 end
+arch pstone_1
+x 15
+y 15
+end
 arch cave1
 x 15
 y 15
diff --git a/quests/peterm/FireTemple/FifthFloor b/quests/peterm/FireTemple/FifthFloor
index 1615f44a1..991294641 100644
--- a/quests/peterm/FireTemple/FifthFloor
+++ b/quests/peterm/FireTemple/FifthFloor
@@ -1,12 +1,13 @@
 arch map
-name FifthFloor
+name Fire Temple -- Fifth Floor
+difficulty 1
+width 40
+height 40
 msg
 Creator: PeterM
 Email: peterm@soda.csua.berkeley.edu
 Date: Fri May 23 11:23:47 1997
 endmsg
-x 40
-y 40
 end
 arch cobblestones
 end
@@ -9421,7 +9422,7 @@ This scroll contains the final secrets
 for the alchemical preparation which
 grants temporary immunity to fire.
 It's pre-publication, so you're getting
-a scoop on the rest of the world.  
+a scoop on the rest of the world.
 endmsg
 x 35
 y 1
diff --git a/quests/peterm/FireTemple/Fire1 b/quests/peterm/FireTemple/Fire1
index c8c1742d9..d5acf98c7 100644
--- a/quests/peterm/FireTemple/Fire1
+++ b/quests/peterm/FireTemple/Fire1
@@ -1,13 +1,14 @@
 arch map
-name Fire1
+name Fire Temple
+difficulty 1
+darkness 5
+width 32
+height 32
 msg
 Creator: PeterM
 Email: peterm@soda.csua.berkeley.edu
 Date: Sat Jun  7 09:38:36 1997
 endmsg
-x 32
-y 32
-invisible 6
 end
 arch pstone_1
 end
@@ -453,7 +454,7 @@ arch locked_door1
 slaying firedoor2
 msg
 A mysterious force prevents you from
-proceeding. 
+proceeding.
 endmsg
 x 1
 y 24
@@ -747,9 +748,9 @@ name fire worshipper
 Wis 3
 x 3
 y 1
-immune 4
 randomitems imp
 sleep 1
+immune 4
 end
 arch pstone_1
 x 3
@@ -934,9 +935,9 @@ name fire worshipper
 Wis 3
 x 4
 y 1
-immune 4
 randomitems imp
 sleep 1
+immune 4
 end
 arch pstone_1
 x 4
@@ -1131,9 +1132,9 @@ name fire worshipper
 Wis 3
 x 5
 y 1
-immune 4
 randomitems imp
 sleep 1
+immune 4
 end
 arch pstone_1
 x 5
@@ -1954,9 +1955,9 @@ name fire worshipper
 Wis 3
 x 9
 y 1
-immune 4
 randomitems imp
 sleep 1
+immune 4
 end
 arch pstone_1
 x 9
@@ -2168,9 +2169,9 @@ name fire worshipper
 Wis 3
 x 10
 y 1
-immune 4
 randomitems imp
 sleep 1
+immune 4
 end
 arch pstone_1
 x 10
@@ -2355,9 +2356,9 @@ name fire worshipper
 Wis 3
 x 11
 y 1
-immune 4
 randomitems imp
 sleep 1
+immune 4
 end
 arch pstone_1
 x 11
@@ -3572,7 +3573,7 @@ enemy elemental's residue.  Somehow
 you get the feeling that this will not
 be the last time the Fire God requires
 an appropriate sacrifice of an enemy
-in order to proceed.  
+in order to proceed.
 
 endmsg
 food 1
@@ -4882,12 +4883,11 @@ x 22
 y 22
 speed -0.200000
 level 1
-immune 4
-protected 0
 attacktype 5
 weight 70000
 randomitems imp
 see_invisible 0
+immune 0
 end
 arch pstone_1
 x 22
@@ -4926,12 +4926,11 @@ x 22
 y 28
 speed -0.200000
 level 1
-immune 4
-protected 0
 attacktype 5
 weight 70000
 randomitems imp
 see_invisible 0
+immune 0
 end
 arch pstone_1
 x 22
@@ -5082,12 +5081,11 @@ x 23
 y 20
 speed -0.200000
 level 1
-immune 4
-protected 0
 attacktype 5
 weight 70000
 randomitems imp
 see_invisible 0
+immune 0
 end
 arch pstone_1
 x 23
@@ -5489,12 +5487,11 @@ x 25
 y 25
 speed -0.200000
 level 1
-immune 4
-protected 0
 attacktype 5
 weight 70000
 randomitems imp
 see_invisible 0
+immune 0
 end
 arch pstone_1
 x 25
@@ -5656,12 +5653,11 @@ x 26
 y 20
 speed -0.200000
 level 1
-immune 4
-protected 0
 attacktype 5
 weight 70000
 randomitems imp
 see_invisible 0
+immune 0
 end
 arch pstone_1
 x 26
@@ -5886,13 +5882,12 @@ x 27
 y 28
 speed -0.200000
 level 1
-immune 4
-protected 0
 attacktype 5
 carrying 100
 weight 70000
 randomitems imp
 see_invisible 0
+immune 0
 arch key2
 slaying firedoor3
 end
@@ -6548,7 +6543,7 @@ arch locked_door1
 slaying firedoor3
 msg
 A mysterious force prevents you from
-proceeding. 
+proceeding.
 
 endmsg
 x 30
diff --git a/quests/peterm/FireTemple/Fire2 b/quests/peterm/FireTemple/Fire2
index 4365be6da..035ca0a62 100644
--- a/quests/peterm/FireTemple/Fire2
+++ b/quests/peterm/FireTemple/Fire2
@@ -1,13 +1,14 @@
 arch map
-name Fire2
+name Fire Temple
+difficulty 1
+darkness 5
+width 32
+height 32
 msg
 Creator: PeterM
 Email: peterm@soda.csua.berkeley.edu
 Date: Sat Jun  7 09:38:36 1997
 endmsg
-x 32
-y 32
-invisible 6
 end
 arch pstone_1
 end
@@ -1374,7 +1375,7 @@ In order to advance, you must
 demonstrate your alchemical knowledge
 relevant to the fire god.
 Begin by naming the liquid required
-to make dust of ignition.  
+to make dust of ignition.
 endmsg
 x 6
 y 15
@@ -1389,7 +1390,7 @@ In order to advance, you must
 demonstrate your alchemical knowledge
 relevant to the fire god.
 Begin by naming the liquid required
-to make dust of ignition.  
+to make dust of ignition.
 endmsg
 x 6
 y 16
@@ -1404,7 +1405,7 @@ In order to advance, you must
 demonstrate your alchemical knowledge
 relevant to the fire god.
 Begin by naming the liquid required
-to make dust of ignition.  
+to make dust of ignition.
 endmsg
 x 6
 y 17
@@ -4947,7 +4948,7 @@ demonstrate your alchemical knowledge
 relevant to the fire god.
 Name the animal essence
 required in the formula for
-summoning a fire elemental.  
+summoning a fire elemental.
 endmsg
 x 21
 y 15
@@ -4963,7 +4964,7 @@ demonstrate your alchemical knowledge
 relevant to the fire god.
 Name the animal essence
 required in the formula for
-summoning a fire elemental.  
+summoning a fire elemental.
 endmsg
 x 21
 y 16
@@ -4979,7 +4980,7 @@ demonstrate your alchemical knowledge
 relevant to the fire god.
 Name the animal essence
 required in the formula for
-summoning a fire elemental.  
+summoning a fire elemental.
 endmsg
 x 21
 y 17
@@ -6293,9 +6294,9 @@ y 2
 end
 arch magic_mouth
 msg
-In order to proceed you must sacrifice 
+In order to proceed you must sacrifice
 a chinese dragon's steak as token of
-your service to the Fire God. 
+your service to the Fire God.
 endmsg
 x 27
 y 3
diff --git a/quests/peterm/FireTemple/Fire3 b/quests/peterm/FireTemple/Fire3
index 8ecdb3cd0..bad85c021 100644
--- a/quests/peterm/FireTemple/Fire3
+++ b/quests/peterm/FireTemple/Fire3
@@ -1,12 +1,13 @@
 arch map
-name Fire2
+name Fire Temple
+difficulty 1
+width 40
+height 32
 msg
 Creator: PeterM
 Email: peterm@soda.csua.berkeley.edu
 Date: Sat Jun  7 09:38:36 1997
 endmsg
-x 40
-y 32
 end
 arch pstone_1
 end
diff --git a/quests/peterm/FireTemple/Fire4 b/quests/peterm/FireTemple/Fire4
index 191d7e7f6..ead19f309 100644
--- a/quests/peterm/FireTemple/Fire4
+++ b/quests/peterm/FireTemple/Fire4
@@ -1,12 +1,13 @@
 arch map
-name Fire2
+name Fire Temple
+difficulty 1
+width 40
+height 32
 msg
 Creator: PeterM
 Email: peterm@soda.csua.berkeley.edu
 Date: Sat Jun  7 09:38:36 1997
 endmsg
-x 40
-y 32
 end
 arch pstone_1
 end
@@ -3289,7 +3290,7 @@ arch pstone_1
 x 23
 y 12
 end
-arch dun3
+arch dun5
 x 23
 y 12
 end
@@ -3324,7 +3325,7 @@ arch pstone_1
 x 23
 y 16
 end
-arch dun3
+arch dun_1_1
 x 23
 y 16
 end
@@ -5940,12 +5941,12 @@ resist_godpower 100
 resist_holyword 100
 resist_blind 100
 reflect_spell 1
-can_use_wand 0
 can_use_bow 0
 can_use_armour 0
 can_use_weapon 0
 can_use_ring 0
 can_use_rod 0
-body_shoulder 0
 body_torso 0
+body_shoulder 0
+can_use_wand 0
 end
diff --git a/quests/peterm/FireTemple/FirstFloor b/quests/peterm/FireTemple/FirstFloor
index bcb5feb08..28890fa51 100644
--- a/quests/peterm/FireTemple/FirstFloor
+++ b/quests/peterm/FireTemple/FirstFloor
@@ -1,12 +1,13 @@
 arch map
-name FirstFloor
+name Fire Temple - First Floor
+difficulty 1
+width 30
+height 30
 msg
 Creator: Gnat the Gnu
 Email: gnu@foo.bar
 Date: Thu Apr 17 16:30:30 1997
 endmsg
-x 30
-y 30
 end
 arch cobblestones2
 end
diff --git a/quests/peterm/FireTemple/FourthFloor b/quests/peterm/FireTemple/FourthFloor
index 24bb2b373..98a553341 100644
--- a/quests/peterm/FireTemple/FourthFloor
+++ b/quests/peterm/FireTemple/FourthFloor
@@ -1,12 +1,13 @@
 arch map
-name FourthFloor
+name Fire Temple -- Fourth Floor
+difficulty 1
+width 40
+height 40
 msg
 Creator: PeterM
 Email: peterm@soda.csua.berkeley.edu
 Date: Fri May 23 11:23:47 1997
 endmsg
-x 40
-y 40
 end
 arch cobblestones
 end
@@ -494,10 +495,10 @@ project run by the demons which is
 intended to discover the physical
 means by which demons get their
 immunity to fire. From the text,
-you glean that 
+you glean that
 - fire para-elemental's residue
 - 7 water of ruby
-- dragon's steak  
+- dragon's steak
 - 3 balm of asbestos
 are the ingredients necessary to
 produce an alchemical preparation
@@ -8400,7 +8401,7 @@ arch sign
 msg
 Clean suits  and boots
 are required past this
-point. 
+point.
 endmsg
 x 29
 y 32
diff --git a/quests/peterm/FireTemple/HotMines b/quests/peterm/FireTemple/HotMines
index 026121dfe..3db88581a 100644
--- a/quests/peterm/FireTemple/HotMines
+++ b/quests/peterm/FireTemple/HotMines
@@ -1,13 +1,13 @@
 arch map
-name HotMines
+name Fire Temple -- Hot Mines
+difficulty 10
+width 30
+height 30
 msg
 Creator: Gnat the Gnu
 Email: gnu@foo.bar
 Date: Tue Apr 15 22:39:46 1997
 endmsg
-x 30
-y 30
-level 10
 end
 arch permanent_lava
 end
diff --git a/quests/peterm/FireTemple/LavaChamber b/quests/peterm/FireTemple/LavaChamber
index 148f41932..a14e3b87f 100644
--- a/quests/peterm/FireTemple/LavaChamber
+++ b/quests/peterm/FireTemple/LavaChamber
@@ -1,16 +1,15 @@
 arch map
-name LavaChamber
+name Fire Temple -- Lava Chamber
+difficulty 1
+width 35
+height 37
 msg
 Creator: Peter Mardahl
 Email: peterm@soda.csua.berkeley.edu
 Date: Tue Oct  8 22:16:35 1996
 endmsg
-x 35
-y 37
 end
 arch blocked
-msg
-endmsg
 y 10
 end
 arch cobblestones2
@@ -50,13 +49,9 @@ arch mine4
 y 16
 end
 arch blocked
-msg
-endmsg
 y 17
 end
 arch blocked
-msg
-endmsg
 x 1
 y 10
 end
@@ -121,14 +116,10 @@ x 1
 y 16
 end
 arch blocked
-msg
-endmsg
 x 1
 y 17
 end
 arch blocked
-msg
-endmsg
 x 2
 y 10
 end
@@ -165,14 +156,10 @@ x 2
 y 16
 end
 arch blocked
-msg
-endmsg
 x 2
 y 17
 end
 arch blocked
-msg
-endmsg
 x 3
 y 10
 end
@@ -217,43 +204,29 @@ x 3
 y 16
 end
 arch blocked
-msg
-endmsg
 x 3
 y 17
 end
 arch blocked
-msg
-endmsg
 x 4
 end
 arch blocked
-msg
-endmsg
 x 4
 y 1
 end
 arch blocked
-msg
-endmsg
 x 4
 y 2
 end
 arch blocked
-msg
-endmsg
 x 4
 y 3
 end
 arch blocked
-msg
-endmsg
 x 4
 y 4
 end
 arch blocked
-msg
-endmsg
 x 4
 y 10
 end
@@ -298,14 +271,10 @@ x 4
 y 16
 end
 arch blocked
-msg
-endmsg
 x 4
 y 17
 end
 arch blocked
-msg
-endmsg
 x 5
 end
 arch imp
@@ -321,14 +290,10 @@ x 5
 y 3
 end
 arch blocked
-msg
-endmsg
 x 5
 y 4
 end
 arch blocked
-msg
-endmsg
 x 5
 y 10
 end
@@ -369,20 +334,14 @@ x 5
 y 17
 end
 arch blocked
-msg
-endmsg
 x 5
 y 18
 end
 arch blocked
-msg
-endmsg
 x 5
 y 19
 end
 arch blocked
-msg
-endmsg
 x 6
 end
 arch imp
@@ -398,44 +357,30 @@ x 6
 y 3
 end
 arch blocked
-msg
-endmsg
 x 6
 y 4
 end
 arch blocked
-msg
-endmsg
 x 6
 y 5
 end
 arch blocked
-msg
-endmsg
 x 6
 y 6
 end
 arch blocked
-msg
-endmsg
 x 6
 y 7
 end
 arch blocked
-msg
-endmsg
 x 6
 y 8
 end
 arch blocked
-msg
-endmsg
 x 6
 y 9
 end
 arch blocked
-msg
-endmsg
 x 6
 y 10
 end
@@ -484,20 +429,14 @@ x 6
 y 17
 end
 arch blocked
-msg
-endmsg
 x 6
 y 18
 end
 arch blocked
-msg
-endmsg
 x 6
 y 19
 end
 arch blocked
-msg
-endmsg
 x 7
 end
 arch imp
@@ -513,14 +452,10 @@ x 7
 y 3
 end
 arch blocked
-msg
-endmsg
 x 7
 y 4
 end
 arch blocked
-msg
-endmsg
 x 7
 y 5
 end
@@ -533,20 +468,14 @@ x 7
 y 7
 end
 arch blocked
-msg
-endmsg
 x 7
 y 8
 end
 arch blocked
-msg
-endmsg
 x 7
 y 9
 end
 arch blocked
-msg
-endmsg
 x 7
 y 10
 end
@@ -587,49 +516,33 @@ x 7
 y 16
 end
 arch blocked
-msg
-endmsg
 x 7
 y 17
 end
 arch blocked
-msg
-endmsg
 x 7
 y 18
 end
 arch blocked
-msg
-endmsg
 x 7
 y 19
 end
 arch blocked
-msg
-endmsg
 x 8
 end
 arch blocked
-msg
-endmsg
 x 8
 y 1
 end
 arch blocked
-msg
-endmsg
 x 8
 y 2
 end
 arch blocked
-msg
-endmsg
 x 8
 y 3
 end
 arch blocked
-msg
-endmsg
 x 8
 y 4
 end
@@ -666,8 +579,6 @@ x 8
 y 8
 end
 arch blocked
-msg
-endmsg
 x 8
 y 9
 end
@@ -708,62 +619,42 @@ x 8
 y 16
 end
 arch blocked
-msg
-endmsg
 x 8
 y 17
 end
 arch blocked
-msg
-endmsg
 x 8
 y 18
 end
 arch blocked
-msg
-endmsg
 x 8
 y 19
 end
 arch blocked
-msg
-endmsg
 x 8
 y 20
 end
 arch blocked
-msg
-endmsg
 x 8
 y 25
 end
 arch blocked
-msg
-endmsg
 x 8
 y 26
 end
 arch blocked
-msg
-endmsg
 x 8
 y 27
 end
 arch blocked
-msg
-endmsg
 x 8
 y 28
 end
 arch blocked
-msg
-endmsg
 x 8
 y 29
 end
 arch blocked
-msg
-endmsg
 x 9
 y 3
 end
@@ -852,44 +743,30 @@ x 9
 y 16
 end
 arch blocked
-msg
-endmsg
 x 9
 y 17
 end
 arch blocked
-msg
-endmsg
 x 9
 y 18
 end
 arch blocked
-msg
-endmsg
 x 9
 y 19
 end
 arch blocked
-msg
-endmsg
 x 9
 y 20
 end
 arch blocked
-msg
-endmsg
 x 9
 y 21
 end
 arch blocked
-msg
-endmsg
 x 9
 y 22
 end
 arch blocked
-msg
-endmsg
 x 9
 y 25
 end
@@ -906,14 +783,10 @@ x 9
 y 28
 end
 arch blocked
-msg
-endmsg
 x 9
 y 29
 end
 arch blocked
-msg
-endmsg
 x 10
 y 3
 end
@@ -1014,32 +887,22 @@ x 10
 y 19
 end
 arch blocked
-msg
-endmsg
 x 10
 y 20
 end
 arch blocked
-msg
-endmsg
 x 10
 y 21
 end
 arch blocked
-msg
-endmsg
 x 10
 y 22
 end
 arch blocked
-msg
-endmsg
 x 10
 y 23
 end
 arch blocked
-msg
-endmsg
 x 10
 y 25
 end
@@ -1056,14 +919,10 @@ x 10
 y 28
 end
 arch blocked
-msg
-endmsg
 x 10
 y 29
 end
 arch blocked
-msg
-endmsg
 x 11
 y 3
 end
@@ -1182,26 +1041,18 @@ x 11
 y 22
 end
 arch blocked
-msg
-endmsg
 x 11
 y 22
 end
 arch blocked
-msg
-endmsg
 x 11
 y 23
 end
 arch blocked
-msg
-endmsg
 x 11
 y 24
 end
 arch blocked
-msg
-endmsg
 x 11
 y 25
 end
@@ -1218,20 +1069,14 @@ x 11
 y 28
 end
 arch blocked
-msg
-endmsg
 x 11
 y 29
 end
 arch blocked
-msg
-endmsg
 x 12
 y 2
 end
 arch blocked
-msg
-endmsg
 x 12
 y 3
 end
@@ -1346,32 +1191,22 @@ x 12
 y 22
 end
 arch blocked
-msg
-endmsg
 x 12
 y 23
 end
 arch blocked
-msg
-endmsg
 x 12
 y 24
 end
 arch blocked
-msg
-endmsg
 x 12
 y 25
 end
 arch blocked
-msg
-endmsg
 x 12
 y 26
 end
 arch blocked
-msg
-endmsg
 x 12
 y 27
 end
@@ -1380,8 +1215,6 @@ x 12
 y 28
 end
 arch blocked
-msg
-endmsg
 x 12
 y 28
 end
@@ -1390,8 +1223,6 @@ x 12
 y 29
 end
 arch blocked
-msg
-endmsg
 x 12
 y 29
 end
@@ -1400,8 +1231,6 @@ x 12
 y 30
 end
 arch blocked
-msg
-endmsg
 x 12
 y 30
 end
@@ -1410,8 +1239,6 @@ x 12
 y 31
 end
 arch blocked
-msg
-endmsg
 x 12
 y 31
 end
@@ -1420,8 +1247,6 @@ x 12
 y 32
 end
 arch blocked
-msg
-endmsg
 x 12
 y 32
 end
@@ -1430,8 +1255,6 @@ x 12
 y 33
 end
 arch blocked
-msg
-endmsg
 x 12
 y 33
 end
@@ -1440,20 +1263,14 @@ x 12
 y 34
 end
 arch blocked
-msg
-endmsg
 x 12
 y 34
 end
 arch blocked
-msg
-endmsg
 x 13
 y 1
 end
 arch blocked
-msg
-endmsg
 x 13
 y 2
 end
@@ -1599,32 +1416,22 @@ x 13
 y 22
 end
 arch blocked
-msg
-endmsg
 x 13
 y 23
 end
 arch blocked
-msg
-endmsg
 x 13
 y 24
 end
 arch blocked
-msg
-endmsg
 x 13
 y 25
 end
 arch blocked
-msg
-endmsg
 x 13
 y 26
 end
 arch blocked
-msg
-endmsg
 x 13
 y 27
 end
@@ -1633,8 +1440,6 @@ x 13
 y 28
 end
 arch blocked
-msg
-endmsg
 x 13
 y 28
 end
@@ -1643,8 +1448,6 @@ x 13
 y 29
 end
 arch blocked
-msg
-endmsg
 x 13
 y 29
 end
@@ -1653,8 +1456,6 @@ x 13
 y 30
 end
 arch blocked
-msg
-endmsg
 x 13
 y 30
 end
@@ -1663,8 +1464,6 @@ x 13
 y 31
 end
 arch blocked
-msg
-endmsg
 x 13
 y 31
 end
@@ -1673,8 +1472,6 @@ x 13
 y 32
 end
 arch blocked
-msg
-endmsg
 x 13
 y 32
 end
@@ -1683,8 +1480,6 @@ x 13
 y 33
 end
 arch blocked
-msg
-endmsg
 x 13
 y 33
 end
@@ -1693,19 +1488,13 @@ x 13
 y 34
 end
 arch blocked
-msg
-endmsg
 x 13
 y 34
 end
 arch blocked
-msg
-endmsg
 x 14
 end
 arch blocked
-msg
-endmsg
 x 14
 y 1
 end
@@ -1842,38 +1631,26 @@ x 14
 y 22
 end
 arch blocked
-msg
-endmsg
 x 14
 y 22
 end
 arch blocked
-msg
-endmsg
 x 14
 y 23
 end
 arch blocked
-msg
-endmsg
 x 14
 y 24
 end
 arch blocked
-msg
-endmsg
 x 14
 y 25
 end
 arch blocked
-msg
-endmsg
 x 14
 y 26
 end
 arch blocked
-msg
-endmsg
 x 14
 y 27
 end
@@ -1882,8 +1659,6 @@ x 14
 y 28
 end
 arch blocked
-msg
-endmsg
 x 14
 y 28
 end
@@ -1892,8 +1667,6 @@ x 14
 y 29
 end
 arch blocked
-msg
-endmsg
 x 14
 y 29
 end
@@ -1902,8 +1675,6 @@ x 14
 y 30
 end
 arch blocked
-msg
-endmsg
 x 14
 y 30
 end
@@ -1912,8 +1683,6 @@ x 14
 y 31
 end
 arch blocked
-msg
-endmsg
 x 14
 y 31
 end
@@ -1922,8 +1691,6 @@ x 14
 y 32
 end
 arch blocked
-msg
-endmsg
 x 14
 y 32
 end
@@ -1932,8 +1699,6 @@ x 14
 y 33
 end
 arch blocked
-msg
-endmsg
 x 14
 y 33
 end
@@ -1942,19 +1707,13 @@ x 14
 y 34
 end
 arch blocked
-msg
-endmsg
 x 14
 y 34
 end
 arch blocked
-msg
-endmsg
 x 15
 end
 arch blocked
-msg
-endmsg
 x 15
 y 1
 end
@@ -2107,20 +1866,14 @@ x 15
 y 22
 end
 arch blocked
-msg
-endmsg
 x 15
 y 23
 end
 arch blocked
-msg
-endmsg
 x 15
 y 24
 end
 arch blocked
-msg
-endmsg
 x 15
 y 25
 end
@@ -2185,8 +1938,6 @@ x 15
 y 34
 end
 arch blocked
-msg
-endmsg
 x 15
 y 34
 end
@@ -2195,8 +1946,6 @@ x 15
 y 35
 end
 arch blocked
-msg
-endmsg
 x 15
 y 35
 end
@@ -2205,19 +1954,13 @@ x 15
 y 36
 end
 arch blocked
-msg
-endmsg
 x 15
 y 36
 end
 arch blocked
-msg
-endmsg
 x 16
 end
 arch blocked
-msg
-endmsg
 x 16
 y 1
 end
@@ -2386,8 +2129,6 @@ x 16
 y 23
 end
 arch blocked
-msg
-endmsg
 x 16
 y 24
 end
@@ -2488,19 +2229,13 @@ x 16
 y 36
 end
 arch blocked
-msg
-endmsg
 x 16
 y 36
 end
 arch blocked
-msg
-endmsg
 x 17
 end
 arch blocked
-msg
-endmsg
 x 17
 y 1
 end
@@ -2814,13 +2549,9 @@ x 17
 y 36
 end
 arch blocked
-msg
-endmsg
 x 18
 end
 arch blocked
-msg
-endmsg
 x 18
 y 1
 end
@@ -3127,13 +2858,9 @@ x 18
 y 36
 end
 arch blocked
-msg
-endmsg
 x 19
 end
 arch blocked
-msg
-endmsg
 x 19
 y 1
 end
@@ -3413,19 +3140,13 @@ x 19
 y 36
 end
 arch blocked
-msg
-endmsg
 x 20
 end
 arch blocked
-msg
-endmsg
 x 20
 y 1
 end
 arch blocked
-msg
-endmsg
 x 20
 y 2
 end
@@ -3703,20 +3424,14 @@ x 20
 y 36
 end
 arch blocked
-msg
-endmsg
 x 21
 y 1
 end
 arch blocked
-msg
-endmsg
 x 21
 y 2
 end
 arch blocked
-msg
-endmsg
 x 21
 y 3
 end
@@ -4001,14 +3716,10 @@ x 21
 y 36
 end
 arch blocked
-msg
-endmsg
 x 22
 y 2
 end
 arch blocked
-msg
-endmsg
 x 22
 y 3
 end
@@ -4161,20 +3872,14 @@ x 22
 y 24
 end
 arch blocked
-msg
-endmsg
 x 22
 y 25
 end
 arch blocked
-msg
-endmsg
 x 22
 y 26
 end
 arch blocked
-msg
-endmsg
 x 22
 y 27
 end
@@ -4183,8 +3888,6 @@ x 22
 y 28
 end
 arch blocked
-msg
-endmsg
 x 22
 y 28
 end
@@ -4193,8 +3896,6 @@ x 22
 y 29
 end
 arch blocked
-msg
-endmsg
 x 22
 y 29
 end
@@ -4203,8 +3904,6 @@ x 22
 y 30
 end
 arch blocked
-msg
-endmsg
 x 22
 y 30
 end
@@ -4261,14 +3960,10 @@ x 22
 y 36
 end
 arch blocked
-msg
-endmsg
 x 23
 y 2
 end
 arch blocked
-msg
-endmsg
 x 23
 y 3
 end
@@ -4387,38 +4082,26 @@ x 23
 y 21
 end
 arch blocked
-msg
-endmsg
 x 23
 y 22
 end
 arch blocked
-msg
-endmsg
 x 23
 y 23
 end
 arch blocked
-msg
-endmsg
 x 23
 y 24
 end
 arch blocked
-msg
-endmsg
 x 23
 y 25
 end
 arch blocked
-msg
-endmsg
 x 23
 y 26
 end
 arch blocked
-msg
-endmsg
 x 23
 y 27
 end
@@ -4427,8 +4110,6 @@ x 23
 y 28
 end
 arch blocked
-msg
-endmsg
 x 23
 y 28
 end
@@ -4437,8 +4118,6 @@ x 23
 y 29
 end
 arch blocked
-msg
-endmsg
 x 23
 y 29
 end
@@ -4447,8 +4126,6 @@ x 23
 y 30
 end
 arch blocked
-msg
-endmsg
 x 23
 y 30
 end
@@ -4457,8 +4134,6 @@ x 23
 y 31
 end
 arch blocked
-msg
-endmsg
 x 23
 y 31
 end
@@ -4511,8 +4186,6 @@ x 23
 y 36
 end
 arch blocked
-msg
-endmsg
 x 24
 y 3
 end
@@ -4619,32 +4292,22 @@ x 24
 y 22
 end
 arch blocked
-msg
-endmsg
 x 24
 y 23
 end
 arch blocked
-msg
-endmsg
 x 24
 y 24
 end
 arch blocked
-msg
-endmsg
 x 24
 y 25
 end
 arch blocked
-msg
-endmsg
 x 24
 y 26
 end
 arch blocked
-msg
-endmsg
 x 24
 y 27
 end
@@ -4653,8 +4316,6 @@ x 24
 y 28
 end
 arch blocked
-msg
-endmsg
 x 24
 y 28
 end
@@ -4663,8 +4324,6 @@ x 24
 y 29
 end
 arch blocked
-msg
-endmsg
 x 24
 y 29
 end
@@ -4673,8 +4332,6 @@ x 24
 y 30
 end
 arch blocked
-msg
-endmsg
 x 24
 y 30
 end
@@ -4683,8 +4340,6 @@ x 24
 y 31
 end
 arch blocked
-msg
-endmsg
 x 24
 y 31
 end
@@ -4693,8 +4348,6 @@ x 24
 y 32
 end
 arch blocked
-msg
-endmsg
 x 24
 y 32
 end
@@ -4727,31 +4380,21 @@ x 24
 y 36
 end
 arch blocked
-msg
-endmsg
 x 24
 y 36
 end
 arch blocked
-msg
-endmsg
 x 25
 end
 arch blocked
-msg
-endmsg
 x 25
 y 1
 end
 arch blocked
-msg
-endmsg
 x 25
 y 2
 end
 arch blocked
-msg
-endmsg
 x 25
 y 3
 end
@@ -4877,8 +4520,6 @@ x 25
 y 23
 end
 arch blocked
-msg
-endmsg
 x 25
 y 24
 end
@@ -4899,8 +4540,6 @@ x 25
 y 28
 end
 arch blocked
-msg
-endmsg
 x 25
 y 28
 end
@@ -4909,8 +4548,6 @@ x 25
 y 29
 end
 arch blocked
-msg
-endmsg
 x 25
 y 29
 end
@@ -4919,8 +4556,6 @@ x 25
 y 30
 end
 arch blocked
-msg
-endmsg
 x 25
 y 30
 end
@@ -4929,8 +4564,6 @@ x 25
 y 31
 end
 arch blocked
-msg
-endmsg
 x 25
 y 31
 end
@@ -4939,8 +4572,6 @@ x 25
 y 32
 end
 arch blocked
-msg
-endmsg
 x 25
 y 32
 end
@@ -4949,8 +4580,6 @@ x 25
 y 33
 end
 arch blocked
-msg
-endmsg
 x 25
 y 33
 end
@@ -4959,8 +4588,6 @@ x 25
 y 34
 end
 arch blocked
-msg
-endmsg
 x 25
 y 34
 end
@@ -4969,8 +4596,6 @@ x 25
 y 35
 end
 arch blocked
-msg
-endmsg
 x 25
 y 35
 end
@@ -4979,14 +4604,10 @@ x 25
 y 36
 end
 arch blocked
-msg
-endmsg
 x 25
 y 36
 end
 arch blocked
-msg
-endmsg
 x 26
 end
 arch imp
@@ -5002,8 +4623,6 @@ x 26
 y 3
 end
 arch blocked
-msg
-endmsg
 x 26
 y 4
 end
@@ -5145,8 +4764,6 @@ x 26
 y 23
 end
 arch blocked
-msg
-endmsg
 x 26
 y 24
 end
@@ -5163,20 +4780,14 @@ x 26
 y 27
 end
 arch blocked
-msg
-endmsg
 x 26
 y 28
 end
 arch blocked
-msg
-endmsg
 x 26
 y 29
 end
 arch blocked
-msg
-endmsg
 x 27
 end
 arch imp
@@ -5192,20 +4803,14 @@ x 27
 y 3
 end
 arch blocked
-msg
-endmsg
 x 27
 y 4
 end
 arch blocked
-msg
-endmsg
 x 27
 y 5
 end
 arch blocked
-msg
-endmsg
 x 27
 y 6
 end
@@ -5226,14 +4831,10 @@ x 27
 y 8
 end
 arch blocked
-msg
-endmsg
 x 27
 y 9
 end
 arch blocked
-msg
-endmsg
 x 27
 y 10
 end
@@ -5346,14 +4947,10 @@ x 27
 y 22
 end
 arch blocked
-msg
-endmsg
 x 27
 y 23
 end
 arch blocked
-msg
-endmsg
 x 27
 y 24
 end
@@ -5370,20 +4967,14 @@ x 27
 y 27
 end
 arch blocked
-msg
-endmsg
 x 27
 y 28
 end
 arch blocked
-msg
-endmsg
 x 27
 y 29
 end
 arch blocked
-msg
-endmsg
 x 28
 end
 arch imp
@@ -5399,44 +4990,30 @@ x 28
 y 3
 end
 arch blocked
-msg
-endmsg
 x 28
 y 4
 end
 arch blocked
-msg
-endmsg
 x 28
 y 5
 end
 arch blocked
-msg
-endmsg
 x 28
 y 6
 end
 arch blocked
-msg
-endmsg
 x 28
 y 7
 end
 arch blocked
-msg
-endmsg
 x 28
 y 8
 end
 arch blocked
-msg
-endmsg
 x 28
 y 9
 end
 arch blocked
-msg
-endmsg
 x 28
 y 11
 end
@@ -5481,103 +5058,69 @@ x 28
 y 17
 end
 arch blocked
-msg
-endmsg
 x 28
 y 18
 end
 arch blocked
-msg
-endmsg
 x 28
 y 19
 end
 arch blocked
-msg
-endmsg
 x 28
 y 20
 end
 arch blocked
-msg
-endmsg
 x 28
 y 21
 end
 arch blocked
-msg
-endmsg
 x 28
 y 22
 end
 arch blocked
-msg
-endmsg
 x 28
 y 23
 end
 arch blocked
-msg
-endmsg
 x 28
 y 24
 end
 arch blocked
-msg
-endmsg
 x 28
 y 25
 end
 arch blocked
-msg
-endmsg
 x 28
 y 26
 end
 arch blocked
-msg
-endmsg
 x 28
 y 27
 end
 arch blocked
-msg
-endmsg
 x 28
 y 28
 end
 arch blocked
-msg
-endmsg
 x 29
 end
 arch blocked
-msg
-endmsg
 x 29
 y 1
 end
 arch blocked
-msg
-endmsg
 x 29
 y 2
 end
 arch blocked
-msg
-endmsg
 x 29
 y 3
 end
 arch blocked
-msg
-endmsg
 x 29
 y 4
 end
 arch blocked
-msg
-endmsg
 x 29
 y 5
 end
@@ -5594,14 +5137,10 @@ x 29
 y 8
 end
 arch blocked
-msg
-endmsg
 x 29
 y 9
 end
 arch blocked
-msg
-endmsg
 x 29
 y 11
 end
@@ -5660,26 +5199,18 @@ x 29
 y 17
 end
 arch blocked
-msg
-endmsg
 x 29
 y 18
 end
 arch blocked
-msg
-endmsg
 x 29
 y 27
 end
 arch blocked
-msg
-endmsg
 x 29
 y 28
 end
 arch blocked
-msg
-endmsg
 x 30
 y 5
 end
@@ -5696,8 +5227,6 @@ x 30
 y 8
 end
 arch blocked
-msg
-endmsg
 x 30
 y 9
 end
@@ -5706,8 +5235,6 @@ x 30
 y 10
 end
 arch blocked
-msg
-endmsg
 x 30
 y 10
 end
@@ -5716,8 +5243,6 @@ x 30
 y 11
 end
 arch blocked
-msg
-endmsg
 x 30
 y 11
 end
@@ -5772,14 +5297,10 @@ x 30
 y 17
 end
 arch blocked
-msg
-endmsg
 x 30
 y 17
 end
 arch blocked
-msg
-endmsg
 x 31
 y 5
 end
@@ -5796,8 +5317,6 @@ x 31
 y 8
 end
 arch blocked
-msg
-endmsg
 x 31
 y 9
 end
@@ -5806,8 +5325,6 @@ x 31
 y 10
 end
 arch blocked
-msg
-endmsg
 x 31
 y 10
 end
@@ -5816,8 +5333,6 @@ x 31
 y 11
 end
 arch blocked
-msg
-endmsg
 x 31
 y 11
 end
@@ -5826,8 +5341,6 @@ x 31
 y 12
 end
 arch blocked
-msg
-endmsg
 x 31
 y 12
 end
@@ -5860,38 +5373,26 @@ x 31
 y 17
 end
 arch blocked
-msg
-endmsg
 x 31
 y 17
 end
 arch blocked
-msg
-endmsg
 x 32
 y 5
 end
 arch blocked
-msg
-endmsg
 x 32
 y 6
 end
 arch blocked
-msg
-endmsg
 x 32
 y 7
 end
 arch blocked
-msg
-endmsg
 x 32
 y 8
 end
 arch blocked
-msg
-endmsg
 x 32
 y 9
 end
@@ -5900,8 +5401,6 @@ x 32
 y 10
 end
 arch blocked
-msg
-endmsg
 x 32
 y 10
 end
@@ -6046,8 +5545,6 @@ x 34
 y 17
 end
 arch blocked
-msg
-endmsg
 x 34
 y 17
 end
diff --git a/quests/peterm/FireTemple/Mezannine1 b/quests/peterm/FireTemple/Mezannine1
index 940e8a356..4c863608d 100644
--- a/quests/peterm/FireTemple/Mezannine1
+++ b/quests/peterm/FireTemple/Mezannine1
@@ -1,11 +1,13 @@
 arch map
+name Fire Temple -- Mezannine
+difficulty 1
+width 32
+height 29
 msg
 Creator: Gnat the Gnu
 Email: gnu@foo.bar
 Date: Sat Apr 19 17:05:12 1997
 endmsg
-x 32
-y 29
 end
 arch cobblestones2
 end
@@ -301,7 +303,7 @@ y 4
 end
 arch magic_mouth
 msg
-Prof Lau's office 
+Prof Lau's office
 endmsg
 x 2
 y 5
@@ -1133,7 +1135,7 @@ name Dr John Verboncoeur
 msg
 @match research
 YOU AGAIN!  HOW MANY TIMES DO I HAVE
-TO TELL YOU!  YOU NEED A 
+TO TELL YOU!  YOU NEED A
 pile of sulphur, and DON'T bother
 me about it again
 endmsg
@@ -1572,7 +1574,7 @@ y 4
 end
 arch magic_mouth
 msg
-189M 
+189M
 endmsg
 x 11
 y 5
@@ -2063,7 +2065,7 @@ y 4
 end
 arch magic_mouth
 msg
-191M 
+191M
 endmsg
 x 14
 y 5
@@ -3643,8 +3645,8 @@ msg
 Please do not EAT, DISEMBOWEL,
 CLAW, DECAPITATE, RIP LIMBS OFF OF,
 or otherwise MOLEST the graduate
-students.  THEY ARE DOING USEFUL 
-RESEARCH.  --The Management 
+students.  THEY ARE DOING USEFUL
+RESEARCH.  --The Management
 endmsg
 x 24
 y 11
@@ -3658,8 +3660,8 @@ msg
 Please do not EAT, DISEMBOWEL,
 CLAW, DECAPITATE, RIP LIMBS OFF OF,
 or otherwise MOLEST the graduate
-students.  THEY ARE DOING USEFUL 
-RESEARCH.  --The Management 
+students.  THEY ARE DOING USEFUL
+RESEARCH.  --The Management
 endmsg
 x 24
 y 12
@@ -3850,8 +3852,8 @@ msg
 Please do not EAT, DISEMBOWEL,
 CLAW, DECAPITATE, RIP LIMBS OFF OF,
 or otherwise MOLEST the graduate
-students.  THEY ARE DOING USEFUL 
-RESEARCH.  --The Management 
+students.  THEY ARE DOING USEFUL
+RESEARCH.  --The Management
 endmsg
 x 25
 y 11
@@ -3865,8 +3867,8 @@ msg
 Please do not EAT, DISEMBOWEL,
 CLAW, DECAPITATE, RIP LIMBS OFF OF,
 or otherwise MOLEST the graduate
-students.  THEY ARE DOING USEFUL 
-RESEARCH.  --The Management 
+students.  THEY ARE DOING USEFUL
+RESEARCH.  --The Management
 endmsg
 x 25
 y 12
@@ -4051,7 +4053,7 @@ y 11
 end
 arch magic_mouth
 msg
-199MD 
+199MD
 endmsg
 x 26
 y 12
@@ -4074,7 +4076,7 @@ y 13
 end
 arch magic_mouth
 msg
-199ME 
+199ME
 endmsg
 x 26
 y 14
@@ -4260,7 +4262,7 @@ end
 arch magic_mouth
 msg
 graduate students love talking about
-their research. 
+their research.
 endmsg
 x 27
 y 11
@@ -4272,7 +4274,7 @@ end
 arch magic_mouth
 msg
 graduate students love talking about
-their research. 
+their research.
 endmsg
 x 27
 y 12
@@ -4296,7 +4298,7 @@ end
 arch magic_mouth
 msg
 graduate students love talking about
-their research. 
+their research.
 endmsg
 x 27
 y 14
@@ -4312,7 +4314,7 @@ end
 arch magic_mouth
 msg
 graduate students love talking about
-their research. 
+their research.
 endmsg
 x 27
 y 15
@@ -4480,13 +4482,13 @@ name Peggy Christenson
 msg
 @match research|Research|resarch
 Oh, you wanted to know about
-our research?  Our group is working 
+our research?  Our group is working
 on an alchemical recipe.
 Want to hear about it?
 
 @match yes
 Well, I don't know the whole recipe.
-I work on the 
+I work on the
 water of diamond part.
 Try asking Peter next door about it,
 he's working on a different part of
diff --git a/quests/peterm/FireTemple/Passageway b/quests/peterm/FireTemple/Passageway
index dbb25a47c..496a24a4b 100644
--- a/quests/peterm/FireTemple/Passageway
+++ b/quests/peterm/FireTemple/Passageway
@@ -1,13 +1,14 @@
 arch map
-name Passageway
+name Fire Temple -- Passageway
+difficulty 1
+darkness 5
+width 60
+height 9
 msg
 Creator: Gnat the Gnu
 Email: gnu@foo.bar
 Date: Sat May 24 14:34:33 1997
 endmsg
-x 60
-y 9
-invisible 5
 end
 arch pedestal_trigger
 connected 14
@@ -156,13 +157,9 @@ x 2
 y 8
 end
 arch blocked
-msg
-endmsg
 x 3
 end
 arch blocked
-msg
-endmsg
 x 3
 y 1
 end
@@ -235,19 +232,13 @@ x 3
 y 8
 end
 arch blocked
-msg
-endmsg
 x 4
 end
 arch blocked
-msg
-endmsg
 x 4
 y 1
 end
 arch blocked
-msg
-endmsg
 x 4
 y 2
 end
@@ -292,19 +283,13 @@ x 4
 y 8
 end
 arch blocked
-msg
-endmsg
 x 5
 end
 arch blocked
-msg
-endmsg
 x 5
 y 1
 end
 arch blocked
-msg
-endmsg
 x 5
 y 2
 end
@@ -374,8 +359,6 @@ arch pstone_1
 x 6
 end
 arch blocked
-msg
-endmsg
 x 6
 end
 arch pstone_1
@@ -383,8 +366,6 @@ x 6
 y 1
 end
 arch blocked
-msg
-endmsg
 x 6
 y 1
 end
@@ -393,8 +374,6 @@ x 6
 y 2
 end
 arch blocked
-msg
-endmsg
 x 6
 y 2
 end
@@ -449,8 +428,6 @@ x 6
 y 8
 end
 arch blocked
-msg
-endmsg
 x 6
 y 8
 end
@@ -458,8 +435,6 @@ arch pstone_1
 x 7
 end
 arch blocked
-msg
-endmsg
 x 7
 end
 arch pstone_1
@@ -467,8 +442,6 @@ x 7
 y 1
 end
 arch blocked
-msg
-endmsg
 x 7
 y 1
 end
@@ -477,8 +450,6 @@ x 7
 y 2
 end
 arch blocked
-msg
-endmsg
 x 7
 y 2
 end
@@ -487,8 +458,6 @@ x 7
 y 3
 end
 arch blocked
-msg
-endmsg
 x 7
 y 3
 end
@@ -521,8 +490,6 @@ x 7
 y 8
 end
 arch blocked
-msg
-endmsg
 x 7
 y 8
 end
@@ -530,8 +497,6 @@ arch pstone_1
 x 8
 end
 arch blocked
-msg
-endmsg
 x 8
 end
 arch pstone_1
@@ -539,8 +504,6 @@ x 8
 y 1
 end
 arch blocked
-msg
-endmsg
 x 8
 y 1
 end
@@ -596,8 +559,6 @@ arch pstone_1
 x 9
 end
 arch blocked
-msg
-endmsg
 x 9
 end
 arch pstone_1
@@ -652,8 +613,6 @@ arch pstone_1
 x 10
 end
 arch blocked
-msg
-endmsg
 x 10
 end
 arch pstone_1
@@ -701,8 +660,6 @@ x 10
 y 8
 end
 arch blocked
-msg
-endmsg
 x 10
 y 8
 end
@@ -757,8 +714,6 @@ x 11
 y 7
 end
 arch blocked
-msg
-endmsg
 x 11
 y 7
 end
@@ -767,8 +722,6 @@ x 11
 y 8
 end
 arch blocked
-msg
-endmsg
 x 11
 y 8
 end
@@ -818,8 +771,6 @@ x 12
 y 6
 end
 arch blocked
-msg
-endmsg
 x 12
 y 6
 end
@@ -828,8 +779,6 @@ x 12
 y 7
 end
 arch blocked
-msg
-endmsg
 x 12
 y 7
 end
@@ -838,8 +787,6 @@ x 12
 y 8
 end
 arch blocked
-msg
-endmsg
 x 12
 y 8
 end
@@ -894,8 +841,6 @@ x 13
 y 7
 end
 arch blocked
-msg
-endmsg
 x 13
 y 7
 end
@@ -904,8 +849,6 @@ x 13
 y 8
 end
 arch blocked
-msg
-endmsg
 x 13
 y 8
 end
@@ -913,8 +856,6 @@ arch pstone_1
 x 14
 end
 arch blocked
-msg
-endmsg
 x 14
 end
 arch pstone_1
@@ -965,8 +906,6 @@ x 14
 y 7
 end
 arch blocked
-msg
-endmsg
 x 14
 y 7
 end
@@ -975,8 +914,6 @@ x 14
 y 8
 end
 arch blocked
-msg
-endmsg
 x 14
 y 8
 end
@@ -984,8 +921,6 @@ arch pstone_1
 x 15
 end
 arch blocked
-msg
-endmsg
 x 15
 end
 arch pstone_1
@@ -1033,8 +968,6 @@ x 15
 y 7
 end
 arch blocked
-msg
-endmsg
 x 15
 y 7
 end
@@ -1043,8 +976,6 @@ x 15
 y 8
 end
 arch blocked
-msg
-endmsg
 x 15
 y 8
 end
@@ -1052,8 +983,6 @@ arch pstone_1
 x 16
 end
 arch blocked
-msg
-endmsg
 x 16
 end
 arch pstone_1
@@ -1085,8 +1014,6 @@ x 16
 y 5
 end
 arch blocked
-msg
-endmsg
 x 16
 y 5
 end
@@ -1095,8 +1022,6 @@ x 16
 y 6
 end
 arch blocked
-msg
-endmsg
 x 16
 y 6
 end
@@ -1105,8 +1030,6 @@ x 16
 y 7
 end
 arch blocked
-msg
-endmsg
 x 16
 y 7
 end
@@ -1115,8 +1038,6 @@ x 16
 y 8
 end
 arch blocked
-msg
-endmsg
 x 16
 y 8
 end
@@ -1163,8 +1084,6 @@ x 17
 y 6
 end
 arch blocked
-msg
-endmsg
 x 17
 y 6
 end
@@ -1173,8 +1092,6 @@ x 17
 y 7
 end
 arch blocked
-msg
-endmsg
 x 17
 y 7
 end
@@ -1183,8 +1100,6 @@ x 17
 y 8
 end
 arch blocked
-msg
-endmsg
 x 17
 y 8
 end
@@ -1231,8 +1146,6 @@ x 18
 y 7
 end
 arch blocked
-msg
-endmsg
 x 18
 y 7
 end
@@ -1241,8 +1154,6 @@ x 18
 y 8
 end
 arch blocked
-msg
-endmsg
 x 18
 y 8
 end
@@ -1289,8 +1200,6 @@ x 19
 y 7
 end
 arch blocked
-msg
-endmsg
 x 19
 y 7
 end
@@ -1299,8 +1208,6 @@ x 19
 y 8
 end
 arch blocked
-msg
-endmsg
 x 19
 y 8
 end
@@ -1359,8 +1266,6 @@ x 20
 y 8
 end
 arch blocked
-msg
-endmsg
 x 20
 y 8
 end
@@ -1368,8 +1273,6 @@ arch pstone_1
 x 21
 end
 arch blocked
-msg
-endmsg
 x 21
 end
 arch pstone_1
@@ -1428,8 +1331,6 @@ arch pstone_1
 x 22
 end
 arch blocked
-msg
-endmsg
 x 22
 end
 arch pstone_1
@@ -1437,8 +1338,6 @@ x 22
 y 1
 end
 arch blocked
-msg
-endmsg
 x 22
 y 1
 end
@@ -1493,8 +1392,6 @@ arch pstone_1
 x 23
 end
 arch blocked
-msg
-endmsg
 x 23
 end
 arch pstone_1
@@ -1502,8 +1399,6 @@ x 23
 y 1
 end
 arch blocked
-msg
-endmsg
 x 23
 y 1
 end
@@ -1551,8 +1446,6 @@ arch pstone_1
 x 24
 end
 arch blocked
-msg
-endmsg
 x 24
 end
 arch pstone_1
@@ -1604,8 +1497,6 @@ x 24
 y 8
 end
 arch blocked
-msg
-endmsg
 x 24
 y 8
 end
@@ -1667,8 +1558,6 @@ x 25
 y 8
 end
 arch blocked
-msg
-endmsg
 x 25
 y 8
 end
@@ -1719,8 +1608,6 @@ x 26
 y 7
 end
 arch blocked
-msg
-endmsg
 x 26
 y 7
 end
@@ -1729,8 +1616,6 @@ x 26
 y 8
 end
 arch blocked
-msg
-endmsg
 x 26
 y 8
 end
@@ -1738,8 +1623,6 @@ arch pstone_1
 x 27
 end
 arch blocked
-msg
-endmsg
 x 27
 end
 arch pstone_1
@@ -1787,8 +1670,6 @@ x 27
 y 7
 end
 arch blocked
-msg
-endmsg
 x 27
 y 7
 end
@@ -1797,8 +1678,6 @@ x 27
 y 8
 end
 arch blocked
-msg
-endmsg
 x 27
 y 8
 end
@@ -1806,8 +1685,6 @@ arch pstone_1
 x 28
 end
 arch blocked
-msg
-endmsg
 x 28
 end
 arch pstone_1
@@ -1866,8 +1743,6 @@ x 28
 y 8
 end
 arch blocked
-msg
-endmsg
 x 28
 y 8
 end
@@ -1926,8 +1801,6 @@ x 29
 y 8
 end
 arch blocked
-msg
-endmsg
 x 29
 y 8
 end
@@ -1974,8 +1847,6 @@ x 30
 y 7
 end
 arch blocked
-msg
-endmsg
 x 30
 y 7
 end
@@ -1984,8 +1855,6 @@ x 30
 y 8
 end
 arch blocked
-msg
-endmsg
 x 30
 y 8
 end
@@ -2028,8 +1897,6 @@ x 31
 y 6
 end
 arch blocked
-msg
-endmsg
 x 31
 y 6
 end
@@ -2038,8 +1905,6 @@ x 31
 y 7
 end
 arch blocked
-msg
-endmsg
 x 31
 y 7
 end
@@ -2048,8 +1913,6 @@ x 31
 y 8
 end
 arch blocked
-msg
-endmsg
 x 31
 y 8
 end
@@ -2092,8 +1955,6 @@ x 32
 y 5
 end
 arch blocked
-msg
-endmsg
 x 32
 y 5
 end
@@ -2102,8 +1963,6 @@ x 32
 y 6
 end
 arch blocked
-msg
-endmsg
 x 32
 y 6
 end
@@ -2112,8 +1971,6 @@ x 32
 y 7
 end
 arch blocked
-msg
-endmsg
 x 32
 y 7
 end
@@ -2122,8 +1979,6 @@ x 32
 y 8
 end
 arch blocked
-msg
-endmsg
 x 32
 y 8
 end
@@ -2166,8 +2021,6 @@ x 33
 y 5
 end
 arch blocked
-msg
-endmsg
 x 33
 y 5
 end
@@ -2176,8 +2029,6 @@ x 33
 y 6
 end
 arch blocked
-msg
-endmsg
 x 33
 y 6
 end
@@ -2186,8 +2037,6 @@ x 33
 y 7
 end
 arch blocked
-msg
-endmsg
 x 33
 y 7
 end
@@ -2196,8 +2045,6 @@ x 33
 y 8
 end
 arch blocked
-msg
-endmsg
 x 33
 y 8
 end
@@ -2244,8 +2091,6 @@ x 34
 y 6
 end
 arch blocked
-msg
-endmsg
 x 34
 y 6
 end
@@ -2254,8 +2099,6 @@ x 34
 y 7
 end
 arch blocked
-msg
-endmsg
 x 34
 y 7
 end
@@ -2264,8 +2107,6 @@ x 34
 y 8
 end
 arch blocked
-msg
-endmsg
 x 34
 y 8
 end
@@ -2273,8 +2114,6 @@ arch pstone_1
 x 35
 end
 arch blocked
-msg
-endmsg
 x 35
 end
 arch pstone_1
@@ -2318,8 +2157,6 @@ x 35
 y 7
 end
 arch blocked
-msg
-endmsg
 x 35
 y 7
 end
@@ -2328,8 +2165,6 @@ x 35
 y 8
 end
 arch blocked
-msg
-endmsg
 x 35
 y 8
 end
@@ -2337,8 +2172,6 @@ arch pstone_1
 x 36
 end
 arch blocked
-msg
-endmsg
 x 36
 end
 arch pstone_1
@@ -2393,8 +2226,6 @@ x 36
 y 8
 end
 arch blocked
-msg
-endmsg
 x 36
 y 8
 end
@@ -2402,8 +2233,6 @@ arch pstone_1
 x 37
 end
 arch blocked
-msg
-endmsg
 x 37
 end
 arch pstone_1
@@ -2462,8 +2291,6 @@ arch pstone_1
 x 38
 end
 arch blocked
-msg
-endmsg
 x 38
 end
 arch pstone_1
@@ -2471,8 +2298,6 @@ x 38
 y 1
 end
 arch blocked
-msg
-endmsg
 x 38
 y 1
 end
@@ -2524,8 +2349,6 @@ arch pstone_1
 x 39
 end
 arch blocked
-msg
-endmsg
 x 39
 end
 arch pstone_1
@@ -2533,8 +2356,6 @@ x 39
 y 1
 end
 arch blocked
-msg
-endmsg
 x 39
 y 1
 end
@@ -2543,8 +2364,6 @@ x 39
 y 2
 end
 arch blocked
-msg
-endmsg
 x 39
 y 2
 end
@@ -2585,8 +2404,6 @@ x 39
 y 8
 end
 arch blocked
-msg
-endmsg
 x 39
 y 8
 end
@@ -2594,8 +2411,6 @@ arch pstone_1
 x 40
 end
 arch blocked
-msg
-endmsg
 x 40
 end
 arch pstone_1
@@ -2603,8 +2418,6 @@ x 40
 y 1
 end
 arch blocked
-msg
-endmsg
 x 40
 y 1
 end
@@ -2613,8 +2426,6 @@ x 40
 y 2
 end
 arch blocked
-msg
-endmsg
 x 40
 y 2
 end
@@ -2655,8 +2466,6 @@ x 40
 y 8
 end
 arch blocked
-msg
-endmsg
 x 40
 y 8
 end
@@ -2664,8 +2473,6 @@ arch pstone_1
 x 41
 end
 arch blocked
-msg
-endmsg
 x 41
 end
 arch pstone_1
@@ -2673,8 +2480,6 @@ x 41
 y 1
 end
 arch blocked
-msg
-endmsg
 x 41
 y 1
 end
@@ -2719,8 +2524,6 @@ x 41
 y 8
 end
 arch blocked
-msg
-endmsg
 x 41
 y 8
 end
@@ -2728,8 +2531,6 @@ arch pstone_1
 x 42
 end
 arch blocked
-msg
-endmsg
 x 42
 end
 arch pstone_1
@@ -2899,8 +2700,6 @@ x 44
 y 8
 end
 arch blocked
-msg
-endmsg
 x 44
 y 8
 end
@@ -2955,8 +2754,6 @@ x 45
 y 8
 end
 arch blocked
-msg
-endmsg
 x 45
 y 8
 end
@@ -3011,8 +2808,6 @@ x 46
 y 8
 end
 arch blocked
-msg
-endmsg
 x 46
 y 8
 end
@@ -3059,8 +2854,6 @@ x 47
 y 7
 end
 arch blocked
-msg
-endmsg
 x 47
 y 7
 end
@@ -3069,8 +2862,6 @@ x 47
 y 8
 end
 arch blocked
-msg
-endmsg
 x 47
 y 8
 end
@@ -3121,8 +2912,6 @@ x 48
 y 6
 end
 arch blocked
-msg
-endmsg
 x 48
 y 6
 end
@@ -3131,8 +2920,6 @@ x 48
 y 7
 end
 arch blocked
-msg
-endmsg
 x 48
 y 7
 end
@@ -3141,8 +2928,6 @@ x 48
 y 8
 end
 arch blocked
-msg
-endmsg
 x 48
 y 8
 end
@@ -3177,8 +2962,6 @@ x 49
 y 4
 end
 arch blocked
-msg
-endmsg
 x 49
 y 4
 end
@@ -3187,8 +2970,6 @@ x 49
 y 5
 end
 arch blocked
-msg
-endmsg
 x 49
 y 5
 end
@@ -3197,8 +2978,6 @@ x 49
 y 6
 end
 arch blocked
-msg
-endmsg
 x 49
 y 6
 end
@@ -3207,8 +2986,6 @@ x 49
 y 7
 end
 arch blocked
-msg
-endmsg
 x 49
 y 7
 end
@@ -3217,8 +2994,6 @@ x 49
 y 8
 end
 arch blocked
-msg
-endmsg
 x 49
 y 8
 end
@@ -3265,8 +3040,6 @@ x 50
 y 6
 end
 arch blocked
-msg
-endmsg
 x 50
 y 6
 end
@@ -3275,8 +3048,6 @@ x 50
 y 7
 end
 arch blocked
-msg
-endmsg
 x 50
 y 7
 end
@@ -3285,8 +3056,6 @@ x 50
 y 8
 end
 arch blocked
-msg
-endmsg
 x 50
 y 8
 end
@@ -3344,8 +3113,6 @@ x 51
 y 7
 end
 arch blocked
-msg
-endmsg
 x 51
 y 7
 end
@@ -3354,8 +3121,6 @@ x 51
 y 8
 end
 arch blocked
-msg
-endmsg
 x 51
 y 8
 end
@@ -3363,8 +3128,6 @@ arch pstone_1
 x 52
 end
 arch blocked
-msg
-endmsg
 x 52
 end
 arch pstone_1
@@ -3408,8 +3171,6 @@ x 52
 y 7
 end
 arch blocked
-msg
-endmsg
 x 52
 y 7
 end
@@ -3418,8 +3179,6 @@ x 52
 y 8
 end
 arch blocked
-msg
-endmsg
 x 52
 y 8
 end
@@ -3427,8 +3186,6 @@ arch pstone_1
 x 53
 end
 arch blocked
-msg
-endmsg
 x 53
 end
 arch pstone_1
@@ -3436,8 +3193,6 @@ x 53
 y 1
 end
 arch blocked
-msg
-endmsg
 x 53
 y 1
 end
@@ -3486,8 +3241,6 @@ x 53
 y 8
 end
 arch blocked
-msg
-endmsg
 x 53
 y 8
 end
@@ -3495,8 +3248,6 @@ arch pstone_1
 x 54
 end
 arch blocked
-msg
-endmsg
 x 54
 end
 arch pstone_1
@@ -3504,8 +3255,6 @@ x 54
 y 1
 end
 arch blocked
-msg
-endmsg
 x 54
 y 1
 end
@@ -3514,8 +3263,6 @@ x 54
 y 2
 end
 arch blocked
-msg
-endmsg
 x 54
 y 2
 end
@@ -3560,8 +3307,6 @@ x 54
 y 8
 end
 arch blocked
-msg
-endmsg
 x 54
 y 8
 end
@@ -3569,8 +3314,6 @@ arch pstone_1
 x 55
 end
 arch blocked
-msg
-endmsg
 x 55
 end
 arch pstone_1
@@ -3578,8 +3321,6 @@ x 55
 y 1
 end
 arch blocked
-msg
-endmsg
 x 55
 y 1
 end
@@ -3588,8 +3329,6 @@ x 55
 y 2
 end
 arch blocked
-msg
-endmsg
 x 55
 y 2
 end
@@ -3598,8 +3337,6 @@ x 55
 y 3
 end
 arch blocked
-msg
-endmsg
 x 55
 y 3
 end
@@ -3636,8 +3373,6 @@ x 55
 y 8
 end
 arch blocked
-msg
-endmsg
 x 55
 y 8
 end
@@ -3645,8 +3380,6 @@ arch pstone_1
 x 56
 end
 arch blocked
-msg
-endmsg
 x 56
 end
 arch pstone_1
@@ -3654,8 +3387,6 @@ x 56
 y 1
 end
 arch blocked
-msg
-endmsg
 x 56
 y 1
 end
@@ -3664,8 +3395,6 @@ x 56
 y 2
 end
 arch blocked
-msg
-endmsg
 x 56
 y 2
 end
@@ -3674,8 +3403,6 @@ x 56
 y 3
 end
 arch blocked
-msg
-endmsg
 x 56
 y 3
 end
@@ -3708,8 +3435,6 @@ x 56
 y 8
 end
 arch blocked
-msg
-endmsg
 x 56
 y 8
 end
@@ -3717,8 +3442,6 @@ arch pstone_1
 x 57
 end
 arch blocked
-msg
-endmsg
 x 57
 end
 arch pstone_1
@@ -3726,8 +3449,6 @@ x 57
 y 1
 end
 arch blocked
-msg
-endmsg
 x 57
 y 1
 end
@@ -3736,8 +3457,6 @@ x 57
 y 2
 end
 arch blocked
-msg
-endmsg
 x 57
 y 2
 end
@@ -3746,8 +3465,6 @@ x 57
 y 3
 end
 arch blocked
-msg
-endmsg
 x 57
 y 3
 end
@@ -3784,8 +3501,6 @@ x 57
 y 8
 end
 arch blocked
-msg
-endmsg
 x 57
 y 8
 end
@@ -3793,8 +3508,6 @@ arch pstone_1
 x 58
 end
 arch blocked
-msg
-endmsg
 x 58
 end
 arch pstone_1
@@ -3802,8 +3515,6 @@ x 58
 y 1
 end
 arch blocked
-msg
-endmsg
 x 58
 y 1
 end
@@ -3812,8 +3523,6 @@ x 58
 y 2
 end
 arch blocked
-msg
-endmsg
 x 58
 y 2
 end
@@ -3822,8 +3531,6 @@ x 58
 y 3
 end
 arch blocked
-msg
-endmsg
 x 58
 y 3
 end
@@ -3870,8 +3577,6 @@ x 58
 y 8
 end
 arch blocked
-msg
-endmsg
 x 58
 y 8
 end
@@ -3879,8 +3584,6 @@ arch pstone_1
 x 59
 end
 arch blocked
-msg
-endmsg
 x 59
 end
 arch pstone_1
@@ -3888,8 +3591,6 @@ x 59
 y 1
 end
 arch blocked
-msg
-endmsg
 x 59
 y 1
 end
@@ -3898,8 +3599,6 @@ x 59
 y 2
 end
 arch blocked
-msg
-endmsg
 x 59
 y 2
 end
@@ -3908,8 +3607,6 @@ x 59
 y 3
 end
 arch blocked
-msg
-endmsg
 x 59
 y 3
 end
@@ -3950,8 +3647,6 @@ x 59
 y 8
 end
 arch blocked
-msg
-endmsg
 x 59
 y 8
 end
diff --git a/quests/peterm/FireTemple/SecondFloor b/quests/peterm/FireTemple/SecondFloor
index 4946a8294..fbf80ed7a 100644
--- a/quests/peterm/FireTemple/SecondFloor
+++ b/quests/peterm/FireTemple/SecondFloor
@@ -1,12 +1,13 @@
 arch map
-name SecondFloor
+name Fire Temple -- Second Floor
+difficulty 1
+width 30
+height 31
 msg
 Creator: Gnat the Gnu
 Email: gnu@foo.bar
 Date: Sun Apr 20 09:31:04 1997
 endmsg
-x 30
-y 31
 end
 arch cobblestones2
 end
diff --git a/quests/peterm/FireTemple/ThirdFloor b/quests/peterm/FireTemple/ThirdFloor
index ae6b97ded..3a7afcfa7 100644
--- a/quests/peterm/FireTemple/ThirdFloor
+++ b/quests/peterm/FireTemple/ThirdFloor
@@ -1,12 +1,13 @@
 arch map
-name SecondFloor
+name Fire Temple -- Third Floor
+difficulty 1
+width 30
+height 31
 msg
 Creator: Gnat the Gnu
 Email: gnu@foo.bar
 Date: Sun Apr 20 09:31:04 1997
 endmsg
-x 30
-y 31
 end
 arch cobblestones2
 end
@@ -2171,7 +2172,7 @@ this is another complex
 incomprehensible alchemical treatise,
 apparently related to the ones you've
 seen before.  He writes someting about
-his collegues also needing 
+his collegues also needing
 7 pile of sulphur
 in order to do the summoning
 endmsg
@@ -2209,7 +2210,7 @@ msg
 technical report on alchemical
 research.  About the only part you can
 understand is that the author thinks
-it likely that a 
+it likely that a
 fire para-elemental's residue
 would be one of the ingredients needed
 endmsg