diff --git a/quests/peterm/CTower/Barracks b/quests/peterm/CTower/Barracks
index cb1aed900..3c13ea1f0 100644
--- a/quests/peterm/CTower/Barracks
+++ b/quests/peterm/CTower/Barracks
@@ -1,5 +1,8 @@
 arch map
-name Barracks
+name Tower of the Stars, Barracks
+difficulty 1
+width 16
+height 16
 msg
 Creator: peter mardahl
 Email: peterm@soda.berkeley.edu
@@ -9,7 +12,7 @@ end
 arch woodfloor
 y 6
 end
-arch dwall3_3
+arch dwall_2_2_2
 y 6
 end
 arch dungeon_magic
@@ -393,7 +396,7 @@ y 6
 end
 arch magic_mouth
 msg
-Speak the password  
+Speak the password
 endmsg
 x 4
 y 7
@@ -404,7 +407,7 @@ y 7
 end
 arch magic_mouth
 msg
-Speak the password  
+Speak the password
 endmsg
 x 4
 y 8
diff --git a/quests/peterm/CTower/Chamber b/quests/peterm/CTower/Chamber
index d21153ccd..ae551c651 100644
--- a/quests/peterm/CTower/Chamber
+++ b/quests/peterm/CTower/Chamber
@@ -1,4 +1,8 @@
 arch map
+name Tower of the Stars, Chamber
+difficulty 1
+width 16
+height 16
 msg
 Creator: peter mardahl
 Email: peterm@soda.berkeley.edu
@@ -213,9 +217,8 @@ x 6
 y 8
 speed 0.200000
 level 6
-protected 0
-can_use_wand 0
 sleep 0
+protected 0
 end
 arch woodfloor
 x 6
diff --git a/quests/peterm/CTower/Dungeon b/quests/peterm/CTower/Dungeon
index 6cf0c7e5c..61024759f 100644
--- a/quests/peterm/CTower/Dungeon
+++ b/quests/peterm/CTower/Dungeon
@@ -1,4 +1,8 @@
 arch map
+name Tower of the Stars, Dungeon
+difficulty 1
+width 16
+height 16
 msg
 Creator: peter mardahl
 Email: peterm@soda.berkeley.edu
@@ -42,22 +46,19 @@ end
 arch dungeon_floor
 y 6
 end
-arch awall_2_2_1
+arch awall_3_2
 y 6
 end
 arch dungeon_floor
 y 7
 end
-arch stair_3_up
-name To the Servant level
-slaying Servants
-sp 7
+arch awall_2_1_1
 y 7
 end
 arch dungeon_floor
 y 8
 end
-arch awall_1_1
+arch awall_2_1_1
 y 8
 end
 arch dungeon_floor
@@ -144,7 +145,7 @@ master, but he's a monster.  There
 is worse than being a traitor
 @match traitor|Traitor|betray
 Yes, I betrayed my master.  Who wouldnt
-if they knew his evil scheme? 
+if they knew his evil scheme?
 @match scheme|Scheme
 He tries to make himself immortal,
 but he's lost his soul in his
@@ -183,6 +184,18 @@ y 7
 end
 arch dungeon_floor
 x 1
+y 7
+end
+arch stair_3_up
+name To the Servant level
+slaying Servants
+hp 1
+sp 7
+x 1
+y 7
+end
+arch dungeon_floor
+x 1
 y 8
 end
 arch guard
diff --git a/quests/peterm/CTower/GroundLevel b/quests/peterm/CTower/GroundLevel
index 22bd9dcf0..fc01104bd 100644
--- a/quests/peterm/CTower/GroundLevel
+++ b/quests/peterm/CTower/GroundLevel
@@ -1,19 +1,29 @@
 arch map
-name GroundLevel
+name Tower of the Stars, Ground Level
+difficulty 1
+width 16
+height 16
 msg
 Creator: peter mardahl
 Email: peterm@soda.berkeley.edu
 Date: Fri Feb 11 16:20:28 1994
 endmsg
-width 16
-height 16
+end
+arch marble
+y 3
 end
 arch dwall_2_2_2
 y 3
 end
+arch marble
+y 4
+end
 arch dwall_3_2
 y 4
 end
+arch marble
+y 5
+end
 arch dwall_3_2
 y 5
 end
@@ -47,19 +57,36 @@ end
 arch dwall3_3
 y 9
 end
+arch marble
+y 10
+end
 arch dwall_3_2
 y 10
 end
+arch marble
+y 11
+end
 arch dwall_3_2
 y 11
 end
+arch marble
+y 12
+end
 arch dwall_2_2_1
 y 12
 end
+arch marble
+x 1
+y 2
+end
 arch dwall_2_2_2
 x 1
 y 2
 end
+arch marble
+x 1
+y 3
+end
 arch dwall_4
 x 1
 y 3
@@ -142,14 +169,26 @@ arch dwall_4
 x 1
 y 12
 end
+arch marble
+x 1
+y 13
+end
 arch dwall_3_2
 x 1
 y 13
 end
