diff --git a/planes/greenway3 b/planes/greenway3
index 347b7958b..96e0d5af6 100644
--- a/planes/greenway3
+++ b/planes/greenway3
@@ -1,6 +1,6 @@
 arch map
-region greenway
 name TheGreenWay
+region greenway
 msg
 Creator: Avion
 CF Java Map Editor
@@ -8,6 +8,8 @@ Date:    5/24/2004
 endmsg
 width 50
 height 50
+enter_x 18
+enter_y 37
 darkness 1
 tile_path_1 /planes/greenway6
 tile_path_2 /planes/greenway9
@@ -3125,7 +3127,7 @@ arch evergreens
 x 15
 y 36
 end
-arch woods_2
+arch tree
 x 15
 y 37
 end
@@ -3316,19 +3318,19 @@ arch evergreens
 x 16
 y 34
 end
-arch evergreens
+arch brush
 x 16
 y 35
 end
-arch evergreens
+arch grass
 x 16
 y 36
 end
-arch woods_2
+arch brush
 x 16
 y 37
 end
-arch evergreens
+arch grass
 x 16
 y 38
 end
@@ -3515,19 +3517,19 @@ arch evergreens
 x 17
 y 34
 end
-arch evergreens
+arch brush
 x 17
 y 35
 end
-arch woods_2
+arch grass
 x 17
 y 36
 end
-arch evergreens
+arch flagstone
 x 17
 y 37
 end
-arch evergreens
+arch brush
 x 17
 y 38
 end
@@ -3714,23 +3716,27 @@ arch evergreens
 x 18
 y 34
 end
-arch evergreens
+arch brush
 x 18
 y 35
 end
-arch woods_2
+arch flagstone
 x 18
 y 36
 end
-arch evergreens
+arch flagstone
 x 18
 y 37
 end
-arch evergreens
+arch light4
+x 18
+y 37
+end
+arch flagstone
 x 18
 y 38
 end
-arch evergreens
+arch tree
 x 18
 y 39
 end
@@ -3917,23 +3923,23 @@ arch evergreens
 x 19
 y 34
 end
-arch evergreens
+arch tree
 x 19
 y 35
 end
-arch evergreens
+arch tree
 x 19
 y 36
 end
-arch evergreens
+arch flagstone
 x 19
 y 37
 end
-arch evergreens
+arch grass
 x 19
 y 38
 end
-arch evergreens
+arch tree
 x 19
 y 39
 end
@@ -4132,7 +4138,7 @@ arch darkforest
 x 20
 y 37
 end
-arch evergreens
+arch tree
 x 20
 y 38
 end
@@ -4340,7 +4346,7 @@ arch darkforest
 x 21
 y 37
 end
-arch woods
+arch tree
 x 21
 y 38
 end
@@ -4539,7 +4545,7 @@ arch evergreens
 x 22
 y 37
 end
-arch evergreens
+arch tree
 x 22
 y 38
 end
@@ -5701,7 +5707,14 @@ arch grass
 x 28
 y 25
 end
-arch grass
+arch brush
+x 28
+y 26
+end
+arch archway_tree
+slaying /world/world_104_114
+hp 43
+sp 17
 x 28
 y 26
 end
diff --git a/planes/greenway5 b/planes/greenway5
index b7e19798e..e12b616ba 100644
--- a/planes/greenway5
+++ b/planes/greenway5
@@ -1,6 +1,6 @@
 arch map
-region greenway
 name TheGreenWay
+region greenway
 msg
 Creator: Avion
 CF Java Map Editor
@@ -1024,13 +1024,6 @@ arch brush
 x 5
 y 5
 end
-arch archway_tree
-slaying /world/world_110_117
-hp 22
-sp 45
-x 5
-y 5
-end
 arch brush
 x 5
 y 6
@@ -9528,13 +9521,6 @@ arch brush
 x 46
 y 38
 end
-arch archway_tree
-slaying /world/world_104_114
-hp 43
-sp 17
-x 46
-y 38
-end
 arch brush
 x 46
 y 39
diff --git a/planes/greenway6 b/planes/greenway6
index 8b0273545..f898c0fe3 100644
--- a/planes/greenway6
+++ b/planes/greenway6
@@ -1,6 +1,6 @@
 arch map
-region greenway
 name TheGreenWay
+region greenway
 msg
 Creator: Avion
 CF Java Map Editor
