diff --git a/pup_land/lone_town/dragonhangar/hangar b/pup_land/lone_town/dragonhangar/hangar
index 6610f693a..99e447a48 100644
--- a/pup_land/lone_town/dragonhangar/hangar
+++ b/pup_land/lone_town/dragonhangar/hangar
@@ -1,13 +1,13 @@
 arch map
 name hangar
 region lonetown
+width 35
+height 32
 msg
 Creator: Gnat the Gnu
 Email: gnu@foo.bar
 Date: Thu Jun 19 16:02:47 1997
 endmsg
-width 35
-height 32
 end
 arch magic_banned
 end
@@ -370,10 +370,10 @@ end
 arch creator
 slaying Ticket To Port Joseph
 other_arch card
-connected 20
-lifesave 1
 x 1
 y 1
+connected 20
+lifesave 1
 end
 arch cobblestones2
 x 1
@@ -386,7 +386,7 @@ end
 arch magic_mouth
 msg
 Drop 100 gold coins to buy a ticket to
-Port Joseph. 
+Port Joseph.
 endmsg
 x 1
 y 2
@@ -399,10 +399,10 @@ arch altar_trigger
 name Ticket Booth
 slaying money
 food 1000
-last_sp 1
-connected 20
 x 1
 y 2
+last_sp 1
+connected 20
 end
 arch magic_banned
 x 1
@@ -1009,10 +1009,10 @@ end
 arch creator
 slaying Ticket To Navar
 other_arch card
-connected 21
-lifesave 1
 x 3
 y 1
+connected 21
+lifesave 1
 end
 arch cobblestones2
 x 3
@@ -1038,10 +1038,10 @@ arch altar_trigger
 name Ticket Booth
 slaying money
 food 10000
-last_sp 1
-connected 21
 x 3
 y 2
+last_sp 1
+connected 21
 end
 arch magic_banned
 x 3
@@ -1648,10 +1648,10 @@ end
 arch creator
 slaying Ticket To Red Town
 other_arch card
-connected 22
-lifesave 1
 x 5
 y 1
+connected 22
+lifesave 1
 end
 arch cobblestones2
 x 5
@@ -1664,7 +1664,7 @@ end
 arch magic_mouth
 msg
 Drop 1000 gold coins to buy a ticket to
-Red Town. 
+Red Town.
 endmsg
 x 5
 y 2
@@ -1677,10 +1677,10 @@ arch altar_trigger
 name Ticket Booth
 slaying money
 food 10000
-last_sp 1
-connected 22
 x 5
 y 2
+last_sp 1
+connected 22
 end
 arch magic_banned
 x 5
@@ -2068,9 +2068,9 @@ x 6
 y 9
 end
 arch grate_closed_2
-connected 40
 x 6
 y 9
+connected 40
 end
 arch magic_banned
 x 6
@@ -2133,9 +2133,9 @@ x 6
 y 15
 end
 arch grate_closed_2
+x 6
+y 15
 connected 3
-x 6
-y 15
 end
 arch magic_banned
 x 6
@@ -2198,9 +2198,9 @@ x 6
 y 21
 end
 arch grate_closed_2
+x 6
+y 21
 connected 5
-x 6
-y 21
 end
 arch magic_banned
 x 6
@@ -2263,9 +2263,9 @@ x 6
 y 27
 end
 arch grate_closed_2
-connected 7
 x 6
 y 27
+connected 7
 end
 arch magic_banned
 x 6
@@ -2323,10 +2323,10 @@ end
 arch creator
 slaying Ticket To Dtabb
 other_arch card
-connected 23
-lifesave 1
 x 7
 y 1
+connected 23
+lifesave 1
 end
 arch cobblestones2
 x 7
@@ -2352,10 +2352,10 @@ arch altar_trigger
 name Ticket Booth
 slaying money
 food 12500
-last_sp 1
-connected 23
 x 7
 y 2
