diff --git a/forge-game/src/main/java/forge/game/replacement/ReplacementHandler.java b/forge-game/src/main/java/forge/game/replacement/ReplacementHandler.java
index 5cade090f8b..7f2b6e35831 100644
--- a/forge-game/src/main/java/forge/game/replacement/ReplacementHandler.java
+++ b/forge-game/src/main/java/forge/game/replacement/ReplacementHandler.java
@@ -168,7 +168,7 @@ public class ReplacementHandler {
         if (mapParams.containsKey("ReplaceWith")) {
             final String effectSVar = mapParams.get("ReplaceWith");
             final String effectAbString = replacementEffect.getHostCard().getSVar(effectSVar);
-
+            // TODO: the source of replacement effect should be the source of the original effect 
             effectSA = AbilityFactory.getAbility(effectAbString, replacementEffect.getHostCard());
             effectSA.setTrigger(true);
 
diff --git a/forge-gui/res/cardsfolder/f/festival.txt b/forge-gui/res/cardsfolder/f/festival.txt
index c73c6c8d98f..8184ae6a071 100644
--- a/forge-gui/res/cardsfolder/f/festival.txt
+++ b/forge-gui/res/cardsfolder/f/festival.txt
@@ -1,7 +1,7 @@
 Name:Festival
 ManaCost:W
 Types:Instant
-Text:Cast Festival only during an opponent's upkeep.
+Text:Cast CARDNAME only during an opponent's upkeep.
 A:SP$ Effect | Cost$ W | Name$ Festival Effect | StaticAbilities$ KWPump | OpponentTurn$ True | ActivationPhases$ Upkeep | SpellDescription$ Creatures can't attack this turn.
 SVar:KWPump:Mode$ Continuous | EffectZone$ Command | AffectedZone$ Battlefield | Affected$ Creature | AddHiddenKeyword$ CARDNAME can't attack. | Description$ Creatures can't attack this turn.
 SVar:RemAIDeck:True
diff --git a/forge-gui/res/cardsfolder/h/hagra_diabolist.txt b/forge-gui/res/cardsfolder/h/hagra_diabolist.txt
index 1a1ffe28000..6366a64d55a 100644
--- a/forge-gui/res/cardsfolder/h/hagra_diabolist.txt
+++ b/forge-gui/res/cardsfolder/h/hagra_diabolist.txt
@@ -1,6 +1,6 @@
 Name:Hagra Diabolist
 ManaCost:4 B
-Types:Creature Orge Shaman Ally
+Types:Creature Ogre Shaman Ally
 PT:3/2
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | OptionalDecider$ You | Execute$ TrigLoseLife | TriggerDescription$ Whenever CARDNAME or another Ally enters the battlefield under your control, you may have target player lose life equal to the number of Allies you control.
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Ally.Other+YouCtrl | TriggerZones$ Battlefield | OptionalDecider$ You | Execute$ TrigLoseLife | Secondary$ True | TriggerDescription$ Whenever CARDNAME or another Ally enters the battlefield under your control, you may have target player lose life equal to the number of Allies you control.