diff --git a/wolfsburg/dungeons/church.4a b/wolfsburg/dungeons/church.4a
index 36a7d71d4..6e0431983 100644
--- a/wolfsburg/dungeons/church.4a
+++ b/wolfsburg/dungeons/church.4a
@@ -150,10 +150,6 @@ arch dungeon_floor
 x 1
 y 7
 end
-arch dungeon_floor
-x 1
-y 8
-end
 arch magic_mouth
 msg
 A great sadness sweeps over you
@@ -161,6 +157,10 @@ endmsg
 x 1
 y 8
 end
+arch dungeon_floor
+x 1
+y 8
+end
 arch door_2
 x 1
 y 8
@@ -731,10 +731,6 @@ arch dun5
 x 6
 y 6
 end
-arch dungeon_floor
-x 6
-y 7
-end
 arch magic_mouth
 msg
 You feel uneasy as you enter this room
@@ -742,6 +738,10 @@ endmsg
 x 6
 y 7
 end
+arch dungeon_floor
+x 6
+y 7
+end
 arch door_1
 x 6
 y 7
@@ -996,10 +996,6 @@ arch dun5
 x 8
 y 6
 end
-arch dungeon_floor
-x 8
-y 7
-end
 arch magic_mouth
 msg
 This room has the mustiness of a place that
@@ -1009,6 +1005,10 @@ endmsg
 x 8
 y 7
 end
+arch dungeon_floor
+x 8
+y 7
+end
 arch door_1
 x 8
 y 7
@@ -2013,11 +2013,11 @@ arch dun5
 x 16
 y 4
 end
-arch dungeon_floor
+arch magic_mouth
 x 16
 y 5
 end
-arch magic_mouth
+arch dungeon_floor
 x 16
 y 5
 end
@@ -2065,10 +2065,6 @@ arch dun5
 x 16
 y 10
 end
-arch dungeon_floor
-x 16
-y 11
-end
 arch magic_mouth
 msg
 The smell of death is sharp like a knife blade
@@ -2077,6 +2073,10 @@ endmsg
 x 16
 y 11
 end
+arch dungeon_floor
+x 16
+y 11
+end
 arch door_look_2
 x 16
 y 11
diff --git a/wolfsburg/dungeons/church.4d b/wolfsburg/dungeons/church.4d
index 3b7ffa473..c59ec3b9e 100644
--- a/wolfsburg/dungeons/church.4d
+++ b/wolfsburg/dungeons/church.4d
@@ -5975,10 +5975,6 @@ arch dun4
 x 41
 y 29
 end
-arch flagstone
-x 41
-y 30
-end
 arch magic_mouth
 msg
 A small village has been built in what
@@ -5987,15 +5983,15 @@ endmsg
 x 41
 y 30
 end
+arch flagstone
+x 41
+y 30
+end
 arch grate_closed_2
 x 41
 y 30
 connected 2
 end
-arch flagstone
-x 41
-y 31
-end
 arch magic_mouth
 msg
 A small village has been built in what
@@ -6004,6 +6000,10 @@ endmsg
 x 41
 y 31
 end
+arch flagstone
+x 41
+y 31
+end
 arch grate_closed_2
 x 41
 y 31
diff --git a/wolfsburg/dungeons/ship_deck2 b/wolfsburg/dungeons/ship_deck2
index 084a99602..e1c509029 100644
--- a/wolfsburg/dungeons/ship_deck2
+++ b/wolfsburg/dungeons/ship_deck2
@@ -2563,10 +2563,6 @@ arch wwall_2_1_1
 x 19
 y 12
 end
-arch woodfloor
-x 19
-y 13
-end
 arch magic_mouth
 msg
 You find a secret door!
@@ -2574,6 +2570,10 @@ endmsg
 x 19
 y 13
 end
+arch woodfloor
+x 19
+y 13
+end
 arch wwall_2_1_1
 msg
 
diff --git a/wolfsburg/dungeons/underworld b/wolfsburg/dungeons/underworld
index ade80d879..919ba68ea 100644
--- a/wolfsburg/dungeons/underworld
+++ b/wolfsburg/dungeons/underworld
@@ -1166,10 +1166,6 @@ arch woodfloor
 x 7
 y 7
 end
-arch woodfloor
-x 7
-y 8
-end
 arch magic_mouth
 msg
 Speak The Name Of The Lord Of the Land
@@ -1178,6 +1174,10 @@ endmsg
 x 7
 y 8
 end
+arch woodfloor
+x 7
+y 8
+end
 arch magic_ear
 msg
 @match Pwill|pwill
@@ -2971,17 +2971,16 @@ arch bwall_2_1_2
 x 13
 y 31
 end
-arch dirtfloor
-x 13
-y 32
-end
 arch exit
 slaying underworld
 hp 11
 sp 15
 x 13
 y 32
-invisible 1
+end
+arch dirtfloor
+x 13
+y 32
 end
 arch dirtfloor
 x 13