@@ -8,6 +8,8 @@ Date:    5/24/2004
 endmsg
 width 50
 height 50
+enter_x 31
+enter_y 41
 tile_path_1 /planes/greenway9
 tile_path_2 /planes/greenway1
 tile_path_3 /planes/greenway3
@@ -6220,7 +6222,7 @@ arch darkforest
 x 30
 y 40
 end
-arch darkforest
+arch flagstone
 x 30
 y 41
 end
@@ -6419,15 +6421,19 @@ arch darkforest
 x 31
 y 39
 end
-arch darkforest
+arch flagstone
 x 31
 y 40
 end
-arch darkforest
+arch flagstone
 x 31
 y 41
 end
-arch darkforest
+arch light4
+x 31
+y 41
+end
+arch flagstone
 x 31
 y 42
 end
@@ -6634,7 +6640,7 @@ arch darkforest
 x 32
 y 40
 end
-arch woods_3
+arch flagstone
 x 32
 y 41
 end
diff --git a/planes/greenway8 b/planes/greenway8
index cd5348afb..1aad9f73c 100644
--- a/planes/greenway8
+++ b/planes/greenway8
@@ -1,6 +1,6 @@
 arch map
-region greenway
 name TheGreenWay
+region greenway
 msg
 Creator: Avion
 CF Java Map Editor
@@ -8,6 +8,8 @@ Date:    5/24/2004
 endmsg
 width 50
 height 50
+enter_x 23
+enter_y 26
 darkness 1
 tile_path_1 /planes/greenway1
 tile_path_2 /planes/greenway9
@@ -2018,6 +2020,13 @@ arch brush
 x 10
 y 9
 end
+arch archway_tree
+slaying /world/world_110_117
+hp 22
+sp 45
+x 10
+y 9
+end
 arch tree
 x 10
 y 10
@@ -4545,7 +4554,7 @@ arch darkforest
 x 22
 y 25
 end
-arch evergreens
+arch flagstone
 x 22
 y 26
 end
@@ -4740,15 +4749,19 @@ arch darkforest
 x 23
 y 24
 end
-arch evergreens
+arch flagstone
 x 23
 y 25
 end
-arch evergreens
+arch flagstone
 x 23
 y 26
 end
-arch darkforest
+arch light4
+x 23
+y 26
+end
+arch flagstone
 x 23
 y 27
 end
@@ -4943,7 +4956,7 @@ arch evergreens
 x 24
 y 25
 end
-arch evergreens
+arch flagstone
 x 24
 y 26
 end
diff --git a/planes/harcanna_wood b/planes/harcanna_wood
index 40c81a04d..a9057bdd4 100644
--- a/planes/harcanna_wood
+++ b/planes/harcanna_wood
@@ -295,6 +295,10 @@ arch grass
 x 1
 y 20
 end
+arch dire_wolf_sire
+x 1
+y 20
+end
 arch grass
 x 1
 y 21
@@ -395,6 +399,10 @@ arch grass
 x 1
 y 43
 end
+arch dire_wolf
+x 1
+y 43
+end
 arch grass
 x 1
 y 44
@@ -510,6 +518,10 @@ arch grass
 x 2
 y 18
 end
+arch dire_wolf
+x 2
+y 18
+end
 arch grass
 x 2
 y 19
@@ -530,6 +542,10 @@ arch grass
 x 2
 y 23
 end
+arch dire_wolf
+x 2
+y 23
+end
 arch grass
 x 2
 y 24
@@ -578,6 +594,10 @@ arch grass
 x 2
 y 33
 end
+arch wraith
+x 2
+y 33
+end
 arch grass
 x 2
 y 34
@@ -622,6 +642,10 @@ arch grass
 x 2
 y 44
 end
+arch dire_wolf
+x 2
+y 44
+end
 arch grass
 x 2
 y 45
@@ -753,6 +777,10 @@ arch grass
 x 3
 y 24
 end
+arch dire_wolf
+x 3
+y 24
+end
 arch grass
 x 3
 y 25
@@ -801,6 +829,10 @@ arch grass
 x 3
 y 34
 end
+arch generate_ghost
+x 3
+y 34
+end
 arch grass
 x 3
 y 35
@@ -868,6 +900,10 @@ arch woods
 x 4
 y 1
 end
+arch wraith
+x 4
+y 1
+end
 arch woods
 x 4
 y 2