+arch marble
+x 1
+y 14
+end
 arch dwall_2_2_1
 x 1
 y 14
 end
+arch marble
+x 2
+y 1
+end
 arch dwall_2_2_2
 x 2
 y 1
@@ -242,10 +281,17 @@ arch dwall_4
 x 2
 y 14
 end
+arch marble
+x 2
+y 15
+end
 arch dwall_2_2_1
 x 2
 y 15
 end
+arch marble
+x 3
+end
 arch dwall_2_2_2
 x 3
 end
@@ -329,6 +375,10 @@ arch dwall_4
 x 3
 y 14
 end
+arch marble
+x 3
+y 15
+end
 arch dwall_3_1
 x 3
 y 15
@@ -961,6 +1011,9 @@ arch dwall_3_1
 x 11
 y 15
 end
+arch marble
+x 12
+end
 arch dwall_2_2_3
 x 12
 end
@@ -1044,10 +1097,18 @@ arch dwall_4
 x 12
 y 14
 end
+arch marble
+x 12
+y 15
+end
 arch dwall_3_1
 x 12
 y 15
 end
+arch marble
+x 13
+y 1
+end
 arch dwall3_3
 x 13
 y 1
@@ -1136,14 +1197,26 @@ arch dwall_4
 x 13
 y 14
 end
+arch marble
+x 13
+y 15
+end
 arch dwall_2_2_4
 x 13
 y 15
 end
+arch marble
+x 14
+y 1
+end
 arch dwall_2_2_3
 x 14
 y 1
 end
+arch marble
+x 14
+y 2
+end
 arch dwall_4
 x 14
 y 2
@@ -1240,24 +1313,44 @@ arch dwall_4
 x 14
 y 13
 end
+arch marble
+x 14
+y 14
+end
 arch dwall_2_2_4
 x 14
 y 14
 end
+arch marble
+x 15
+y 2
+end
 arch dwall_2_2_3
 x 15
 y 2
 end
-arch dwall_3_4
+arch marble
 x 15
 y 3
 end
 arch dwall_3_4
 x 15
+y 3
+end
+arch marble
+x 15
 y 4
 end
 arch dwall_3_4
 x 15
+y 4
+end
+arch marble
+x 15
+y 5
+end
+arch dwall_3_4
+x 15
 y 5
 end
 arch marble
@@ -1292,18 +1385,34 @@ arch dwall_3_4
 x 15
 y 9
 end
-arch dwall_3_4
+arch marble
 x 15
 y 10
 end
 arch dwall_3_4
 x 15
+y 10
+end
+arch marble
+x 15
 y 11
 end
 arch dwall_3_4
 x 15
+y 11
+end
+arch marble
+x 15
+y 12
+end
+arch dwall_3_4
+x 15
 y 12
 end
+arch marble
+x 15
+y 13
+end
 arch dwall_2_2_4
 x 15
 y 13
diff --git a/quests/peterm/CTower/Laboratory b/quests/peterm/CTower/Laboratory
index cb6559c3e..1b1c84485 100644
--- a/quests/peterm/CTower/Laboratory
+++ b/quests/peterm/CTower/Laboratory
@@ -1,4 +1,8 @@
 arch map
+name Tower of the Stars, Laboratory
+difficulty 1
+width 16
+height 16
 msg
 Creator: peter mardahl
 Email: peterm@soda.berkeley.edu
diff --git a/quests/peterm/CTower/Library b/quests/peterm/CTower/Library
index d93c8285b..2bf3cae42 100644
--- a/quests/peterm/CTower/Library
+++ b/quests/peterm/CTower/Library
@@ -1,4 +1,8 @@
 arch map
+name Tower of the Stars, Library
+difficulty 1
+width 16
+height 16
 msg
 Creator: peter mardahl
 Email: peterm@soda.berkeley.edu
diff --git a/quests/peterm/CTower/Officers b/quests/peterm/CTower/Officers
index af9f264ce..b3ba83402 100644
--- a/quests/peterm/CTower/Officers
+++ b/quests/peterm/CTower/Officers
@@ -1,4 +1,8 @@
 arch map
+name Tower of the Stars, Officers
+difficulty 1
+width 16
+height 16
 msg
 Creator: peter mardahl
 Email: peterm@soda.berkeley.edu
@@ -8,7 +12,7 @@ end
 arch woodfloor
 y 6
 end
-arch dwall3_3
+arch dwall_2_2_2
 y 6
 end
 arch woodfloor
@@ -26,7 +30,7 @@ end
 arch woodfloor
 y 9
 end
-arch dwall_3_1
+arch dwall_2_2_1
 y 9
 end
 arch woodfloor
@@ -819,7 +823,7 @@ y 6
 end
 arch magic_mouth
 msg
-Major's Quarters  
+Major's Quarters
 endmsg
 x 8
 y 7
@@ -830,7 +834,7 @@ y 7
 end
 arch magic_mouth
 msg
-Captains' Quarters   
+Captains' Quarters
 endmsg
 x 8
 y 8