@@ -4293,10 +4292,6 @@ endmsg
 x 19
 y 17
 end
-arch cobblestones2
-x 19
-y 18
-end
 arch magic_mouth
 msg
 A statue of the ancient Hero, Kelly
@@ -4305,6 +4300,10 @@ endmsg
 x 19
 y 18
 end
+arch cobblestones2
+x 19
+y 18
+end
 arch magic_ear
 msg
 @match help
diff --git a/wolfsburg/temple/ixalovh b/wolfsburg/temple/ixalovh
index fcc443247..7f3f96225 100644
--- a/wolfsburg/temple/ixalovh
+++ b/wolfsburg/temple/ixalovh
@@ -32,9 +32,6 @@ end
 arch awall_1_4
 y 5
 end
-arch cobblestones
-y 6
-end
 arch invis_exit
 slaying /world/world_128_109
 hp 17
@@ -42,12 +39,15 @@ sp 39
 y 6
 end
 arch cobblestones
+y 6
+end
+arch invis_exit
+slaying /world/world_128_109
+hp 17
+sp 39
 y 7
 end
-arch invis_exit
-slaying /world/world_128_109
-hp 17
-sp 39
+arch cobblestones
 y 7
 end
 arch cobblestones
@@ -1823,10 +1823,6 @@ arch cobblestones
 x 19
 y 6
 end
-arch cobblestones
-x 19
-y 6
-end
 arch invis_exit
 slaying /world/world_128_109
 hp 18
@@ -1836,7 +1832,7 @@ y 6
 end
 arch cobblestones
 x 19
-y 7
+y 6
 end
 arch cobblestones
 x 19
@@ -1851,6 +1847,10 @@ y 7
 end
 arch cobblestones
 x 19
+y 7
+end
+arch cobblestones
+x 19
 y 8
 end
 arch awall_1_3
diff --git a/wolfsburg/volcano/vvhuts b/wolfsburg/volcano/vvhuts
index 430fc349c..7080fe00e 100644
--- a/wolfsburg/volcano/vvhuts
+++ b/wolfsburg/volcano/vvhuts
@@ -369,21 +369,20 @@ end
 arch wwall_2_1_2
 x 2
 end
-arch woodfloor
-x 2
-y 1
-end
 arch exit
 slaying /world/world_129_108
 hp 4
 sp 23
-invisible 1
 is_animated 0
 x 2
 y 1
 end
 arch woodfloor
 x 2
+y 1
+end
+arch woodfloor
+x 2
 y 2
 end
 arch woodfloor
@@ -427,21 +426,20 @@ arch wwall_2_1_2
 x 2
 y 8
 end
-arch woodfloor
-x 2
-y 9
-end
 arch exit
 slaying /world/world_129_108
 hp 12
 sp 25
-invisible 1
 is_animated 0
 x 2
 y 9
 end
 arch woodfloor
 x 2
+y 9
+end
+arch woodfloor
+x 2
 y 10
 end
 arch woodfloor
@@ -480,21 +478,20 @@ arch wwall_2_1_2
 x 2
 y 16
 end
-arch woodfloor
-x 2
-y 17
-end
 arch exit
 slaying /world/world_129_108
 hp 5
 sp 22
-invisible 1
 is_animated 0
 x 2
 y 17
 end
 arch woodfloor
 x 2
+y 17
+end
+arch woodfloor
+x 2
 y 18
 end
 arch woodfloor
@@ -1644,21 +1641,20 @@ end
 arch wwall_2_1_2
 x 9
 end
-arch woodfloor
-x 9
-y 1
-end
 arch exit
 slaying /world/world_129_108
 hp 6
 sp 26
-invisible 1
 is_animated 0
 x 9
 y 1
 end
 arch woodfloor
 x 9
+y 1
+end
+arch woodfloor
+x 9
 y 2
 end
 arch woodfloor
@@ -1701,21 +1697,20 @@ arch wwall_2_1_2
 x 9
 y 8
 end
-arch woodfloor
-x 9
-y 9
-end
 arch exit
 slaying /world/world_129_108
 hp 11
 sp 28
-invisible 1
 is_animated 0
 x 9
 y 9
 end
 arch woodfloor
 x 9
+y 9
+end
+arch woodfloor
+x 9
 y 10
 end
 arch woodfloor
@@ -1754,21 +1749,20 @@ arch wwall_2_1_2
 x 9
 y 16
 end
-arch woodfloor
-x 9
-y 17
-end
 arch exit
 slaying /world/world_129_108
 hp 19
 sp 23
-invisible 1
 is_animated 0
 x 9
 y 17
 end
 arch woodfloor
 x 9
+y 17
+end
+arch woodfloor
+x 9
 y 18
 end
 arch woodfloor
@@ -2860,21 +2854,20 @@ end
 arch wwall_2_1_2
 x 16
 end
-arch woodfloor
-x 16
-y 1
-end
 arch exit
 slaying /world/world_129_108
 hp 8
 sp 29