+last_sp 1
+connected 23
 end
 arch magic_banned
 x 7
@@ -2421,9 +2421,9 @@ arch altar_trigger
 name To Port Joseph
 slaying Ticket To Port Joseph
 food 1
-connected 40
 x 7
 y 8
+connected 40
 end
 arch magic_banned
 x 7
@@ -2484,9 +2484,9 @@ arch altar_trigger
 name To Red Town
 slaying Ticket To Red Town
 food 1
-connected 3
 x 7
 y 14
+connected 3
 end
 arch magic_banned
 x 7
@@ -2547,9 +2547,9 @@ arch altar_trigger
 name To Wolfsburg
 slaying Ticket To Wolfsburg
 food 1
-connected 5
 x 7
 y 20
+connected 5
 end
 arch magic_banned
 x 7
@@ -2610,9 +2610,9 @@ arch altar_trigger
 name To Brest
 slaying Ticket To Brest
 food 1
-connected 7
 x 7
 y 26
+connected 7
 end
 arch magic_banned
 x 7
@@ -2958,10 +2958,10 @@ end
 arch creator
 slaying Ticket To Wolfsburg
 other_arch card
-connected 24
-lifesave 1
 x 9
 y 1
+connected 24
+lifesave 1
 end
 arch cobblestones2
 x 9
@@ -2987,10 +2987,10 @@ arch altar_trigger
 name Ticket Booth
 slaying money
 food 7500
-last_sp 1
-connected 24
 x 9
 y 2
+last_sp 1
+connected 24
 end
 arch magic_banned
 x 9
@@ -3333,9 +3333,9 @@ arch altar_trigger
 name To Navar
 slaying Ticket To Navar
 food 1
-connected 2
 x 10
 y 8
+connected 2
 end
 arch magic_banned
 x 10
@@ -3343,7 +3343,7 @@ y 9
 end
 arch magic_mouth
 msg
-Navar 
+Navar
 endmsg
 x 10
 y 9
@@ -3396,9 +3396,9 @@ arch altar_trigger
 name To Dtabb
 slaying Ticket To Dtabb
 food 1
-connected 4
 x 10
 y 14
+connected 4
 end
 arch magic_banned
 x 10
@@ -3459,9 +3459,9 @@ arch altar_trigger
 name To Stoneville
 slaying Ticket To Stoneville
 food 1
-connected 6
 x 10
 y 20
+connected 6
 end
 arch magic_banned
 x 10
@@ -3522,9 +3522,9 @@ arch altar_trigger
 name Out Of Order
 slaying Out Of Order
 food 1
-connected 8
 x 10
 y 26
+connected 8
 end
 arch magic_banned
 x 10
@@ -3532,7 +3532,7 @@ y 27
 end
 arch magic_mouth
 msg
-Out Of Order 
+Out Of Order
 endmsg
 x 10
 y 27
@@ -3593,10 +3593,10 @@ end
 arch creator
 slaying Ticket To Brest
 other_arch card
-connected 25
-lifesave 1
 x 11
 y 1
+connected 25
+lifesave 1
 end
 arch cobblestones2
 x 11
@@ -3622,10 +3622,10 @@ arch altar_trigger
 name Ticket Booth
 slaying money
 food 10000
-last_sp 1
-connected 25
 x 11
 y 2
+last_sp 1
+connected 25
 end
 arch magic_banned
 x 11
@@ -3704,9 +3704,9 @@ x 11
 y 9
 end
 arch grate_closed_2
-connected 2
 x 11
 y 9
+connected 2
 end
 arch magic_banned
 x 11
@@ -3769,9 +3769,9 @@ x 11
 y 15
 end
 arch grate_closed_2
+x 11
+y 15
 connected 4
-x 11
-y 15
 end
 arch magic_banned
 x 11
@@ -3834,9 +3834,9 @@ x 11
 y 21
 end
 arch grate_closed_2
+x 11
+y 21
 connected 6