diff --git a/quests/peterm/CTower/Servants b/quests/peterm/CTower/Servants
index dd0c990f3..fda197ac2 100644
--- a/quests/peterm/CTower/Servants
+++ b/quests/peterm/CTower/Servants
@@ -1,4 +1,8 @@
 arch map
+name Tower of the Stars
+difficulty 1
+width 16
+height 16
 msg
 Creator: peter mardahl
 Email: peterm@soda.berkeley.edu
@@ -8,25 +12,25 @@ end
 arch cobblestones2
 y 6
 end
-arch dwall_2_1_2
+arch dwall_2_2_2
 y 6
 end
 arch cobblestones2
 y 7
 end
-arch stair_3_down
-name To the Dungeon
-slaying Dungeon
-sp 7
+arch dwall_2_1_1
 y 7
 end
 arch cobblestones2
 y 8
 end
+arch dwall_2_1_1
+y 8
+end
 arch cobblestones2
 y 9
 end
-arch dwall_2_1_2
+arch dwall_2_2_1
 y 9
 end
 arch cobblestones2
@@ -65,7 +69,11 @@ arch cobblestones2
 x 1
 y 7
 end
-arch medium_guard
+arch stair_3_down
+name To the Dungeon
+slaying Dungeon
+hp 1
+sp 7
 x 1
 y 7
 end
@@ -73,10 +81,6 @@ arch cobblestones2
 x 1
 y 8
 end
-arch medium_guard
-x 1
-y 8
-end
 arch cobblestones2
 x 1
 y 9
@@ -155,6 +159,22 @@ y 7
 end
 arch cobblestones2
 x 2
+y 7
+end
+arch medium_guard
+x 2
+y 7
+end
+arch cobblestones2
+x 2
+y 8
+end
+arch cobblestones2
+x 2
+y 8
+end
+arch medium_guard
+x 2
 y 8
 end
 arch cobblestones2
@@ -241,10 +261,6 @@ arch cobblestones2
 x 3
 y 7
 end
-arch charwoman
-x 3
-y 7
-end
 arch cobblestones2
 x 3
 y 8
@@ -351,6 +367,10 @@ arch cobblestones2
 x 4
 y 7
 end
+arch charwoman
+x 4
+y 7
+end
 arch cobblestones2
 x 4
 y 8
@@ -1009,7 +1029,7 @@ y 2
 end
 arch magic_mouth
 msg
-Pantry 
+Pantry
 endmsg
 x 10
 y 3
@@ -1326,7 +1346,7 @@ y 6
 end
 arch magic_mouth
 msg
-The Kitchen  
+The Kitchen
 endmsg
 x 13
 y 7
@@ -1337,7 +1357,7 @@ y 7
 end
 arch magic_mouth
 msg
-Senior servants quarters  
+Senior servants quarters
 endmsg
 x 13
 y 8
diff --git a/quests/peterm/CTower/Study b/quests/peterm/CTower/Study
index b2f20583b..a8fa5169d 100644
--- a/quests/peterm/CTower/Study
+++ b/quests/peterm/CTower/Study
@@ -1,4 +1,8 @@
 arch map
+name Tower of the Stars
+difficulty 1
+width 16
+height 16
 msg
 Creator: peter mardahl
 Email: peterm@soda.berkeley.edu
@@ -206,9 +210,9 @@ x 8
 y 6
 end
 arch pyro_book
-value 1600
 x 8
 y 6
+value 1600
 randomitems none
 arch spell_comet
 end
diff --git a/quests/peterm/CTower/TowerTop b/quests/peterm/CTower/TowerTop
index 04d60d6c0..00cdba3cd 100644
--- a/quests/peterm/CTower/TowerTop
+++ b/quests/peterm/CTower/TowerTop
@@ -1,12 +1,13 @@
 arch map
-name <untitled>
+name Tower of the Stars
+difficulty 1
+width 16
+height 16
 msg
 Creator: peter mardahl
 Email: peterm@soda.berkeley.edu
 Date: Fri Feb 11 16:07:21 1994
 endmsg
-width 16
-height 16
 end
 arch small_stones
 end
@@ -491,6 +492,14 @@ arch cobblestones2
 x 7
 y 5
 end
+arch swall_1_1_half
+x 7
+y 5
+end
+arch swall_1_4_half
+x 7
+y 5
+end
 arch dwall_0
 x 7
 y 5
@@ -515,6 +524,14 @@ arch cobblestones2
 x 7
 y 8
 end
+arch swall_1_2_half
+x 7
+y 8
+end
+arch swall_1_4_half
+x 7
+y 8
+end
 arch dwall_0
 x 7
 y 8
@@ -679,6 +696,14 @@ arch cobblestones2
 x 9
 y 5
 end
+arch swall_1_1_half
+x 9
+y 5
+end
+arch swall_1_3_half
+x 9
+y 5
+end
 arch dwall_0
 x 9
 y 5
@@ -703,6 +728,14 @@ arch cobblestones2
 x 9
 y 8
 end
+arch swall_1_2_half
+x 9
+y 8
+end
+arch swall_1_3_half
+x 9
+y 8
+end
 arch dwall_0
 x 9
 y 8