-invisible 1
 is_animated 0
 x 16
 y 1
 end
 arch woodfloor
 x 16
+y 1
+end
+arch woodfloor
+x 16
 y 2
 end
 arch woodfloor
@@ -2917,21 +2910,20 @@ arch wwall_2_1_2
 x 16
 y 8
 end
-arch woodfloor
-x 16
-y 9
-end
 arch exit
 slaying /world/world_129_108
 hp 7
 sp 32
-invisible 1
 is_animated 0
 x 16
 y 9
 end
 arch woodfloor
 x 16
+y 9
+end
+arch woodfloor
+x 16
 y 10
 end
 arch woodfloor
@@ -4109,21 +4101,20 @@ arch wwall_2_1_2
 x 22
 y 23
 end
-arch woodfloor
-x 22
-y 24
-end
 arch exit
 slaying /world/world_129_108
 hp 10
 sp 29
-invisible 1
 is_animated 0
 x 22
 y 24
 end
 arch woodfloor
 x 22
+y 24
+end
+arch woodfloor
+x 22
 y 25
 end
 arch woodfloor
@@ -4164,21 +4155,20 @@ end
 arch wwall_2_1_2
 x 23
 end
-arch woodfloor
-x 23
-y 1
-end
 arch exit
 slaying /world/world_129_108
 hp 3
 sp 25
-invisible 1
 is_animated 0
 x 23
 y 1
 end
 arch woodfloor
 x 23
+y 1
+end
+arch woodfloor
+x 23
 y 2
 end
 arch woodfloor
@@ -4225,21 +4215,20 @@ arch wwall_2_1_2
 x 23
 y 8
 end
-arch woodfloor
-x 23
-y 9
-end
 arch exit
 slaying /world/world_129_108
 hp 11
 sp 22
-invisible 1
 is_animated 0
 x 23
 y 9
 end
 arch woodfloor
 x 23
+y 9
+end
+arch woodfloor
+x 23
 y 10
 end
 arch woodfloor
@@ -4282,21 +4271,20 @@ arch wwall_2_1_2
 x 23
 y 16
 end
-arch woodfloor
-x 23
-y 17
-end
 arch exit
 slaying /world/world_129_108
 hp 8
 sp 27
-invisible 1
 is_animated 0
 x 23
 y 17
 end
 arch woodfloor
 x 23
+y 17
+end
+arch woodfloor
+x 23
 y 18
 end
 arch woodfloor
@@ -5468,21 +5456,20 @@ end
 arch wwall_2_1_2
 x 30
 end
-arch woodfloor
-x 30
-y 1
-end
 arch exit
 slaying /world/world_129_108
 hp 5
 sp 30
-invisible 1
 is_animated 0
 x 30
 y 1
 end
 arch woodfloor
 x 30
+y 1
+end
+arch woodfloor
+x 30
 y 2
 end
 arch woodfloor
@@ -5521,21 +5508,20 @@ arch wwall_2_1_2
 x 30
 y 8
 end
-arch woodfloor
-x 30
-y 9
-end
 arch exit
 slaying /world/world_129_108
 hp 8
 sp 24
-invisible 1
 is_animated 0
 x 30
 y 9
 end
 arch woodfloor
 x 30
+y 9
+end
+arch woodfloor
+x 30
 y 10
 end
 arch woodfloor
@@ -5578,21 +5564,20 @@ arch wwall_2_1_2
 x 30
 y 16
 end
-arch woodfloor
-x 30
-y 17
-end
 arch exit
 slaying /world/world_129_108
 hp 3
 sp 28
-invisible 1
 is_animated 0
 x 30
 y 17
 end
 arch woodfloor
 x 30
+y 17
+end
+arch woodfloor
+x 30
 y 18
 end
 arch woodfloor
diff --git a/wolfsburg/volcano/vvmansion b/wolfsburg/volcano/vvmansion
index e4f623b33..11df66a23 100644
--- a/wolfsburg/volcano/vvmansion
+++ b/wolfsburg/volcano/vvmansion
@@ -2343,11 +2343,7 @@ arch grass
 x 15
 y 24
 end
-arch dungeon_floor
-x 16
-end
 arch exit
-invisible 1
 slaying /world/world_129_108
 hp 6
 sp 30
@@ -2355,6 +2351,9 @@ x 16
 end
 arch dungeon_floor
 x 16
+end
+arch dungeon_floor
+x 16
 y 1
 end
 arch dungeon_floor
@@ -2497,11 +2496,7 @@ arch grass
 x 16
 y 24
 end
-arch dungeon_floor
-x 17
-end
 arch exit
-invisible 1
 slaying /world/world_129_108
 hp 6
 sp 30
@@ -2509,6 +2504,9 @@ x 17
 end
 arch dungeon_floor
 x 17
+end
+arch dungeon_floor
+x 17
 y 1
 end
 arch dungeon_floor