diff --git a/darcap/darcap/circus/ghost b/darcap/darcap/circus/ghost
index a29d9f82a..ddc24443d 100644
--- a/darcap/darcap/circus/ghost
+++ b/darcap/darcap/circus/ghost
@@ -7,7 +7,7 @@ width 32
 height 16
 msg
 Created:  1999-01-28 Cater & Wade (john_cater@yahoo.com)
-Modified: 2008-11-20 Rick Tanner
+Modified: 2022-05-24 DraugTheWhopper
 endmsg
 end
 arch dungeon_floor
@@ -3994,7 +3994,7 @@ arch dungeon_floor
 x 28
 y 13
 end
-arch big_dragon_worthless
+arch shadow_dragon
 x 28
 y 13
 unaggressive 1
diff --git a/editor/pickmaps/monster b/editor/pickmaps/monster
index 843db6e0e..958611bb1 100644
--- a/editor/pickmaps/monster
+++ b/editor/pickmaps/monster
@@ -5,7 +5,7 @@ width 7
 height 58
 msg
 Created:  2002-08-29
-Modified: 2007-11-04 Andreas Kirschbaum
+Modified: 2022-05-24 DraugTheWhopper
 endmsg
 end
 arch acid_sphere
@@ -542,7 +542,7 @@ arch big_dragon
 x 4
 y 19
 end
-arch big_dragon_worthless
+arch shadow_dragon
 x 4
 y 21
 end
diff --git a/pup_land/ancient/village/hole/hole.B6 b/pup_land/ancient/village/hole/hole.B6
index aabde5c8e..194ca8c51 100644
--- a/pup_land/ancient/village/hole/hole.B6
+++ b/pup_land/ancient/village/hole/hole.B6
@@ -8,7 +8,7 @@ enter_x 7
 enter_y 11
 msg
 Created:  1996-06-07
-Modified: 2011-11-30 Rick Tanner
+Modified: 2022-05-24 DraugTheWhopper
 endmsg
 end
 arch pstone_1
@@ -931,13 +931,13 @@ x 7
 y 2
 end
 arch generate_dragon
-other_arch big_dragon_worthless
-hp 10000
-maxhp 10000
+other_arch big_dragon
+hp 3000
+maxhp 3000
 ac -10
 x 7
 y 2
-speed 0.010000
+speed 0.01
 end
 arch pstone_1
 x 7
diff --git a/pup_land/lone_town/cave/b3 b/pup_land/lone_town/cave/b3
index d04c7cdea..a5ac8b077 100644
--- a/pup_land/lone_town/cave/b3
+++ b/pup_land/lone_town/cave/b3
@@ -8,7 +8,7 @@ enter_x 1
 enter_y 1
 msg
 Created:  1996-12-18
-Modified: 2012-02-28 Rick Tanner
+Modified: 2022-05-24 DraugTheWhopper
 endmsg
 end
 arch dungeon_floor
@@ -2487,7 +2487,7 @@ y 36
 connected 14
 end
 arch generate_dragon
-other_arch big_dragon_worthless
+other_arch big_dragon
 Con 100
 hp 30000
 maxhp 30000
@@ -2511,7 +2511,7 @@ x 8
 y 38
 end
 arch generate_dragon
-other_arch big_dragon_worthless
+other_arch big_dragon
 Con 100
 hp 30000
 maxhp 30000
diff --git a/unlinked/forgotten_town/quests/ft_quest_3 b/unlinked/forgotten_town/quests/ft_quest_3
index 952259ad7..63e9d0218 100644
--- a/unlinked/forgotten_town/quests/ft_quest_3
+++ b/unlinked/forgotten_town/quests/ft_quest_3
@@ -5,7 +5,7 @@ width 40
 height 40
 msg
 Created:  2013-11-24 SilverNexus
-Modified: 2013-11-24 SilverNexus
+Modified: 2022-05-24 DraugTheWhopper
 endmsg
 end
 arch woodlarge
@@ -6970,7 +6970,7 @@ arch woodlarge
 x 29
 y 1
 end
-arch big_dragon_worthless
+arch big_dragon
 x 29
 y 1
 end
@@ -7842,7 +7842,7 @@ arch woodlarge
 x 33
 y 7
 end
-arch big_dragon_worthless
+arch big_dragon
 x 33
 y 7
 end