@@ -1501,6 +1537,10 @@ arch woods
 x 7
 y 2
 end
+arch wraith
+x 7
+y 2
+end
 arch woods
 x 7
 y 3
@@ -2876,6 +2916,10 @@ arch grass
 x 13
 y 12
 end
+arch wraith
+x 13
+y 12
+end
 arch darkforest
 x 13
 y 13
@@ -2888,6 +2932,10 @@ arch woods
 x 13
 y 15
 end
+arch wraith
+x 13
+y 15
+end
 arch woods
 x 13
 y 16
@@ -3063,10 +3111,18 @@ arch grass
 x 14
 y 3
 end
+arch dire_wolf
+x 14
+y 3
+end
 arch grass
 x 14
 y 4
 end
+arch dire_wolf
+x 14
+y 4
+end
 arch grass
 x 14
 y 5
@@ -3103,6 +3159,10 @@ arch grass
 x 14
 y 12
 end
+arch wraith
+x 14
+y 12
+end
 arch darkforest
 x 14
 y 13
@@ -3290,6 +3350,10 @@ arch grass
 x 15
 y 3
 end
+arch dire_wolf_sire
+x 15
+y 3
+end
 arch grass
 x 15
 y 4
@@ -3505,6 +3569,10 @@ arch grass
 x 16
 y 1
 end
+arch dire_wolf
+x 16
+y 1
+end
 arch darkforest
 x 16
 y 2
@@ -5953,6 +6021,10 @@ arch grass
 x 26
 y 48
 end
+arch dire_wolf
+x 26
+y 48
+end
 arch grass
 x 26
 y 49
@@ -6176,6 +6248,10 @@ arch grass
 x 27
 y 49
 end
+arch dire_wolf
+x 27
+y 49
+end
 arch darkforest
 x 28
 end
@@ -9079,6 +9155,10 @@ arch grass
 x 40
 y 45
 end
+arch dire_wolf_sire
+x 40
+y 45
+end
 arch woods
 x 40
 y 46
@@ -10018,6 +10098,10 @@ arch grass
 x 45
 y 6
 end
+arch generate_ghost
+x 45
+y 6
+end
 arch grass
 x 45
 y 7
@@ -10262,6 +10346,10 @@ arch grass
 x 46
 y 9
 end
+arch wraith
+x 46
+y 9
+end
 arch grass
 x 46
 y 10
@@ -10652,6 +10740,10 @@ arch grass
 x 48
 y 3
 end
+arch banshee
+x 48
+y 3
+end
 arch grass
 x 48
 y 4
diff --git a/world/world_104_114 b/world/world_104_114
index 95604e8e2..8aab8e128 100644
--- a/world/world_104_114
+++ b/world/world_104_114
@@ -8947,11 +8947,11 @@ end
 arch exit
 msg
 layoutstyle maze
-dungeon_level 6
+dungeon_level 7
 expand2x 1
 treasureoptions 20
 monsterstyle sylvan
-dungeon_depth 10
+dungeon_depth 8
 xsize 50
 ysize 50
 exitstyle darkforest
@@ -8959,7 +8959,7 @@ doorstyle special/stone
 decorstyle outdoor_lush
 floorstyle outdoor_lush
 wallstyle trees
-final_map /planes/greenway5
+final_map /planes/greenway3
 exit_on_final_map no
 endmsg
 invisible 1
diff --git a/world/world_110_117 b/world/world_110_117
index 203a52572..369b35dcd 100644
--- a/world/world_110_117
+++ b/world/world_110_117
@@ -4463,7 +4463,7 @@ end
 arch exit
 msg
 layoutstyle rogue
-dungeon_level 6
+dungeon_level 8
 expand2x 1
 treasureoptions 20
 monsterstyle sylvan
@@ -4475,7 +4475,7 @@ doorstyle special/stone
 decorstyle outdoor_lush
 floorstyle outdoor_lush
 wallstyle trees
-final_map /planes/greenway5
+final_map /planes/greenway8
 exit_on_final_map no
 endmsg
 invisible 1
diff --git a/world/world_115_101 b/world/world_115_101
index e7a94e1a6..e571d278a 100644
--- a/world/world_115_101
+++ b/world/world_115_101
@@ -9190,7 +9190,7 @@ end
 arch exit
 msg
 layoutstyle rogue
-dungeon_level 6
+dungeon_level 9
 expand2x 1
 treasureoptions 20
 monsterstyle sylvan