diff --git a/forge-gui/res/cardsfolder/b/beacon_of_immortality.txt b/forge-gui/res/cardsfolder/b/beacon_of_immortality.txt
index 6311a3817fd..8294d127e6f 100644
--- a/forge-gui/res/cardsfolder/b/beacon_of_immortality.txt
+++ b/forge-gui/res/cardsfolder/b/beacon_of_immortality.txt
@@ -1,8 +1,7 @@
 Name:Beacon of Immortality
 ManaCost:5 W
 Types:Instant
-A:SP$ GainLife | Cost$ 5 W | ValidTgts$ Player | TgtPrompt$ Select target player | LifeAmount$ X | SubAbility$ DBShuffle | SpellDescription$ Double target player's life total. Shuffle CARDNAME into its owner's library.
-SVar:DBShuffle:DB$ChangeZone | Origin$ Stack | Destination$ Library | Shuffle$ True
-SVar:X:TargetedPlayer$LifeTotal
-SVar:Picture:http://www.wizards.com/global/images/magic/general/beacon_of_immortality.jpg
+A:SP$ SetLife | ValidTgts$ Player | TgtPrompt$ Select target player | LifeAmount$ X | SubAbility$ DBShuffle | SpellDescription$ Double target player's life total. Shuffle CARDNAME into its owner's library.
+SVar:DBShuffle:DB$ ChangeZone | Origin$ Stack | Destination$ Library | Shuffle$ True
+SVar:X:TargetedPlayer$LifeTotal/Twice
 Oracle:Double target player's life total. Shuffle Beacon of Immortality into its owner's library.
diff --git a/forge-gui/res/cardsfolder/r/revival_revenge.txt b/forge-gui/res/cardsfolder/r/revival_revenge.txt
index 0c21541fdc5..00c1c485b06 100644
--- a/forge-gui/res/cardsfolder/r/revival_revenge.txt
+++ b/forge-gui/res/cardsfolder/r/revival_revenge.txt
@@ -1,8 +1,9 @@
 Name:Revival
 ManaCost:WB WB
-AlternateMode: Split
+AlternateMode:Split
 Types:Sorcery
-A:SP$ ChangeZone | Cost$ WB WB | Origin$ Graveyard | Destination$ Battlefield | TgtPrompt$ Choose target creature in your graveyard | ValidTgts$ Creature.YouOwn+cmcLE3 | SpellDescription$ Return target creature card with mana value 3 or less from your graveyard to the battlefield.
+A:SP$ ChangeZone | Origin$ Graveyard | Destination$ Battlefield | TgtPrompt$ Select target creature card in your graveyard with mana value 3 or less | ValidTgts$ Creature.YouOwn+cmcLE3 | SpellDescription$ Return target creature card with mana value 3 or less from your graveyard to the battlefield.
+DeckHas:Ability$Graveyard
 Oracle:Return target creature card with mana value 3 or less from your graveyard to the battlefield.
 
 ALTERNATE
@@ -10,8 +11,8 @@ ALTERNATE
 Name:Revenge
 ManaCost:4 W B
 Types:Sorcery
-A:SP$ GainLife | Cost$ 4 W B | LifeAmount$ X | SubAbility$ DBLoseHalf | SpellDescription$ Double your life total. Target opponent loses half their life, rounded up.
+A:SP$ SetLife | LifeAmount$ X | SubAbility$ DBLoseHalf | SpellDescription$ Double your life total. Target opponent loses half their life, rounded up.
 SVar:DBLoseHalf:DB$ LoseLife | ValidTgts$ Opponent | LifeAmount$ Y
-SVar:X:Count$YourLifeTotal
+SVar:X:Count$YourLifeTotal/Twice
 SVar:Y:Count$TargetedLifeTotal/HalfUp
 Oracle:Double your life total. Target opponent loses half their life, rounded up.
diff --git a/forge-gui/res/cardsfolder/upcoming/enduring_angel_angelic_enforcer.txt b/forge-gui/res/cardsfolder/upcoming/enduring_angel_angelic_enforcer.txt
index 11cebfb7dd1..9848f14e4bc 100644
--- a/forge-gui/res/cardsfolder/upcoming/enduring_angel_angelic_enforcer.txt
+++ b/forge-gui/res/cardsfolder/upcoming/enduring_angel_angelic_enforcer.txt
@@ -24,8 +24,8 @@ K:Flying
 S:Mode$ Continuous | Affected$ You | AddKeyword$ Hexproof | Description$ You have hexproof.
 S:Mode$ Continuous | EffectZone$ All | CharacteristicDefining$ True | SetPower$ X | SetToughness$ X | Description$ CARDNAME's power and toughness are each equal to your life total.
 T:Mode$ Attacks | ValidCard$ Card.Self | Execute$ TrigDoubleLife | TriggerDescription$ Whenever CARDNAME attacks, double your life total.
-SVar:TrigDoubleLife:DB$ GainLife | LifeAmount$ X
+SVar:TrigDoubleLife:DB$ SetLife | LifeAmount$ Y
 SVar:X:Count$YourLifeTotal
+SVar:Y:Count$YourLifeTotal/Twice
 SVar:HasAttackEffect:TRUE
-DeckHas:Ability$LifeGain
 Oracle:Flying\nYou have hexproof.\nAngelic Enforcer's power and toughness are each equal to your life total.\nWhenever Angelic Enforcer attacks, double your life total.