diff --git a/unlinked/kandora/cave/entrance b/unlinked/kandora/cave/entrance
index b8b70499c..1f139b995 100644
--- a/unlinked/kandora/cave/entrance
+++ b/unlinked/kandora/cave/entrance
@@ -7,7 +7,7 @@ height 14
 enter_x 1
 msg
 Created:  1999-02-28 King Zoobus
-Modified: 2021-07-25 Andreas Kirschbaum
+Modified: 2022-05-24 DraugTheWhopper
 endmsg
 end
 arch earth
@@ -1372,9 +1372,8 @@ arch earth
 x 16
 y 6
 end
-arch big_dragon_worthless
+arch big_dragon
 name Xarnok
-name_pl Xarnok
 msg
 @match wise
 I am the guardian of the portal.
diff --git a/wolfsburg/preno b/wolfsburg/preno
index 98af01b6d..b18917588 100644
--- a/wolfsburg/preno
+++ b/wolfsburg/preno
@@ -7,7 +7,7 @@ enter_x 4
 enter_y 23
 msg
 Created:  2021-02-23 Nicolas Weeger
-Modified: 2021-02-23 Nicolas Weeger
+Modified: 2022-05-24 DraugTheWhopper
 endmsg
 end
 arch woodfloorvert
@@ -3059,7 +3059,7 @@ arch woodfloorvert
 x 13
 y 2
 end
-arch big_dragon_worthless
+arch big_chaos_dragon
 x 13
 y 2
 end
@@ -3326,7 +3326,7 @@ arch woodfloorvert
 x 14
 y 6
 end
-arch swall_2_1_1
+arch swall_2_2_1
 x 14
 y 6
 end
@@ -3338,10 +3338,6 @@ arch woodfloorvert
 x 14
 y 7
 end
-arch swall_2_1_1
-x 14
-y 7
-end
 arch dungeon_magic
 x 14
 y 8
@@ -3350,10 +3346,6 @@ arch woodfloorvert
 x 14
 y 8
 end
-arch swall_2_2_1
-x 14
-y 8
-end
 arch dungeon_magic
 x 14
 y 9
@@ -3569,7 +3561,7 @@ arch woodfloorvert
 x 15
 y 6
 end
-arch big_chaos_dragon
+arch swall_2_1_2
 x 15
 y 6
 end
@@ -3589,10 +3581,6 @@ arch woodfloorvert
 x 15
 y 8
 end
-arch swall_2_1_2
-x 15
-y 8
-end
 arch dungeon_magic
 x 15
 y 9
@@ -3810,24 +3798,24 @@ arch woodfloorvert
 x 16
 y 6
 end
-arch dungeon_magic
-x 16
-y 7
-end
-arch woodfloorvert
-x 16
-y 7
-end
-arch dungeon_magic
-x 16
-y 8
-end
-arch woodfloorvert
-x 16
-y 8
-end
 arch swall_2_1_2
 x 16
+y 6
+end
+arch dungeon_magic
+x 16
+y 7
+end
+arch woodfloorvert
+x 16
+y 7
+end
+arch dungeon_magic
+x 16
+y 8
+end
+arch woodfloorvert
+x 16
 y 8
 end
 arch dungeon_magic
@@ -4049,6 +4037,10 @@ arch woodfloorvert
 x 17
 y 6
 end
+arch swall_2_2_3
+x 17
+y 6
+end
 arch dungeon_magic
 x 17
 y 7
@@ -4057,6 +4049,10 @@ arch woodfloorvert
 x 17
 y 7
 end
+arch swall_2_2_1
+x 17
+y 7
+end
 arch dungeon_magic
 x 17
 y 8
@@ -4065,10 +4061,6 @@ arch woodfloorvert
 x 17
 y 8
 end
-arch swall_2_1_2
-x 17
-y 8
-end
 arch dungeon_magic
 x 17
 y 9
@@ -4304,6 +4296,10 @@ arch woodfloorvert
 x 18
 y 7
 end
+arch swall_2_2_3
+x 18
+y 7
+end
 arch dungeon_magic
 x 18
 y 8
@@ -4312,7 +4308,7 @@ arch woodfloorvert
 x 18
 y 8
 end
-arch swall_2_2_3
+arch swall_2_1_1
 x 18
 y 8
 end