diff --git a/data/campaigns/Under_the_Burning_Suns/scenarios/08_Out_of_the_Frying_Pan.cfg b/data/campaigns/Under_the_Burning_Suns/scenarios/08_Out_of_the_Frying_Pan.cfg
index 03ed3f9990f5..ce931850146c 100644
--- a/data/campaigns/Under_the_Burning_Suns/scenarios/08_Out_of_the_Frying_Pan.cfg
+++ b/data/campaigns/Under_the_Burning_Suns/scenarios/08_Out_of_the_Frying_Pan.cfg
@@ -25,8 +25,9 @@
         id=Kaleh
         type=Quenoth Youth
         canrecruit=yes
-        gold=200
-        {INCOME 4 2 0}
+        {GOLD 120 100 80}
+        # this basically forces you to lose all your gold this scenario unless you recall a small number of loyals only
+        {INCOME 2 1 0}
         controller=human
         shroud=yes
         fog=no
@@ -560,23 +561,23 @@
 
             [then]
                 [move_unit_fake]
-                    type=Troll Whelp
+                    type=Troll Rocklobber
                     side=6
                     x=52,52,53,53,53,53,52,51
                     y=50,49,49,48,47,46,45,45
                 [/move_unit_fake]
 
                 [unit]
-                    type=Troll Whelp
+                    type=Troll Rocklobber
                     name= _ "Troll Avenger"
                     side=6
                     x=51
                     y=45
 #ifdef EASY
-                    hitpoints=28
+                    hitpoints=36
 #endif
 #ifdef NORMAL
-                    hitpoints=32
+                    hitpoints=42
 #endif
                 [/unit]
 
@@ -652,23 +653,23 @@
                 [/unit]
 
                 [move_unit_fake]
-                    type=Dwarvish Thunderer
+                    type=Dwarvish Thunderguard
                     side=6
                     x=52,52,53,53,53,53,52,52
                     y=50,49,49,48,47,46,45,44
                 [/move_unit_fake]
 
                 [unit]
-                    type=Dwarvish Thunderer
+                    type=Dwarvish Thunderguard
                     name= _ "Dwarf Avenger"
                     side=6
                     x=52
                     y=44
 #ifdef EASY
-                    hitpoints=26
+                    hitpoints=31
 #endif
 #ifdef NORMAL
-                    hitpoints=30
+                    hitpoints=37
 #endif
                 [/unit]
 
@@ -890,24 +891,24 @@
         {NAMED_UNIT 2 (Javelineer) 33 44 (Bellerin) ( _ "Bellerin") (upkeep,role,facing=free,human_scout,sw)}
 
         [move_unit_fake]
-            type=Swordsman
+            type=Halberdier
             side=2
             x=36,35,34,34
             y=42,43,43,44
             image_mods={ARMOR_SHIFT_IPF}
         [/move_unit_fake]
 
-        {NAMED_UNIT 2 (Swordsman) 34 44 (Durth) ( _ "Durth") (upkeep,role,facing=free,human_scout,sw)}
+        {NAMED_UNIT 2 (Halberdier) 34 44 (Durth) ( _ "Durth") (upkeep,role,facing=free,human_scout,sw)}
 
         [move_unit_fake]
-            type={ON_DIFFICULTY (Bowman) (Longbowman) (Master Bowman)}
+            type={ON_DIFFICULTY (Longbowman) (Longbowman) (Master Bowman)}
             side=2
             x=36,35,34
             y=42,43,43
             image_mods={ARMOR_SHIFT_IPF}
         [/move_unit_fake]
 
-        {NAMED_UNIT 2 {ON_DIFFICULTY (Bowman) (Longbowman) (Master Bowman)} 34 43 (Othgar) ( _ "Othgar") (upkeep,role,facing=free,human_scout,sw)}
+        {NAMED_UNIT 2 {ON_DIFFICULTY (Longbowman) (Longbowman) (Master Bowman)} 34 43 (Othgar) ( _ "Othgar") (upkeep,role,facing=free,human_scout,sw)}
 
         [message]
             speaker=Durth
@@ -1266,8 +1267,8 @@
     # do 25% 30% 35% damage to unit
     # awaken guardian undead:
 