-x 11
-y 21
 end
 arch magic_banned
 x 11
@@ -3899,9 +3899,9 @@ x 11
 y 27
 end
 arch grate_closed_2
-connected 8
 x 11
 y 27
+connected 8
 end
 arch magic_banned
 x 11
@@ -4000,11 +4000,11 @@ msg
 You can pay your ticket either with
 platinum, gold or silver.
 endmsg
+x 12
+y 4
 randomitems standard
 friendly 1
 unaggressive 0
-x 12
-y 4
 end
 arch magic_banned
 x 12
@@ -4292,9 +4292,9 @@ x 13
 y 2
 end
 arch door_look_2
-no_pass 0
 x 13
 y 2
+no_pass 0
 end
 arch magic_banned
 x 13
@@ -4614,10 +4614,10 @@ y 3
 end
 arch guard
 name guard
-friendly 1
-unaggressive 0
 x 14
 y 3
+friendly 1
+unaggressive 0
 end
 arch magic_banned
 x 14
@@ -4626,10 +4626,10 @@ end
 arch check_inv
 race booze
 slaying 0
-last_sp 0
-connected 99
 x 14
 y 4
+last_sp 0
+connected 99
 end
 arch cobblestones2
 x 14
@@ -4644,19 +4644,19 @@ x 14
 y 5
 end
 arch igateTrg1
-connected 99
 x 14
 y 5
+connected 99
 end
 arch magic_banned
 x 14
 y 6
 end
 arch button_trigger
-weight 1
-connected 99
 x 14
 y 6
+weight 1
+connected 99
 end
 arch cobblestones2
 x 14
@@ -4941,10 +4941,10 @@ end
 arch check_inv
 race booze
 slaying 0
-last_sp 0
-connected 99
 x 15
 y 4
+last_sp 0
+connected 99
 end
 arch cobblestones2
 x 15
@@ -4959,19 +4959,19 @@ x 15
 y 5
 end
 arch igateTrg1
-connected 99
 x 15
 y 5
+connected 99
 end
 arch magic_banned
 x 15
 y 6
 end
 arch button_trigger
-weight 1
-connected 99
 x 15
 y 6
+weight 1
+connected 99
 end
 arch cobblestones2
 x 15
@@ -5288,10 +5288,10 @@ end
 arch check_inv
 race booze
 slaying 0
-last_sp 0
-connected 99
 x 16
 y 4
+last_sp 0
+connected 99
 end
 arch cobblestones2
 x 16
@@ -5306,19 +5306,19 @@ x 16
 y 5
 end
 arch igateTrg1
-connected 99
 x 16
 y 5
+connected 99
 end
 arch magic_banned
 x 16
 y 6
 end
 arch button_trigger
-weight 1
-connected 99
 x 16
 y 6
+weight 1
+connected 99
 end
 arch cobblestones2
 x 16
@@ -5630,10 +5630,10 @@ y 3
 end
 arch guard
 name guard
-friendly 1
-unaggressive 0
 x 17
 y 3
+friendly 1
+unaggressive 0
 end
 arch magic_banned
 x 17
@@ -5642,10 +5642,10 @@ end
 arch check_inv
 race booze
 slaying 0
-last_sp 0
-connected 99
 x 17
 y 4
+last_sp 0
+connected 99
 end
 arch cobblestones2
 x 17
@@ -5660,19 +5660,19 @@ x 17
 y 5
 end
 arch igateTrg1
-connected 99
 x 17
 y 5
+connected 99
 end
 arch magic_banned
 x 17
 y 6
 end
 arch button_trigger
-weight 1
-connected 99
 x 17
 y 6
+weight 1
+connected 99
 end
 arch cobblestones2
 x 17
@@ -5944,9 +5944,9 @@ x 18
 y 2
 end
 arch door_look_2
-no_pass 0
 x 18
 y 2
+no_pass 0
 end
 arch magic_banned
 x 18
