diff --git a/quests/cd/cd.tower2.755 b/quests/cd/cd.tower2.755
index d1ffdb3c6..5493c40b1 100644
--- a/quests/cd/cd.tower2.755
+++ b/quests/cd/cd.tower2.755
@@ -1,12 +1,12 @@
 arch map
 name cd
 msg
-Creator: 
-Email: 
+Creator:
+Email:
 Date: Wed Dec  1 19:18:51 1993
 endmsg
-x 40
-y 40
+width 40
+height 40
 end
 arch cobblestones2
 end
@@ -507,10 +507,10 @@ x 2
 y 10
 end
 arch block_door_closed
-x 2
-y 10
 speed 0.500000
 connected 1
+x 2
+y 10
 end
 arch cobblestones2
 x 2
@@ -901,9 +901,9 @@ x 4
 y 9
 end
 arch button_handle
+connected 1
 x 4
 y 9
-connected 1
 end
 arch cobblestones2
 x 4
@@ -1092,9 +1092,9 @@ x 5
 y 7
 end
 arch block_door_closed
+connected 2
 x 5
 y 7
-connected 2
 end
 arch cobblestones2
 x 5
@@ -1307,9 +1307,9 @@ x 6
 y 6
 end
 arch button_handle
+connected 2
 x 6
 y 6
-connected 2
 end
 arch cobblestones2
 x 6
@@ -1944,9 +1944,9 @@ x 9
 y 9
 end
 arch button_handle
+connected 3
 x 9
 y 9
-connected 3
 end
 arch cobblestones2
 x 9
@@ -2147,9 +2147,9 @@ x 10
 y 7
 end
 arch block_door_closed
+connected 3
 x 10
 y 7
-connected 3
 end
 arch cobblestones2
 x 10
@@ -2377,12 +2377,12 @@ arch devil
 dam 19
 wc 1
 ac 0
-x 11
-y 13
 resist_paralyze 30
 carrying 486865
 has_ready_wand 1
 has_ready_bow 1
+x 11
+y 13
 arch arrow
 nrof 248
 end
@@ -2613,9 +2613,9 @@ x 12
 y 10
 end
 arch block_door_closed
+connected 4
 x 12
 y 10
-connected 4
 end
 arch cobblestones2
 x 12
@@ -2636,12 +2636,12 @@ end
 arch devil
 wc 2
 ac 0
-x 12
-y 13
 resist_poison 30
 carrying 442000
 has_ready_wand 1
 has_ready_bow 1
+x 12
+y 13
 arch arrow
 nrof 164
 end
@@ -2881,10 +2881,10 @@ end
 arch devil
 dam 20
 ac 0
-x 13
-y 13
 carrying 430525
 has_ready_bow 1
+x 13
+y 13
 arch arrow
 nrof 241
 end
@@ -3116,9 +3116,9 @@ x 14
 y 9
 end
 arch button_handle
+connected 4
 x 14
 y 9
-connected 4
 end
 arch cobblestones2
 x 14
@@ -5882,10 +5882,10 @@ x 34
 y 31
 end
 arch block_door_closed
+connected 10
+speed 0.500000
 x 34
 y 31
-speed 0.500000
-connected 1
 end
 arch cobblestones2
 x 34
@@ -6747,9 +6747,9 @@ x 38
 y 28
 end
 arch button_plate
+connected 10
 x 38
 y 28
-connected 1
 end
 arch cobblestones2
 x 38
@@ -7119,9 +7119,9 @@ x 39
 y 39
 end
 arch giant
+carrying 126645
 x 3
 y 5
-carrying 126645
 arch goldcoin
 nrof 43
 end
@@ -7129,11 +7129,6 @@ arch club
 nrof 14
 end
 end
-More
-arch giant_2
-x 3
-y 6
-end
 arch titan
 x 31
 y 36
@@ -7145,67 +7140,3 @@ name MASSIVE key
 slaying titan.door
 end
 end
-More
-arch titan_2
-hp 4000
-x 30
-y 36
-resist_magic 30
-resist_fire 30
-end
-More
-arch titan_3
-hp 4000
-x 30
-y 35
-resist_magic 30
-resist_fire 30
-end
-More
-arch titan_4
-hp 4000
-x 31
-y 35
-resist_magic 30
-resist_fire 30
-end
-More
-arch titan_5
-hp 4000
-x 32
-y 35
-resist_magic 30
-resist_fire 30
-end
-More
-arch titan_6
-hp 4000
-x 32
-y 36
-resist_magic 30
-resist_fire 30
-end
-More
-arch titan_7
-hp 4000
-x 32
-y 37
-resist_magic 30
-resist_fire 30
-end
-More
-arch titan_8
-hp 4000
-x 31
-y 37
-resist_magic 30
-resist_fire 30
-end
-More
-arch titan_9
-hp 4000
-x 30
-y 37
-resist_magic 30
-resist_fire 30
-end