-    # EASY: 1 ghouls, 1 soulless, 2 skeletons
-    # NORMAL: 1 ghouls, 1 necrophage, 2 skeletons
+    # EASY: 2 ghouls, 2 revenants, 1 skeleton
+    # NORMAL: 1 ghoul, 1 necrophage, 3 revenants
     # HARD: 2 necrophages, 2 skeletons
 
     [event]
@@ -1338,7 +1339,7 @@
         # HARD: 2 necrophages, 2 skeletons
 
 #ifdef EASY
-        {NAMED_UNIT 3 (Soulless) 21 48 () ( _ "Gate Guard") (upkeep=free)}
+        {NAMED_UNIT 3 (Ghoul) 21 48 () ( _ "Gate Guard") (upkeep=free)}
         {NAMED_UNIT 3 (Ghoul) 24 46 () ( _ "Gate Guard") (upkeep=free)}
 #endif
 
@@ -1352,12 +1353,16 @@
         {NAMED_UNIT 3 (Necrophage) 24 46 () ( _ "Gate Guard") (upkeep=free)}
 #endif
 
-        {NAMED_UNIT 3 (Skeleton) 19 47 () ( _ "Gate Guard") (upkeep=free)}
-        {NAMED_UNIT 3 (Revenant) 20 45 () ( _ "Gate Guard") (upkeep=free)}
 #ifdef HARD
-        {NAMED_UNIT 3 (Revenant) 22 45 () ( _ "Gate Guard") (upkeep=free)}
+        {NAMED_UNIT 3 (Draug) 20 45 () ( _ "Gate Guard") (upkeep=free)}
 #else
+        {NAMED_UNIT 3 (Revenant) 20 45 () ( _ "Gate Guard") (upkeep=free)}
+#endif
+        {NAMED_UNIT 3 (Revenant) 19 47 () ( _ "Gate Guard") (upkeep=free)}
+#ifdef EASY
         {NAMED_UNIT 3 (Skeleton) 22 45 () ( _ "Gate Guard") (upkeep=free)}
+#else
+        {NAMED_UNIT 3 (Revenant) 22 45 () ( _ "Gate Guard") (upkeep=free)}
 #endif
 
         [store_unit]
@@ -1570,6 +1575,7 @@
         [/message]
 
         {NOTRAIT_UNIT 3 (Water Serpent) 7 48}
+        {NOTRAIT_UNIT 3 (Water Serpent) 6 49}
 #ifndef EASY
         {NOTRAIT_UNIT 3 (Water Serpent) 8 49}
 #endif
@@ -1823,9 +1829,9 @@
     # Event 9: Enter sleeping area
 
     # several skeletons arise and attack
-    # EASY: 2 skeletons, 1 skeleton archer
-    # NORMAL: 2 skeletons, 2 skeleton archers
-    # HARD: 1 deathblade, 1 skeleton, 1 bone shooter, 1 skeleton archer
+    # EASY: 1 revenant, 1 skeletons, 1 bone shooter
+    # NORMAL: 1 revenant, 1 skeleton, 1 bone shooter, 1 skeleton archer
+    # HARD: 1 deathblade, 1 skeleton, 2 bone shooters
 
     [event]
         name=moveto
@@ -1858,12 +1864,12 @@
         {CLEAR_VARIABLE explorer}
 
         {NAMED_UNIT 3 (Skeleton) 15 40 () ( _ "Restless Dead") (upkeep,animate=free,yes)}
-        {NAMED_UNIT 3 (Skeleton Archer) 14 36 () ( _ "Restless Dead") (upkeep,animate=free,yes)}
+        {NAMED_UNIT 3 (Bone Shooter) 14 36 () ( _ "Restless Dead") (upkeep,animate=free,yes)}
 
 #ifdef HARD
         {NAMED_UNIT 3 (Deathblade) 13 39 () ( _ "Restless Dead") (upkeep,animate=free,yes)}
 #else
-        {NAMED_UNIT 3 (Skeleton) 13 39 () ( _ "Restless Dead") (upkeep,animate=free,yes)}
+        {NAMED_UNIT 3 (Revenant) 13 39 () ( _ "Restless Dead") (upkeep,animate=free,yes)}
 #endif
 
 #ifdef HARD