@@ -6554,10 +6554,10 @@ end
 arch creator
 slaying Ticket To Scorn
 other_arch card
-connected 26
-lifesave 1
 x 20
 y 1
+connected 26
+lifesave 1
 end
 arch cobblestones2
 x 20
@@ -6583,10 +6583,10 @@ arch altar_trigger
 name Ticket Booth
 slaying money
 food 2000
-last_sp 1
-connected 26
 x 20
 y 2
+last_sp 1
+connected 26
 end
 arch magic_banned
 x 20
@@ -6665,9 +6665,9 @@ x 20
 y 9
 end
 arch grate_closed_2
-connected 9
 x 20
 y 9
+connected 9
 end
 arch magic_banned
 x 20
@@ -6730,9 +6730,9 @@ x 20
 y 15
 end
 arch grate_closed_2
+x 20
+y 15
 connected 11
-x 20
-y 15
 end
 arch magic_banned
 x 20
@@ -6795,9 +6795,9 @@ x 20
 y 21
 end
 arch grate_closed_2
+x 20
+y 21
 connected 13
-x 20
-y 21
 end
 arch magic_banned
 x 20
@@ -6860,9 +6860,9 @@ x 20
 y 27
 end
 arch grate_closed_2
-connected 15
 x 20
 y 27
+connected 15
 end
 arch magic_banned
 x 20
@@ -7052,9 +7052,9 @@ arch altar_trigger
 name To Scorn
 slaying Ticket To Scorn
 food 1
-connected 11
 x 21
 y 14
+connected 11
 end
 arch magic_banned
 x 21
@@ -7115,9 +7115,9 @@ arch altar_trigger
 name To Lake Country
 slaying Ticket To Lake Country
 food 1
-connected 13
 x 21
 y 20
+connected 13
 end
 arch magic_banned
 x 21
@@ -7178,9 +7178,9 @@ arch altar_trigger
 name Random
 slaying Random Ticket
 food 1
-connected 15
 x 21
 y 26
+connected 15
 end
 arch magic_banned
 x 21
@@ -7249,10 +7249,10 @@ end
 arch creator
 slaying Ticket To Stoneville
 other_arch card
-connected 21
-lifesave 1
 x 22
 y 1
+connected 21
+lifesave 1
 end
 arch cobblestones2
 x 22
@@ -7265,7 +7265,7 @@ end
 arch magic_mouth
 msg
 Drop 1000 gold coins to buy a ticket to
-Stoneville. 
+Stoneville.
 endmsg
 x 22
 y 2
@@ -7278,10 +7278,10 @@ arch altar_trigger
 name Ticket Booth
 slaying money
 food 10000
-last_sp 1
-connected 21
 x 22
 y 2
+last_sp 1
+connected 21
 end
 arch magic_banned
 x 22
@@ -7824,10 +7824,10 @@ end
 arch creator
 slaying Ticket To Santo Dominion
 other_arch card
-connected 28
-lifesave 1
 x 24
 y 1
+connected 28
+lifesave 1
 end
 arch cobblestones2
 x 24
@@ -7853,10 +7853,10 @@ arch altar_trigger
 name Ticket Booth
 slaying money
 food 1000
-last_sp 1
-connected 28
 x 24
 y 2
+last_sp 1
+connected 28
 end
 arch magic_banned
 x 24
@@ -7922,9 +7922,9 @@ arch altar_trigger
 name To Santo Dominion
 slaying Ticket To Santo Dominion
 food 1
-connected 10
 x 24
 y 8
+connected 10
 end
 arch magic_banned
 x 24
@@ -7985,9 +7985,9 @@ arch altar_trigger
 name Random
 slaying Random Ticket
 food 1
-connected 12
 x 24
 y 14
+connected 12
 end
 arch magic_banned
 x 24
@@ -8048,9 +8048,9 @@ arch altar_trigger
 name To Nurnberg
 slaying Ticket To Nurnberg
 food 1
