diff --git a/data/campaigns/Legend_of_Wesmere/scenarios/04_Elvish_Treasury.cfg b/data/campaigns/Legend_of_Wesmere/scenarios/04_Elvish_Treasury.cfg
index 8717cf92670..6d8908fb8c4 100644
--- a/data/campaigns/Legend_of_Wesmere/scenarios/04_Elvish_Treasury.cfg
+++ b/data/campaigns/Legend_of_Wesmere/scenarios/04_Elvish_Treasury.cfg
@@ -207,9 +207,15 @@
         [/unit]
 #endif
         [message]
+            #TODO ESR
             id=Cleodil
             message= _ "We are free! My lord Kalenz, from this day forward we are your sworn followers. And there is that which you should hear about the treasure."
         [/message]
+        [message]
+            id=Kalenz
+            #TODO ESR  
+            message= _ "This text is a stub. Let's fight the saurians first and talk later."
+        [/message]
     [/event]
 
     [event]
@@ -220,7 +226,6 @@
             y=11
         [/filter]
 
-
         [removeitem]
         [/removeitem]
 
@@ -249,6 +254,7 @@
 
             [then]
                 [message]
+                    #TODO ESR
                     id=Kalenz
                     message= _ "Without their leaders, the saurians flee in panic. Free the garrison!"
                 [/message]
@@ -260,15 +266,18 @@
         [/if]
 
         [message]
+            #TODO ESR
             id=Kalenz
             message= _ "We have defeated the saurians and freed the garrison, but our gold is gone. "
         [/message]
         [message]
+            #TODO ESR
             id=Cleodil
             message= _ "The saurians have looted our treasury. They were particularly interested in finding something they called 'dastone'. I am sorry, my lord Kalenz, I could not understand their distorted speech very well."
         [/message]
         [message]
-            type=Elvish Archer,Elvish Scout,Elvish Shaman,Elvish Fighter,Elvish Marshal,Elvish Champion,Elvish Avenger,Elvish Sharpshooter
+            #TODO ESR
+            race=elf
             message= _ "The war with the Orcs goes poorly. We are going to need that gold back!"
         [/message]
         [message]
@@ -277,5 +286,27 @@
         [/message]
     [/event]
 
+    [event]
+        name=last breath
+        [filter]
+            id=Shurm
+        [/filter]
+        [message]
+            #TODO ESR
+            speaker=unit
+            message= _ "Aargh! I'm gone!"
+        [/message]
+        [message]
+            #TODO ESR
+            id=Kalenz
+            message= _ "I told you so!"
+        [/message]
+        [message]
+            #TODO ESR
+            speaker=second_unit
+            message= _ "Know that you perished at the hands of the Kalenz's elves!"
+        [/message]
+    [/event]
+
     {campaigns/Legend_of_Wesmere/utils/deaths.cfg}
 [/scenario]
diff --git a/data/campaigns/Legend_of_Wesmere/scenarios/05_Saurian_Treasury.cfg b/data/campaigns/Legend_of_Wesmere/scenarios/05_Saurian_Treasury.cfg
index 04d77ed2c4c..993ab9c39d6 100644
--- a/data/campaigns/Legend_of_Wesmere/scenarios/05_Saurian_Treasury.cfg
+++ b/data/campaigns/Legend_of_Wesmere/scenarios/05_Saurian_Treasury.cfg
@@ -283,6 +283,19 @@
         [/event]
     [/event]
 
+
+    [event]
+        name=last breath
+        [filter]
+            id=Spahr
+        [/filter]
+        [message]
+            #TODO ESR
+            speaker=unit
+            message= _ "Aargh! I'm dying!"
+        [/message]
+    [/event]
+
     [event]
         name=victory
         [message]
diff --git a/data/campaigns/Legend_of_Wesmere/utils/deaths.cfg b/data/campaigns/Legend_of_Wesmere/utils/deaths.cfg
index 956f16335f3..6f6395f6d74 100644
--- a/data/campaigns/Legend_of_Wesmere/utils/deaths.cfg
+++ b/data/campaigns/Legend_of_Wesmere/utils/deaths.cfg
@@ -6,6 +6,7 @@
         id=Kalenz
     [/filter]
     [message]
+        #TODO ESR
         speaker=unit
         message= _ "I have been defeated!"
     [/message]
@@ -40,12 +41,14 @@
         [/variable]
         [then]
             [message]
+                #TODO ESR
                 speaker=unit
                 message= _ "I am finished! I can finally rest!"
             [/message]
         [/then]
         [else]
             [message]
+                #TODO ESR
                 speaker=unit
                 message= _ "Farewell, Kalenz!"
             [/message]
@@ -62,14 +65,17 @@
 
 [event]
     name=last breath
+    #TODO Cleodil shouldn't say this in the early scenarios.
     [filter]
         id=Cleodil
     [/filter]
     [message]
+        #TODO ESR
         speaker=unit
         message= _ "I'm sorry I failed you, Kalenz...beloved..."
     [/message]
     [message]
+        #TODO ESR
         id=Kalenz
         message= _ "Nooo! Cleodil! Without you I cannot go on!"
     [/message]
@@ -84,6 +90,7 @@
         id=Olurf
     [/filter]
     [message]
+        #TODO ESR
         speaker=unit
         message= _ "No! This is the end! We have been defeated!"
     [/message]
@@ -98,6 +105,7 @@
         id=Uradredia
     [/filter]
     [message]
+        #TODO ESR
         id=Kalenz
         message= _ "With Uradredia gone, the North Elves will no longer fight!"
     [/message]
@@ -106,43 +114,13 @@
     [/endlevel]
 [/event]
 
-#TODO Spahr can be killed two times
-[event]
-    name=last breath
-    [filter]
-        id=Spahr
-    [/filter]
-    [message]
-        speaker=unit
-        message= _ "Aargh! I'm dying!"
-    [/message]
-[/event]
-
-[event]
-    name=last breath
-    [filter]
-        id=Shurm
-    [/filter]
-    [message]
-        speaker=unit
-        message= _ "Aargh! I'm gone!"
-    [/message]
-    [message]
-        id=Kalenz
-        message= _ "I told you so!"
-    [/message]
-    [message]
-        speaker=second_unit
-        message= _ "Know that you perished at the hands of the Kalenz's elves!"
-    [/message]
-[/event]
-
 [event]
     name=last breath
     [filter]
         id=Galtrid
     [/filter]
     [message]
+        #TODO ESR
         id=Kalenz
         message= _ "No! It's all over!"
     [/message]
@@ -167,6 +145,7 @@
 [event]
     name=time over
     [message]
+        #TODO ESR
         speaker=unit
         message= _ "Oh, no! We are too late..."
     [/message]