diff --git a/res/cardsfolder/b/benediction_of_moons.txt b/res/cardsfolder/b/benediction_of_moons.txt
index bd8b739d9c6..7779a6ad59c 100644
--- a/res/cardsfolder/b/benediction_of_moons.txt
+++ b/res/cardsfolder/b/benediction_of_moons.txt
@@ -3,7 +3,8 @@ ManaCost:W
 Types:Sorcery
 Text:no text
 K:Haunt:TrigGainLife:You gain 1 life for each player.
-SVar:TrigGainLife:AB$GainLife | Cost$ 0 | Defined$ You | LifeAmount$ 2
+SVar:TrigGainLife:AB$ GainLife | Cost$ 0 | Defined$ You | LifeAmount$ X | References$ X
+SVar:X:PlayerCountPlayers$Amount
 Oracle:You gain 1 life for each player.\nHaunt (When this spell card is put into a graveyard after resolving, exile it haunting target creature.)\nWhen the creature Benediction of Moons haunts dies, you gain 1 life for each player.
 SVar:Picture:http://www.wizards.com/global/images/magic/general/benediction_of_moons.jpg
 SetInfo:GPT|Common|http://magiccards.info/scans/en/gp/3.jpg
diff --git a/res/cardsfolder/c/cabal_conditioning.txt b/res/cardsfolder/c/cabal_conditioning.txt
index 5d5e13505da..68c21caeada 100644
--- a/res/cardsfolder/c/cabal_conditioning.txt
+++ b/res/cardsfolder/c/cabal_conditioning.txt
@@ -2,8 +2,9 @@ Name:Cabal Conditioning
 ManaCost:6 B
 Types:Sorcery
 Text:no text
-A:SP$ Discard | Cost$ 6 B | ValidTgts$ Player | TgtPrompt$ Select target player | TargetMin$ 0 | TargetMax$ 2 | NumCards$ X | Mode$ TgtChoose | References$ X | SpellDescription$ Any number of target players each discard a number of cards equal to the highest converted mana cost among permanents you control.
+A:SP$ Discard | Cost$ 6 B | ValidTgts$ Player | TgtPrompt$ Select target player | TargetMin$ 0 | TargetMax$ MaxTgt | References$ MaxTgt | NumCards$ X | Mode$ TgtChoose | References$ X | SpellDescription$ Any number of target players each discard a number of cards equal to the highest converted mana cost among permanents you control.
 SVar:X:Count$MaxCMCYouCtrl
+SVar:MaxTgt:PlayerCountPlayers$Amount
 SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/cabal_conditioning.jpg
 SetInfo:SCG|Rare|http://magiccards.info/scans/en/sc/56.jpg
diff --git a/res/cardsfolder/h/hunters_feast.txt b/res/cardsfolder/h/hunters_feast.txt
index b7a4785f331..96e64ce9d69 100644
--- a/res/cardsfolder/h/hunters_feast.txt
+++ b/res/cardsfolder/h/hunters_feast.txt
@@ -2,7 +2,8 @@ Name:Hunters' Feast
 ManaCost:3 G
 Types:Sorcery
 Text:no text
-A:SP$ GainLife | Cost$ 3 G | ValidTgts$ Player | TgtPrompt$ Select target player | TargetMin$ 0 | TargetMax$ 2 | LifeAmount$ 6 | SpellDescription$ Any number of target players each gain 6 life.
+A:SP$ GainLife | Cost$ 3 G | ValidTgts$ Player | TgtPrompt$ Select target player | TargetMin$ 0 | TargetMax$ MaxTgt | References$ MaxTgt | LifeAmount$ 6 | SpellDescription$ Any number of target players each gain 6 life.
+SVar:MaxTgt:PlayerCountPlayers$Amount
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/hunters_feast.jpg
 SetInfo:M11|Common|http://magiccards.info/scans/en/m11/182.jpg
diff --git a/res/cardsfolder/j/jace_memory_adept.txt b/res/cardsfolder/j/jace_memory_adept.txt
index dd51e50954a..dee7bf26d72 100644
--- a/res/cardsfolder/j/jace_memory_adept.txt
+++ b/res/cardsfolder/j/jace_memory_adept.txt
@@ -6,7 +6,8 @@ Loyalty:4
 A:AB$ Draw | Cost$ AddCounter<1/LOYALTY> | Defined$ You | SubAbility$ DBMill | Planeswalker$ True | SpellDescription$ Draw a card.  Target player puts the top card of his or her library into his or her graveyard.
 SVar:DBMill:DB$ Mill | ValidTgts$ Player | TgtPrompt$ Select target player | NumCards$ 1
 A:AB$ Mill | Cost$ 0 | ValidTgts$ Player | TgtPrompt$ Select target player | NumCards$ 10 | Planeswalker$ True | SpellDescription$ Target player puts the top 10 cards of his or her library in his or her graveyard.
-A:AB$ Draw | Cost$ SubCounter<7/LOYALTY> | ValidTgts$ Player | TgtPrompt$ Select target player | TargetMin$ 0 | TargetMax$ 2 | NumCards$ 20 | Planeswalker$ True | Ultimate$ True | SpellDescription$ Any number of target players each draw 20 cards.
+A:AB$ Draw | Cost$ SubCounter<7/LOYALTY> | ValidTgts$ Player | TgtPrompt$ Select target player | TargetMin$ 0 | TargetMax$ MaxTgt | References$ MaxTgt | NumCards$ 20 | Planeswalker$ True | Ultimate$ True | SpellDescription$ Any number of target players each draw 20 cards.
+SVar:MaxTgt:PlayerCountPlayers$Amount
 SVar:Rarity:Mythic
 SVar:Picture:http://www.wizards.com/global/images/magic/general/jace_memory_adept.jpg
 SetInfo:M13|Mythic|http://magiccards.info/scans/en/m13/56.jpg
diff --git a/res/cardsfolder/r/reward_the_faithful.txt b/res/cardsfolder/r/reward_the_faithful.txt
index 01c0e8211a0..d251b5ed611 100644
--- a/res/cardsfolder/r/reward_the_faithful.txt
+++ b/res/cardsfolder/r/reward_the_faithful.txt
@@ -2,8 +2,9 @@ Name:Reward the Faithful
 ManaCost:W
 Types:Instant
 Text:no text
-A:SP$ GainLife | Cost$ W | ValidTgts$ Player | TgtPrompt$ Select target player | TargetMin$ 0 | TargetMax$ 2 | LifeAmount$ X | References$ X | SpellDescription$ Any number of target players each gain life equal to the highest converted mana cost among permanents you control.
+A:SP$ GainLife | Cost$ W | ValidTgts$ Player | TgtPrompt$ Select target player | TargetMin$ 0 | TargetMax$ MaxTgt | LifeAmount$ X | References$ X,MaxTgt | SpellDescription$ Any number of target players each gain life equal to the highest converted mana cost among permanents you control.
 SVar:X:Count$MaxCMCYouCtrl
+SVar:MaxTgt:PlayerCountPlayers$Amount
 SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/reward_the_faithful.jpg
 SetInfo:SCG|Uncommon|http://magiccards.info/scans/en/sc/22.jpg