diff --git a/maps/14_Hope_or_Hostility_2.map b/maps/14_Hope_or_Hostility.mask
similarity index 100%
rename from maps/14_Hope_or_Hostility_2.map
rename to maps/14_Hope_or_Hostility.mask
diff --git a/scenarios/14_Hope_or_Hostility.cfg b/scenarios/14_Hope_or_Hostility.cfg
index 55832ae..ba7d1b5 100644
--- a/scenarios/14_Hope_or_Hostility.cfg
+++ b/scenarios/14_Hope_or_Hostility.cfg
@@ -341,7 +341,7 @@ Although the way up here is long, it is not enough to prove your worthiness to m
         [/move_unit]
         [terrain_mask]
             x,y=1,1
-            mask="{~add-ons/dawn_of_thunder/maps/14_Hope_or_Hostility_2.map}"
+            mask="{~add-ons/dawn_of_thunder/maps/14_Hope_or_Hostility.mask}"
         [/terrain_mask]
         {BOSSFIGHT_ANIMATION}
         [objectives]
diff --git a/scenarios/17_Jotha.cfg b/scenarios/17_Jotha.cfg
index a422ebf..54bf316 100644
--- a/scenarios/17_Jotha.cfg
+++ b/scenarios/17_Jotha.cfg
@@ -9,7 +9,11 @@
     {TURNS 37 32 27 }
 
     {DEFAULT_SCHEDULE}
-    # TODO: add music
+    {SCENARIO_MUSIC vengeful.ogg}
+    {EXTRA_SCENARIO_MUSIC legends_of_the_north.ogg}
+    {EXTRA_SCENARIO_MUSIC lunar_cage.ogg}
+    {EXTRA_SCENARIO_MUSIC breaking_the_chains.ogg}
+    {EXTRA_SCENARIO_MUSIC wanderer.ogg}
     {STARTING_VILLAGES 2 6}
     {STARTING_VILLAGES 3 4}
     {STARTING_VILLAGES 4 5}
@@ -75,6 +79,53 @@
             [/modifications]
             x,y=32,5
         [/unit]
+        [ai]
+            grouping=defensive
+            aggression={ON_DIFFICULTY 0.3 0.2 0.1} # (less than the default of 0.4}
+            caution={ON_DIFFICULTY 0.7 0.6 0.5} # (more than the default of 0.25)
+            [goal]
+                name=protect_unit
+                [criteria]
+                    id=mermenking
+                [/criteria]
+                protect_radius={ON_DIFFICULTY 9 8 7}
+                value={ON_DIFFICULTY 12 11 10}
+            [/goal]
+            [goal]
+                name=protect_unit
+                [criteria]
+                    id=mermaid
+                [/criteria]
+                protect_radius={ON_DIFFICULTY 8 7 6}
+                value={ON_DIFFICULTY 9 8 7}
+            [/goal]
+            [goal]
+                name=protect_unit
+                [criteria]
+                    side=1
+                    id=mermen
+                    canrecruit=yes
+                [/criteria]
+                protect_radius={ON_DIFFICULTY 9 8 7}
+                value={ON_DIFFICULTY 6 5 4}
+            [/goal]
+            [goal]
+                name=protect_location
+                [criteria]
+                    x,y=32,9
+                [/criteria]
+                protect_radius=3
+                value={ON_DIFFICULTY 4 3 2}
+            [/goal]
+            [avoid]
+                x=13-15
+                y=2-4
+                [or]
+                    x=15-17
+                    y=23-25
+                [/or]
+            [/avoid]
+        [/ai]
     [/side]
     [side]
         side=3
@@ -87,11 +138,14 @@
         name= _ "Worthag"
         canrecruit=yes
         recruit="Orcish Warrior,Goblin Knight,Goblin Pillager,Orcish Crossbowman,Orcish Assassin,Troll,Troll Rocklobber,Orcish Warlord,Sea Orc"
-        {LIMIT_CONTEMPORANEOUS_RECRUITS 3 ("Orcish Warlord") 2}
         {GOLD 350 425 500}
         {INCOME 5 10 15}
         {FLAG_VARIANT6 ragged}
+        [ai]
+            recruitment_more="Sea Orc"
+        [/ai]
     [/side]
+    {LIMIT_CONTEMPORANEOUS_RECRUITS 3 ("Orcish Warlord") 2}
     [side]
         side=4
         controller=ai
@@ -137,6 +191,7 @@
 
     [event]
         name=prestart
+        id=setup
         [recall]
             id=Naia
         [/recall]
@@ -375,6 +430,7 @@
 
     [event]
         name=start
+        id=arrival_at_Jotha
         [delay]
             time=750
         [/delay]
@@ -401,14 +457,23 @@ The day will come where the dark will triumph over the light!
 The day will come where the last merman warrior falls inside of this city's walls!
 And the day will come where..."
         [/message]
+        [scroll_to_unit]
+            id=mermen
+        [/scroll_to_unit]
         [message]
             speaker=mermen
             message= _ "Kai, Oh Kai! I brought reinforcements! Jotha is not doomed yet!"
         [/message]