-connected 14
 x 24
 y 20
+connected 14
 end
 arch magic_banned
 x 24
@@ -8058,7 +8058,7 @@ y 21
 end
 arch cobblestones2
 msg
-Nurnberg 
+Nurnberg
 endmsg
 x 24
 y 21
@@ -8107,9 +8107,9 @@ arch altar_trigger
 name Random
 slaying Random Ticket
 food 1
-connected 16
 x 24
 y 26
+connected 16
 end
 arch magic_banned
 x 24
@@ -8271,9 +8271,9 @@ x 25
 y 9
 end
 arch grate_closed_2
-connected 10
 x 25
 y 9
+connected 10
 end
 arch magic_banned
 x 25
@@ -8336,9 +8336,9 @@ x 25
 y 15
 end
 arch grate_closed_2
+x 25
+y 15
 connected 12
-x 25
-y 15
 end
 arch magic_banned
 x 25
@@ -8401,9 +8401,9 @@ x 25
 y 21
 end
 arch grate_closed_2
+x 25
+y 21
 connected 14
-x 25
-y 21
 end
 arch magic_banned
 x 25
@@ -8466,9 +8466,9 @@ x 25
 y 27
 end
 arch grate_closed_2
-connected 16
 x 25
 y 27
+connected 16
 end
 arch magic_banned
 x 25
@@ -8526,10 +8526,10 @@ end
 arch creator
 slaying Ticket To Lake Country
 other_arch card
-connected 29
-lifesave 1
 x 26
 y 1
+connected 29
+lifesave 1
 end
 arch cobblestones2
 x 26
@@ -8542,7 +8542,7 @@ end
 arch magic_mouth
 msg
 Drop 1000 gold coins to buy a ticket to
-Lake Country. 
+Lake Country.
 endmsg
 x 26
 y 2
@@ -8555,10 +8555,10 @@ arch altar_trigger
 name Ticket Booth
 slaying money
 food 10000
-last_sp 1
-connected 29
 x 26
 y 2
+last_sp 1
+connected 29
 end
 arch magic_banned
 x 26
@@ -9165,10 +9165,10 @@ end
 arch creator
 slaying Random Ticket
 other_arch card
-connected 30
-lifesave 1
 x 28
 y 1
+connected 30
+lifesave 1
 end
 arch cobblestones2
 x 28
@@ -9194,10 +9194,10 @@ arch altar_trigger
 name Ticket Booth
 slaying money
 food 5000
-last_sp 1
-connected 30
 x 28
 y 2
+last_sp 1
+connected 30
 end
 arch magic_banned
 x 28
@@ -9830,9 +9830,9 @@ arch awall_2_1_2
 x 30
 end
 arch pedestal
-connected 80
 x 30
 y 1
+connected 80
 end
 arch magic_banned
 x 30
@@ -9841,19 +9841,19 @@ end
 arch creator
 slaying Ticket To Nurnberg
 other_arch card
-connected 32
-lifesave 1
 x 30
 y 1
+connected 32
+lifesave 1
 end
 arch cobblestones2
 x 30
 y 1
 end
 arch pedestal
-connected 80
 x 30
 y 2
+connected 80
 end
 arch magic_banned
 x 30
@@ -9875,15 +9875,15 @@ arch altar_trigger
 name Ticket Booth
 slaying money
 food 10000
-last_sp 1
-connected 32
 x 30
 y 2
+last_sp 1
+connected 32
 end
 arch pedestal
-connected 80
 x 30
 y 3
+connected 80
 end
 arch magic_banned
 x 30
@@ -9894,9 +9894,9 @@ x 30
 y 3
 end
 arch igateTrg1
-connected 80
 x 30
 y 3
+connected 80
 end
 arch magic_banned
 x 30
@@ -9914,9 +9914,9 @@ msg
 @match siegfried
 Click.
 endmsg
-connected 80
 x 30
 y 4
+connected 80
 end
 arch cobblestones2
 x 30