@@ -2214,7 +2220,9 @@
 
             {NAMED_UNIT 3 (Ixthala Demon) 5 35 (Ancient Guardian 1) ( _ "Ancient Guardian") (upkeep=free)}
             {NAMED_UNIT 3 (Ixthala Demon) 8 33 (Ancient Guardian 2) ( _ "Ancient Guardian") (upkeep=free)}
-
+#ifdef HARD
+            {NAMED_UNIT 3 (Ixthala Demon) 5 33 (Ancient Guardian 3) ( _ "Ancient Guardian") (upkeep=free)}
+#endif
             [message]
                 speaker=Ancient Guardian 1
                 message= _ "Zantoff tharqan yur glit zarf!" # wmllint: no spellcheck
@@ -2518,7 +2526,7 @@
             [/filter]
             kill=yes
             variable=cloaked_figure
-        [/store_unit]             
+        [/store_unit]
 
         [set_variable]
             name=cloaked_figure.name
@@ -3023,7 +3031,7 @@
             side=1
             variable=gold_amount
         [/store_gold]
-        {VARIABLE min_gold {ON_DIFFICULTY 125 100 100}}
+        {VARIABLE min_gold {ON_DIFFICULTY 120 100 80}}
 
         [if]
             [variable]
@@ -3569,8 +3577,8 @@
 
         [modify_side]
             side=2
-            {INCOME 9 11 13}
-            {GOLD 150 150 175}
+            {INCOME 18 24 30}
+            {GOLD 160 200 240}
         [/modify_side]
 
         #capture some of the nearby villages
@@ -3761,8 +3769,8 @@
 
         [modify_side]
             side=5
-            {INCOME 9 11 13}
-            {GOLD 100 125 150}
+            {INCOME 18 24 30}
+            {GOLD 120 160 180}
         [/modify_side]
 
         [unit]
@@ -3809,13 +3817,13 @@
 
     # Event 18: Sending for Reinforcements
 
-    # EASY: 1 dragoon, 2 cavalryman, 2 spearmen
-    # NORMAL: 1 dragoon, 2 cavaliers, 1 javelineer, 1 longbowman
+    # EASY: 1 dragoon, 2 cavalryman, 1 spearman, 1 bowman
+    # NORMAL: 2 dragoons, 1 cavalryman, 1 javelineer, 1 bowman
     # HARD: 3 dragoons, 1 swordsman, 1 longbowman
 
-    # EASY: once every 8 turns
-    # NORMAL: once every 7 turns
-    # HARD: once every 6 turns
+    # EASY: once every 7 turns
+    # NORMAL: once every 6 turns
+    # HARD: once every 5 turns
 
     [event]
         name=messengers
@@ -3830,7 +3838,7 @@
         [if]
             [variable]
                 name=messenger_timer
-                numerical_equals={ON_DIFFICULTY 8 7 6}
+                numerical_equals={ON_DIFFICULTY 7 6 5}
             [/variable]
 
             [then]
@@ -3865,7 +3873,7 @@
                 [/unit]
 
                 [unit]
-                    type={ON_DIFFICULTY (Cavalryman) (Cavalier) (Dragoon)}
+                    type={ON_DIFFICULTY (Cavalryman) (Cavalryman) (Dragoon)}
                     name= _ "Human Escort"
                     upkeep=free
                     x=$loc_x
@@ -3874,7 +3882,7 @@
                 [/unit]
 
                 [unit]
-                    type={ON_DIFFICULTY (Cavalryman) (Cavalier) (Dragoon)}
+                    type={ON_DIFFICULTY (Cavalryman) (Dragoon) (Dragoon)}
                     name= _ "Human Escort"
                     upkeep=free
                     x=$loc_x
@@ -3892,7 +3900,7 @@
                 [/unit]
 
                 [unit]
-                    type={ON_DIFFICULTY (Spearman) (Longbowman) (Master Bowman)}
+                    type={ON_DIFFICULTY (Bowman) (Bowman) (Longbowman)}
                     name= _ "Human Escort"
                     upkeep=free
                     x=$loc_x