+        [scroll_to_unit]
+            id=mermenking
+        [/scroll_to_unit]
         [message]
             speaker=mermenking
             message= _ "Pelagius my friend! Greetings friends! I don't know who you are, but your mere presence is great news already. We might have a chance at defending Jotha. We'll talk later, now we fight!"
         [/message]
+        [scroll_to_unit]
+            id=Fiannon
+        [/scroll_to_unit]
         [objectives]
             side=1
             [objective]
@@ -448,6 +513,7 @@ And the day will come where..."
 
     [event]
         name=turn 2
+        id=let_Pelagius_recruit_citizens
         [message]
             speaker=mermenking
             message= _ "Pelagius! The people Jotha want to help in its defense. I trust you with their command."
@@ -468,10 +534,29 @@ And the day will come where..."
         {MODIFY_UNIT id=mermen canrecruit yes}
         {MODIFY_UNIT id=mermen extra_recruit ("Merman Citizen")}
         [redraw][/redraw]
+#ifdef EASY
+        [message]
+            speaker=mermenking
+            message= _ "Feel free to use the city to recruit!"
+        [/message]
+        [scroll_to]
+            x,y=40,10
+        [/scroll_to]
+        [terrain]
+            x,y=40,10
+            terrain=Kme
+        [/terrain]
+        [redraw][/redraw]
+        [message]
+            speaker=mermen
+            message= _ "Ah, of course! Thank you, my liege!"
+        [/message]
+#endif
     [/event]
 
     [event]
         name=side 3 turn 5
+        id=troll_timed_release
         [if]
             [have_unit]
                 [filter]
@@ -502,12 +587,25 @@ And the day will come where..."
                     to_x=47
                     to_y=24
                 [/move_unit]
+#ifdef EASY
+                [modify_unit]
+                    [filter]
+                        id=orc
+                    [/filter]
+                    attacks_left=0
+                    moves=0
+                    [status]
+                        slowed=yes
+                    [/status]
+                [/modify_unit]
+#endif
             [/then]
         [/if]
     [/event]
 
     [event]
         name=moveto
+        id=troll_moveto_release
         [filter]
             side=1
             [filter_location]
@@ -540,6 +638,7 @@ And the day will come where..."
 
     [event]
         name=troll_freed
+        id=release_the_troll
         {REMOVE_IMAGE 47 26}
         [terrain]
             x,y=47,26
@@ -572,6 +671,7 @@ And the day will come where..."
 
     [event]
         name=moveto
+        id=pickup_armor
         first_time_only=no
         [filter]
             side=1
@@ -668,6 +768,7 @@ And the day will come where..."
 
     [event]
         name=side 5 turn 7
+        id=Mal_Lirak_arrives
         [move_unit_fake]
             type=Dark Sorcerer
             to_x=36,35,35,33,33,29,28,25,20,19,16,16
@@ -684,6 +785,7 @@ And the day will come where..."
             canrecruit=yes
             extra_recruit="Wraith, Spectre, Shadow, Ghost"
         [/unit]
+        [redraw][/redraw]
         [message]
             speaker=Lirak
             message= _ "Orcs! Nagas! You are taking too long for the Master's taste, so I brought some ghostly support.
@@ -700,6 +802,8 @@ Naia, long time not seen! I see you are still with that elf, I heard you have be
         [modify_side]
             side=5
             user_team_name=_ "Mal Lirak"
+            {GOLD 200 250 300}
+            {INCOME 5 10 15}
         [/modify_side]
         [objectives]
             side=1
@@ -747,6 +851,7 @@ Naia, long time not seen! I see you are still with that elf, I heard you have be
 
     [event]
         name=side 2 turn 11
+        id=hint_about_armor
         [if]
             [variable]
                 name=armor_taken
@@ -763,6 +868,7 @@ Naia, long time not seen! I see you are still with that elf, I heard you have be
 
     [event]
         name=side 2 turn 10
+        id=hint_about_turtles
         [if]
             [variable]
                 name=turtles_found
@@ -784,6 +890,7 @@ Naia, long time not seen! I see you are still with that elf, I heard you have be
 
     [event]
         name=moveto
+        id=meet_turtles
         first_time_only=no
         [filter]
             x,y=46,2
@@ -827,6 +934,7 @@ Show yourselves!"
                 [/message]
                 {LOYAL_UNIT 1 (Baby Sea Turtle) 47 1}
                 {LOYAL_UNIT 1 (Sea Turtle) 46 1}
+                {REDRAW}
                 [set_variable]
                     name=turtles_found
                     value=yes
@@ -848,6 +956,7 @@ Show yourselves!"
 
     [event]
         name=moveto
+        id=encircle_Mal_Lirak
         first_time_only=no
         [filter]
             side=1
@@ -944,6 +1053,7 @@ Farewell, and good luck in your endeavor of saving Wesmere! You will soon unders
 
     [event]
         name=victory