@@ -10681,17 +10681,17 @@ arch pit_closed
 name 90
 hp 34
 sp 6
-connected 90
 x 33
 y 1
+connected 90
 end
 arch invis_exit
 name navar
+slaying /world/world_121_116
 msg
 The random ride is heading for
 Navar City today.
 endmsg
-slaying /world/world_121_116
 hp 37
 sp 46
 x 33
@@ -10701,17 +10701,17 @@ arch pit_closed
 name 91
 hp 34
 sp 6
-connected 91
 x 33
 y 2
+connected 91
 end
 arch invis_exit
 name port joseph
+slaying /world/world_101_114
 msg
 The random ride is heading for
 Port Joseph today.
 endmsg
-slaying /world/world_101_114
 hp 16
 sp 39
 x 33
@@ -10721,17 +10721,17 @@ arch pit_closed
 name 92
 hp 34
 sp 6
-connected 92
 x 33
 y 3
+connected 92
 end
 arch invis_exit
 name brest
+slaying /world/world_107_123
 msg
 The random ride is heading for
 Brest today.
 endmsg
-slaying /world/world_107_123
 hp 32
 sp 30
 x 33
@@ -10767,21 +10767,21 @@ y 10
 end
 arch button_small
 name 91
-connected 91
 x 33
 y 11
+connected 91
 end
 arch button_small
 name 92
-connected 92
 x 33
 y 12
+connected 92
 end
 arch button_small
 name 93
-connected 93
 x 33
 y 13
+connected 93
 end
 arch blocked
 x 33
@@ -10802,17 +10802,17 @@ arch pit_closed
 name 93
 hp 34
 sp 6
-connected 93
 x 34
 y 2
+connected 93
 end
 arch invis_exit
 name nurnberg
+slaying /pup_land/nurnberg/city
 msg
 The random ride is heading for
 Nurnberg today.
 endmsg
-slaying ../pup_land/nurnberg/city
 hp 25
 sp 15
 x 34
@@ -10822,16 +10822,16 @@ arch pit_closed
 name 94
 hp 34
 sp 6
-connected 94
 x 34
 y 3
+connected 94
 end
 arch invis_exit
+slaying /world/world_109_126
 msg
 The random ride is heading for
 Lake Country today.
 endmsg
-slaying /world/world_109_126
 hp 16
 sp 20
 x 34
@@ -10847,10 +10847,10 @@ y 5
 end
 arch blocked
 name darkness
-no_pass 0
-is_floor 1
 x 34
 y 6
+no_pass 0
+is_floor 1
 end
 arch blocked
 x 34
@@ -10858,18 +10858,18 @@ y 7
 end
 arch blocked
 name darkness
-no_pass 0
-is_floor 1
 x 34
 y 8
+no_pass 0
+is_floor 1
 end
 arch teleporter
 hp 34
 sp 6
-speed 1.000000
-invisible 1
 x 34
 y 8
+speed 1.000000
+invisible 1
 end
 arch blocked
 x 34
@@ -10881,15 +10881,15 @@ y 10
 end
 arch button_small
 name 90
-connected 90
 x 34
 y 11
+connected 90
 end
 arch spikes_moving
-speed 0.500000
-speed_left -0.860000
 x 34
 y 12
+speed 0.500000
+speed_left -0.860000
 end
 arch boulder
 x 34
@@ -10897,9 +10897,9 @@ y 12
 end
 arch button_small
 name 94
-connected 94
 x 34
 y 13
+connected 94
 end
 arch blocked
 x 34
@@ -10911,11 +10911,11 @@ y 15
 end
 arch dragon_exit
 name dragon express
+slaying /world/world_101_114
 msg
 Please hurry up or we will be moving
 without you.
 endmsg
-slaying /world/world_101_114
 hp 16
 sp 39
 x 3
@@ -10923,11 +10923,11 @@ y 8
 end
 arch dragon_exit
 name dragon express