+        id=cleanup
         [message]
             speaker=Thindromli
             message= _ "We did it!"
@@ -1004,6 +1114,7 @@ Farewell, and good luck in your endeavor of saving Wesmere! You will soon unders
 
     [event]
         name=last breath
+        id=orc_leader_death
         [filter]
             id=orc
         [/filter]
@@ -1041,6 +1152,7 @@ Farewell, and good luck in your endeavor of saving Wesmere! You will soon unders
 
     [event]
         name=last breath
+        id=naga_leader_death
         [filter]
             id=naga
         [/filter]
@@ -1074,6 +1186,7 @@ Farewell, and good luck in your endeavor of saving Wesmere! You will soon unders
 
     [event]
         name=last breath
+        id=Kai_Kaspius_death
         [filter]
             id=mermenking
         [/filter]
@@ -1092,6 +1205,7 @@ Farewell, and good luck in your endeavor of saving Wesmere! You will soon unders
 
     [event]
         name=last breath
+        id=Queen_Eruadne_death
         [filter]
             id=mermaid
         [/filter]
@@ -1110,6 +1224,7 @@ Farewell, and good luck in your endeavor of saving Wesmere! You will soon unders
 
     [event]
         name=last breath
+        id=Pelagius_death
         [filter]
             id=mermen
         [/filter]
diff --git a/units/monsters/Baby_Sea_Turtle.cfg b/units/monsters/Baby_Sea_Turtle.cfg
index 1b1f76f..f22c99e 100644
--- a/units/monsters/Baby_Sea_Turtle.cfg
+++ b/units/monsters/Baby_Sea_Turtle.cfg
@@ -55,6 +55,7 @@
             end=0
             image="projectiles/water-spray.png"
             image_diagonal="projectiles/water-spray.png"
+            sound=water-blast.wav
         [/missile_frame]
     [/attack_anim]
 [/unit_type]
diff --git a/units/monsters/Crab.cfg b/units/monsters/Crab.cfg
index c2f8e53..ab85874 100644
--- a/units/monsters/Crab.cfg
+++ b/units/monsters/Crab.cfg
@@ -54,6 +54,7 @@
             end=0
             image="projectiles/water-spray.png"
             image_diagonal="projectiles/water-spray.png"
+            sound=water-blast.wav
         [/missile_frame]
     [/attack_anim]
 [/unit_type]
diff --git a/units/monsters/Giant_Crab.cfg b/units/monsters/Giant_Crab.cfg
index bba8755..09abde1 100644
--- a/units/monsters/Giant_Crab.cfg
+++ b/units/monsters/Giant_Crab.cfg
@@ -55,6 +55,7 @@
             end=0
             image="projectiles/water-spray.png"
             image_diagonal="projectiles/water-spray.png"
+            sound=water-blast.wav
         [/missile_frame]
     [/attack_anim]
 [/unit_type]
diff --git a/units/monsters/Giant_Sea_Turtle.cfg b/units/monsters/Giant_Sea_Turtle.cfg
index f85ac54..f2087ca 100644
--- a/units/monsters/Giant_Sea_Turtle.cfg
+++ b/units/monsters/Giant_Sea_Turtle.cfg
@@ -63,6 +63,7 @@
             end=0
             image="projectiles/water-spray.png"
             image_diagonal="projectiles/water-spray.png"
+            sound=water-blast.wav
         [/missile_frame]
     [/attack_anim]
 [/unit_type]
diff --git a/units/monsters/Leviathan.cfg b/units/monsters/Leviathan.cfg
index fbe9435..275b617 100644
--- a/units/monsters/Leviathan.cfg
+++ b/units/monsters/Leviathan.cfg
@@ -64,6 +64,7 @@
             end=0
             image="projectiles/water-spray.png"
             image_diagonal="projectiles/water-spray.png"
+            sound=water-blast.wav
         [/missile_frame]
     [/attack_anim]
 [/unit_type]
diff --git a/units/monsters/Overgrown_Crab.cfg b/units/monsters/Overgrown_Crab.cfg
index 22fa2cc..e607bdc 100644
--- a/units/monsters/Overgrown_Crab.cfg
+++ b/units/monsters/Overgrown_Crab.cfg
@@ -54,6 +54,7 @@
             end=0
             image="projectiles/water-spray.png"
             image_diagonal="projectiles/water-spray.png"
+            sound=water-blast.wav
         [/missile_frame]
     [/attack_anim]
 [/unit_type]
diff --git a/units/monsters/Sea_Turtle.cfg b/units/monsters/Sea_Turtle.cfg
index 1a082ea..cdcea5a 100644
--- a/units/monsters/Sea_Turtle.cfg
+++ b/units/monsters/Sea_Turtle.cfg
@@ -60,6 +60,7 @@
             end=0
             image="projectiles/water-spray.png"
             image_diagonal="projectiles/water-spray.png"
+            sound=water-blast.wav
         [/missile_frame]
     [/attack_anim]
 [/unit_type]