+slaying /pup_land/rainbow/station
 msg
 Please hurry up or we will be moving
 without you.
 endmsg
-slaying /pup_land/rainbow/station
 hp 7
 sp 3
 x 3
@@ -10935,11 +10935,11 @@ y 14
 end
 arch dragon_exit
 name dragon express
+slaying /world/world_128_109
 msg
 Please hurry up or we will be moving
 without you.
 endmsg
-slaying /world/world_128_109
 hp 35
 sp 13
 x 3
@@ -10947,11 +10947,11 @@ y 20
 end
 arch dragon_exit
 name dragon express
+slaying /world/world_107_123
 msg
 Please hurry up or we will be moving
 without you.
 endmsg
-slaying /world/world_107_123
 hp 32
 sp 30
 x 3
@@ -10959,11 +10959,11 @@ y 26
 end
 arch dragon_exit
 name dragon express
+slaying /world/world_121_116
 msg
 Please hurry up or we will be moving
 without you.
 endmsg
-slaying /world/world_121_116
 hp 37
 sp 46
 x 12
@@ -10971,11 +10971,11 @@ y 8
 end
 arch dragon_exit
 name dragon express
+slaying /world/world_116_102
 msg
 Please hurry up or we will be moving
 without you.
 endmsg
-slaying /world/world_116_102
 hp 29
 sp 37
 x 12
@@ -10983,11 +10983,11 @@ y 14
 end
 arch dragon_exit
 name dragon express
+slaying /world/world_103_127
 msg
 Please hurry up or we will be moving
 without you.
 endmsg
-slaying /world/world_103_127
 hp 5
 sp 15
 x 12
@@ -11004,11 +11004,11 @@ y 26
 end
 arch dragon_exit
 name dragon express
+slaying /pup_land/lone_town/town
 msg
 Please hurry up or we will be moving
 without you.
 endmsg
-slaying /pup_land/lone_town/town
 hp 22
 sp 11
 x 17
@@ -11016,11 +11016,11 @@ y 8
 end
 arch dragon_exit
 name dragon express
+slaying /world/world_105_115
 msg
 Please hurry up or we will be moving
 without you.
 endmsg
-slaying /world/world_105_115
 hp 5
 sp 37
 x 17
@@ -11028,11 +11028,11 @@ y 14
 end
 arch dragon_exit
 name dragon express
+slaying /world/world_109_126
 msg
 Please hurry up or we will be moving
 without you.
 endmsg
-slaying /world/world_109_126
 hp 16
 sp 20
 x 17
@@ -11040,11 +11040,11 @@ y 20
 end
 arch dragon_exit
 name dragon express
+slaying hangar
 msg
 Please hurry up or we will be moving
 without you.
 endmsg
-slaying hangar
 hp 34
 sp 8
 x 17
@@ -11052,11 +11052,11 @@ y 26
 end
 arch dragon_exit
 name dragon express
+slaying /world/world_102_108
 msg
 Please hurry up or we will be moving
 without you.
 endmsg
-slaying /world/world_102_108
 hp 17
 sp 12
 x 26
@@ -11064,11 +11064,11 @@ y 8
 end
 arch dragon_exit
 name dragon express
+slaying hangar
 msg
 Please hurry up or we will be moving
 without you.
 endmsg
-slaying hangar
 hp 34
 sp 8
 x 26
@@ -11076,11 +11076,11 @@ y 14
 end
 arch dragon_exit
 name dragon express
+slaying /pup_land/nurnberg/city
 msg
 Please hurry up or we will be moving
 without you.
 endmsg
-slaying /pup_land/nurnberg/city
 hp 25
 sp 15
 x 26
@@ -11088,11 +11088,11 @@ y 20
 end
 arch dragon_exit
 name dragon express
+slaying hangar
 msg
 Please hurry up or we will be moving
 without you.
 endmsg
-slaying hangar
 hp 34
 sp 8
 x 26