diff --git a/.gitattributes b/.gitattributes
index 233db89fdf0..e5be4dbf489 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -6307,7 +6307,7 @@ res/cardsfolder/skeletal_changeling.txt -text svneol=native#text/plain
 res/cardsfolder/skeletal_crocodile.txt -text svneol=native#text/plain
 res/cardsfolder/skeletal_kathari.txt -text svneol=native#text/plain
 res/cardsfolder/skeletal_snake.txt -text svneol=native#text/plain
-res/cardsfolder/skeletal_vampire.txt svneol=native#text/plain
+res/cardsfolder/skeletal_vampire.txt -text svneol=native#text/plain
 res/cardsfolder/skeletal_wurm.txt -text svneol=native#text/plain
 res/cardsfolder/skeleton_ship.txt -text svneol=native#text/plain
 res/cardsfolder/skinrender.txt -text svneol=native#text/plain
@@ -6344,7 +6344,7 @@ res/cardsfolder/skullsnatcher.txt svneol=native#text/plain
 res/cardsfolder/skulltap.txt -text svneol=native#text/plain
 res/cardsfolder/sky_diamond.txt -text svneol=native#text/plain
 res/cardsfolder/sky_eel_school.txt -text svneol=native#text/plain
-res/cardsfolder/sky_hussar.txt svneol=native#text/plain
+res/cardsfolder/sky_hussar.txt -text svneol=native#text/plain
 res/cardsfolder/sky_ruin_drake.txt -text svneol=native#text/plain
 res/cardsfolder/sky_spirit.txt -text svneol=native#text/plain
 res/cardsfolder/sky_swallower.txt -text svneol=native#text/plain
@@ -6813,7 +6813,7 @@ res/cardsfolder/stormbind.txt -text svneol=native#text/plain
 res/cardsfolder/stormcallers_boon.txt -text svneol=native#text/plain
 res/cardsfolder/stormcloud_djinn.txt -text svneol=native#text/plain
 res/cardsfolder/stormfront_pegasus.txt -text svneol=native#text/plain
-res/cardsfolder/stormfront_riders.txt svneol=native#text/plain
+res/cardsfolder/stormfront_riders.txt -text svneol=native#text/plain
 res/cardsfolder/stormscale_anarch.txt -text svneol=native#text/plain
 res/cardsfolder/stormscape_apprentice.txt -text svneol=native#text/plain
 res/cardsfolder/stormscape_familiar.txt -text svneol=native#text/plain
@@ -7023,7 +7023,7 @@ res/cardsfolder/talon_sliver.txt -text svneol=native#text/plain
 res/cardsfolder/talon_trooper.txt -text svneol=native#text/plain
 res/cardsfolder/talonrend.txt -text svneol=native#text/plain
 res/cardsfolder/talruum_minotaur.txt -text svneol=native#text/plain
-res/cardsfolder/talus_paladin.txt svneol=native#text/plain
+res/cardsfolder/talus_paladin.txt -text svneol=native#text/plain
 res/cardsfolder/tamanoa.txt svneol=native#text/plain
 res/cardsfolder/tangle_asp.txt -text svneol=native#text/plain
 res/cardsfolder/tangle_golem.txt -text svneol=native#text/plain
diff --git a/res/cardsfolder/sarcomancy.txt b/res/cardsfolder/sarcomancy.txt
index 5398bd4ab22..3e6700f288e 100644
--- a/res/cardsfolder/sarcomancy.txt
+++ b/res/cardsfolder/sarcomancy.txt
@@ -2,7 +2,7 @@ Name:Sarcomancy
 ManaCost:B
 Types:Enchantment
 Text:no text
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | TriggerZones$ Battlefield | Execute$ TrigToken | TriggerDescription$ When CARDNAME enters the battlefield, put a 2/2 black Zombie creature token onto the battlefield.
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigToken | TriggerDescription$ When CARDNAME enters the battlefield, put a 2/2 black Zombie creature token onto the battlefield.
 SVar:TrigToken:AB$Token | Cost$ 0 | TokenImage$ B 2 2 Zombie | TokenName$ Zombie | TokenColors$ Black | TokenTypes$ Creature,Zombie | TokenPower$ 2 | TokenToughness$ 2 | TokenOwner$ You | TokenAmount$ 1
 T:Mode$ Phase | Phase$ Upkeep | ValidPlayer$ You | TriggerZones$ Battlefield | IsPresent$ Creature.Zombie | PresentCompare$ EQ0 | Execute$ TrigNoZombies | TriggerDescription$ At the beginning of your upkeep, if there are no Zombies on the battlefield, CARDNAME deals 1 damage to you.
 SVar:TrigNoZombies:DB$DealDamage | NumDmg$ 1 | Defined$ You
diff --git a/res/cardsfolder/screaming_seahawk.txt b/res/cardsfolder/screaming_seahawk.txt
index 34014dfdca7..cb5fc7084a3 100644
--- a/res/cardsfolder/screaming_seahawk.txt
+++ b/res/cardsfolder/screaming_seahawk.txt
@@ -4,7 +4,7 @@ Types:Creature Bird
 Text:no text
 PT:2/2
 K:Flying
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | TriggerZones$ Battlefield | OptionalDecider$ You | Execute$ TrigChange | TriggerDescription$ When CARDNAME enters the battlefield, you may search your library for a card named CARDNAME, reveal it, and put it into your hand. If you do, shuffle your library.
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | OptionalDecider$ You | Execute$ TrigChange | TriggerDescription$ When CARDNAME enters the battlefield, you may search your library for a card named CARDNAME, reveal it, and put it into your hand. If you do, shuffle your library.
 SVar:TrigChange:AB$ChangeZone | Cost$ 0 | Origin$ Library | Destination$ Hand | ChangeType$ Card.namedScreaming Seahawk | ChangeNum$ 1
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/screaming_seahawk.jpg
diff --git a/res/cardsfolder/seascape_aerialist.txt b/res/cardsfolder/seascape_aerialist.txt
index 6d146c23294..bb8746c1e38 100644
--- a/res/cardsfolder/seascape_aerialist.txt
+++ b/res/cardsfolder/seascape_aerialist.txt
@@ -3,7 +3,8 @@ ManaCost:4 U
 Types:Creature Merfolk Wizard Ally
 Text:no text
 PT:2/3
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self,Ally.YouCtrl | TriggerZones$ Battlefield | OptionalDecider$ You | Execute$ TrigPump | TriggerDescription$ Whenever CARDNAME or another Ally enters the battlefield under your control, you may have Ally creatures you control gain flying until end of turn.
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | OptionalDecider$ You | Execute$ TrigPump | TriggerDescription$ Whenever CARDNAME or another Ally enters the battlefield under your control, you may have Ally creatures you control gain flying until end of turn.
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Ally.YouCtrl | TriggerZones$ Battlefield | OptionalDecider$ You | Execute$ TrigPump | Secondary$ True | TriggerDescription$ Whenever CARDNAME or another Ally enters the battlefield under your control, you may have Ally creatures you control gain flying until end of turn.
 SVar:TrigPump:AB$PumpAll | Cost$ 0 | ValidCards$ Ally.YouCtrl | KW$ Flying
 SVar:PlayMain1:TRUE
 SVar:BuffedBy:Ally
diff --git a/res/cardsfolder/skeletal_vampire.txt b/res/cardsfolder/skeletal_vampire.txt
index b8f5f4bcf19..cd15a28086f 100644
--- a/res/cardsfolder/skeletal_vampire.txt
+++ b/res/cardsfolder/skeletal_vampire.txt
@@ -1,14 +1,14 @@
-Name:Skeletal Vampire
-ManaCost:4 B B
-Types:Creature Vampire Skeleton
-Text:no text
-PT:3/3
-K:Flying
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | TriggerZones$ Battlefield | Execute$ TrigToken | TriggerDescription$ When CARDNAME enters the battlefield, put two 1/1 black Bat creature tokens with flying onto the battlefield.
-SVar:TrigToken:AB$Token | Cost$ 0 | TokenImage$ B 1 1 Bat | TokenName$ Bat | TokenColors$ Black | TokenTypes$ Creature,Bat | TokenPower$ 1 | TokenToughness$ 1 | TokenKeywords$ Flying  | TokenOwner$ You | TokenAmount$ 2
-A:AB$ Token | Cost$ 3 B B Sac<1/Bat> | TokenAmount$ 2 | TokenImage$ B 1 1 Bat | TokenName$ Bat | TokenColors$ Black | TokenTypes$ Creature,Bat | TokenPower$ 1 | TokenToughness$ 1 | TokenKeywords$ Flying  | TokenOwner$ You | SpellDescription$ Put two 1/1 black Bat creature tokens with flying onto the battlefield.
-A:AB$ Regenerate | Cost$ Sac<1/Bat> | SpellDescription$ Regenerate CARDNAME.
-SVar:Rarity:Rare
-SVar:Picture:http://www.wizards.com/global/images/magic/general/skeletal_vampire.jpg
-SetInfo:GPT|Rare|http://magiccards.info/scans/en/gp/62.jpg
+Name:Skeletal Vampire
+ManaCost:4 B B
+Types:Creature Vampire Skeleton
+Text:no text
+PT:3/3
+K:Flying
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigToken | TriggerDescription$ When CARDNAME enters the battlefield, put two 1/1 black Bat creature tokens with flying onto the battlefield.
+SVar:TrigToken:AB$Token | Cost$ 0 | TokenImage$ B 1 1 Bat | TokenName$ Bat | TokenColors$ Black | TokenTypes$ Creature,Bat | TokenPower$ 1 | TokenToughness$ 1 | TokenKeywords$ Flying  | TokenOwner$ You | TokenAmount$ 2
+A:AB$ Token | Cost$ 3 B B Sac<1/Bat> | TokenAmount$ 2 | TokenImage$ B 1 1 Bat | TokenName$ Bat | TokenColors$ Black | TokenTypes$ Creature,Bat | TokenPower$ 1 | TokenToughness$ 1 | TokenKeywords$ Flying  | TokenOwner$ You | SpellDescription$ Put two 1/1 black Bat creature tokens with flying onto the battlefield.
+A:AB$ Regenerate | Cost$ Sac<1/Bat> | SpellDescription$ Regenerate CARDNAME.
+SVar:Rarity:Rare
+SVar:Picture:http://www.wizards.com/global/images/magic/general/skeletal_vampire.jpg
+SetInfo:GPT|Rare|http://magiccards.info/scans/en/gp/62.jpg
 End
\ No newline at end of file
diff --git a/res/cardsfolder/sky_hussar.txt b/res/cardsfolder/sky_hussar.txt
index 17fead0d709..e8fadc22cd0 100644
--- a/res/cardsfolder/sky_hussar.txt
+++ b/res/cardsfolder/sky_hussar.txt
@@ -1,13 +1,13 @@
-Name:Sky Hussar
-ManaCost:3 W U
-Types:Creature Human Knight
-Text:no text
-PT:4/3
-K:Flying
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | TriggerZones$ Battlefield | Execute$ TrigUntapAll | TriggerDescription$ When CARDNAME enters the battlefield, untap all creatures you control.
-SVar:TrigUntapAll:AB$UntapAll | Cost$ 0 | ValidCards$ Creature.YouCtrl | SpellDescription$ untap all creatures you control.
-A:AB$ Draw | Cost$ tapXType<2/Creature.White;Creature.Blue> | NumCards$ 1 | ActivatingZone$ Hand | ActivationLimit$ 1 | PlayerTurn$ True | ActivatingPhases$ Upkeep | PrecostDesc$ Forecast - | CostDesc$ Tap two untapped white and/or blue creatures you control: | SpellDescription$ Reveal CARDNAME from your hand: Draw a card. (Activate this ability only during your upkeep and only once each turn.)
-SVar:Rarity:Uncommon
-SVar:Picture:http://www.wizards.com/global/images/magic/general/sky_hussar.jpg
-SetInfo:DIS|Uncommon|http://magiccards.info/scans/en/di/131.jpg
+Name:Sky Hussar
+ManaCost:3 W U
+Types:Creature Human Knight
+Text:no text
+PT:4/3
+K:Flying
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigUntapAll | TriggerDescription$ When CARDNAME enters the battlefield, untap all creatures you control.
+SVar:TrigUntapAll:AB$UntapAll | Cost$ 0 | ValidCards$ Creature.YouCtrl | SpellDescription$ untap all creatures you control.
+A:AB$ Draw | Cost$ tapXType<2/Creature.White;Creature.Blue> | NumCards$ 1 | ActivatingZone$ Hand | ActivationLimit$ 1 | PlayerTurn$ True | ActivatingPhases$ Upkeep | PrecostDesc$ Forecast - | CostDesc$ Tap two untapped white and/or blue creatures you control: | SpellDescription$ Reveal CARDNAME from your hand: Draw a card. (Activate this ability only during your upkeep and only once each turn.)
+SVar:Rarity:Uncommon
+SVar:Picture:http://www.wizards.com/global/images/magic/general/sky_hussar.jpg
+SetInfo:DIS|Uncommon|http://magiccards.info/scans/en/di/131.jpg
 End
\ No newline at end of file
diff --git a/res/cardsfolder/stormfront_riders.txt b/res/cardsfolder/stormfront_riders.txt
index e697ea2a4bd..1836994309d 100644
--- a/res/cardsfolder/stormfront_riders.txt
+++ b/res/cardsfolder/stormfront_riders.txt
@@ -1,15 +1,16 @@
-Name:Stormfront Riders
-ManaCost:4 W
-Types:Creature Human Soldier
-Text:no text
-PT:4/3
-K:Flying
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigChangeZone | TriggerDescription$ When CARDNAME enters the battlefield, return two creatures you control to their owner's hand.
-T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Hand | ValidCard$ Card.Self,Creature.YouCtrl+Other | TriggerZones$ Battlefield | Execute$ TrigToken | TriggerDescription$ Whenever CARDNAME or another creature is returned to your hand from the battlefield, put a 1/1 white Soldier creature token onto the battlefield.
-SVar:TrigToken:AB$ Token | Cost$ 0 | TokenAmount$ 1 | TokenName$ Soldier | TokenTypes$ Creature,Soldier | TokenOwner$ You | TokenColors$ White | TokenPower$ 1 | TokenToughness$ 1
-SVar:TrigChangeZone:AB$ChangeZone | Cost$ 0 | Origin$ Battlefield | Destination$ Hand | Hidden$ True | ChangeType$ Creature.YouCtrl | ChangeNum$ 2
-SVar:RemAIDeck:True
-SVar:Rarity:Uncommon
-SVar:Picture:http://www.wizards.com/global/images/magic/general/stormfront_riders.jpg
-SetInfo:PLC|Uncommon|http://magiccards.info/scans/en/pc/20.jpg
+Name:Stormfront Riders
+ManaCost:4 W
+Types:Creature Human Soldier
+Text:no text
+PT:4/3
+K:Flying
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigChangeZone | TriggerDescription$ When CARDNAME enters the battlefield, return two creatures you control to their owner's hand.
+T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Hand | ValidCard$ Card.Self | Execute$ TrigToken | TriggerDescription$ Whenever CARDNAME or another creature is returned to your hand from the battlefield, put a 1/1 white Soldier creature token onto the battlefield.
+T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Hand | ValidCard$ Creature.YouCtrl+Other | TriggerZones$ Battlefield | Execute$ TrigToken | Secondary$ True | TriggerDescription$ Whenever CARDNAME or another creature is returned to your hand from the battlefield, put a 1/1 white Soldier creature token onto the battlefield.
+SVar:TrigToken:AB$ Token | Cost$ 0 | TokenAmount$ 1 | TokenName$ Soldier | TokenTypes$ Creature,Soldier | TokenOwner$ You | TokenColors$ White | TokenPower$ 1 | TokenToughness$ 1
+SVar:TrigChangeZone:AB$ChangeZone | Cost$ 0 | Origin$ Battlefield | Destination$ Hand | Hidden$ True | ChangeType$ Creature.YouCtrl | ChangeNum$ 2
+SVar:RemAIDeck:True
+SVar:Rarity:Uncommon
+SVar:Picture:http://www.wizards.com/global/images/magic/general/stormfront_riders.jpg
+SetInfo:PLC|Uncommon|http://magiccards.info/scans/en/pc/20.jpg
 End
\ No newline at end of file
diff --git a/res/cardsfolder/sun_titan.txt b/res/cardsfolder/sun_titan.txt
index a6e3626e8fc..d99487ac4ef 100644
--- a/res/cardsfolder/sun_titan.txt
+++ b/res/cardsfolder/sun_titan.txt
@@ -4,7 +4,7 @@ Types:Creature Giant
 Text:no text
 PT:6/6
 K:Vigilance
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | TriggerZones$ Battlefield | Execute$ TrigChange | OptionalDecider$ You | TriggerDescription$ Whenever CARDNAME enters the battlefield, you may return target permanent card with converted mana cost 3 or less from your graveyard to the battlefield.
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigChange | OptionalDecider$ You | TriggerDescription$ Whenever CARDNAME enters the battlefield, you may return target permanent card with converted mana cost 3 or less from your graveyard to the battlefield.
 T:Mode$ Attacks | ValidCard$ Card.Self | Execute$ TrigChange | TriggerZones$ Battlefield | OptionalDecider$ You | TriggerDescription$ Whenever CARDNAME attacks, you may return target permanent card with converted mana cost 3 or less from your graveyard to the battlefield.
 SVar:TrigChange:AB$ChangeZone | Origin$ Graveyard | Destination$ Battlefield | ValidTgts$ Permanent.YouCtrl+cmcLE3 | Cost$ 0
 SVar:Rarity:Mythic
diff --git a/res/cardsfolder/tajuru_archer.txt b/res/cardsfolder/tajuru_archer.txt
index 7504280701e..be3999f230a 100644
--- a/res/cardsfolder/tajuru_archer.txt
+++ b/res/cardsfolder/tajuru_archer.txt
@@ -3,7 +3,8 @@ ManaCost:2 G
 Types:Creature Elf Archer Ally
 Text:no text
 PT:1/2
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self,Ally.Other+YouCtrl | OptionalDecider$ You | TriggerZones$ Battlefield | Execute$ TrigDamage | TriggerDescription$ Whenever CARDNAME or another Ally enters the battlefield under your control, you may have CARDNAME deal damage to target creature with flying equal to the number of Allies you control.
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self| OptionalDecider$ You | Execute$ TrigDamage | TriggerDescription$ Whenever CARDNAME or another Ally enters the battlefield under your control, you may have CARDNAME deal damage to target creature with flying equal to the number of Allies you control.
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Ally.Other+YouCtrl | OptionalDecider$ You | TriggerZones$ Battlefield | Execute$ TrigDamage | Secondary$ True | TriggerDescription$ Whenever CARDNAME or another Ally enters the battlefield under your control, you may have CARDNAME deal damage to target creature with flying equal to the number of Allies you control.
 SVar:TrigDamage:AB$DealDamage | Cost$ 0 | ValidTgts$ Creature.withFlying | NumDmg$ NumAllies | TgtPrompt$ Select a target creature with flying.
 SVar:NumAllies:Count$Valid Ally.YouCtrl
 SVar:PlayMain1:TRUE
diff --git a/res/cardsfolder/talus_paladin.txt b/res/cardsfolder/talus_paladin.txt
index 051e488d57c..547069e9a04 100644
--- a/res/cardsfolder/talus_paladin.txt
+++ b/res/cardsfolder/talus_paladin.txt
@@ -1,15 +1,16 @@
-Name:Talus Paladin
-ManaCost:3 W
-Types:Creature Human Knight Ally
-Text:no text
-PT:2/3
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self,Ally.Other+YouCtrl | OptionalDecider$ You | TriggerZones$ Battlefield | Execute$ TrigPumpAll | TriggerDescription$ Whenever CARDNAME or another Ally enters the battlefield under your control, you may have Allies you control gain lifelink until end of turn, and you may put a +1/+1 counter on CARDNAME.
-SVar:TrigPumpAll:AB$PumpAll | Cost$ 0 | ValidCards$ Ally.YouCtrl | KW$ Lifelink | SubAbility$ SVar=DBCounter
-SVar:DBCounter:DB$PutCounter | Cost$ 0 | Defined$ Self | CounterType$ P1P1 | CounterNum$ 1 | OptionalDecider$ You
-SVar:PlayMain1:TRUE
-SVar:BuffedBy:Ally
-SVar:RemRandomDeck:True
-SVar:Rarity:Rare
-SVar:Picture:http://www.wizards.com/global/images/magic/general/Talus_Paladin.jpg
-SetInfo:WWK|Rare|http://magiccards.info/scans/en/wwk/21.jpg
+Name:Talus Paladin
+ManaCost:3 W
+Types:Creature Human Knight Ally
+Text:no text
+PT:2/3
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | OptionalDecider$ You | Execute$ TrigPumpAll | TriggerDescription$ Whenever CARDNAME or another Ally enters the battlefield under your control, you may have Allies you control gain lifelink until end of turn, and you may put a +1/+1 counter on CARDNAME.
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Ally.Other+YouCtrl | OptionalDecider$ You | TriggerZones$ Battlefield | Execute$ TrigPumpAll | Secondary$ True | TriggerDescription$ Whenever CARDNAME or another Ally enters the battlefield under your control, you may have Allies you control gain lifelink until end of turn, and you may put a +1/+1 counter on CARDNAME.
+SVar:TrigPumpAll:AB$PumpAll | Cost$ 0 | ValidCards$ Ally.YouCtrl | KW$ Lifelink | SubAbility$ SVar=DBCounter
+SVar:DBCounter:DB$PutCounter | Cost$ 0 | Defined$ Self | CounterType$ P1P1 | CounterNum$ 1 | OptionalDecider$ You
+SVar:PlayMain1:TRUE
+SVar:BuffedBy:Ally
+SVar:RemRandomDeck:True
+SVar:Rarity:Rare
+SVar:Picture:http://www.wizards.com/global/images/magic/general/Talus_Paladin.jpg
+SetInfo:WWK|Rare|http://magiccards.info/scans/en/wwk/21.jpg
 End
\ No newline at end of file
diff --git a/res/cardsfolder/treefolk_harbinger.txt b/res/cardsfolder/treefolk_harbinger.txt
index a838b433568..ed6296fce1c 100644
--- a/res/cardsfolder/treefolk_harbinger.txt
+++ b/res/cardsfolder/treefolk_harbinger.txt
@@ -3,7 +3,7 @@ ManaCost:G
 Types:Creature Treefolk Druid
 Text:no text
 PT:0/3
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | TriggerZones$ Battlefield | Execute$ TrigChange | TriggerDescription$ When CARDNAME enters the battlefield, you may search your library for a Treefolk or Forest card, reveal it, then shuffle your library and put that card on top of it.
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigChange | TriggerDescription$ When CARDNAME enters the battlefield, you may search your library for a Treefolk or Forest card, reveal it, then shuffle your library and put that card on top of it.
 SVar:TrigChange:AB$ChangeZone | Cost$ 0 | Origin$ Library | Destination$ Library | LibraryPosition$ 0 | ChangeType$ Card.Treefolk,Card.Forest | ChangeNum$ 1
 SVar:RemRandomDeck:True
 SVar:Rarity:Uncommon
diff --git a/res/cardsfolder/tuktuk_grunts.txt b/res/cardsfolder/tuktuk_grunts.txt
index a31aafeed40..ec40e64b0b0 100644
--- a/res/cardsfolder/tuktuk_grunts.txt
+++ b/res/cardsfolder/tuktuk_grunts.txt
@@ -4,7 +4,8 @@ Types:Creature Goblin Warrior Ally
 Text:no text
 PT:2/2
 K:Haste
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self,Ally.YouCtrl | TriggerZones$ Battlefield | OptionalDecider$ You | Execute$ TrigPutCounter | TriggerDescription$ Whenever CARDNAME or another Ally enters the battlefield under your control, you may put a +1/+1 counter on CARDNAME.
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | OptionalDecider$ You | Execute$ TrigPutCounter | TriggerDescription$ Whenever CARDNAME or another Ally enters the battlefield under your control, you may put a +1/+1 counter on CARDNAME.
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Ally.YouCtrl | TriggerZones$ Battlefield | OptionalDecider$ You | Execute$ TrigPutCounter | Secondary$ True | TriggerDescription$ Whenever CARDNAME or another Ally enters the battlefield under your control, you may put a +1/+1 counter on CARDNAME.
 SVar:TrigPutCounter:DB$PutCounter | Defined$ Self | CounterType$ P1P1 | CounterNum$ 1
 SVar:PlayMain1:TRUE
 SVar:BuffedBy:Ally
diff --git a/res/cardsfolder/turntimber_ranger.txt b/res/cardsfolder/turntimber_ranger.txt
index 892e8246d99..03b77181bd3 100644
--- a/res/cardsfolder/turntimber_ranger.txt
+++ b/res/cardsfolder/turntimber_ranger.txt
@@ -3,7 +3,8 @@ ManaCost:3 G G
 Types:Creature Elf Scout Ally
 Text:no text
 PT:2/2
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self,Ally.YouCtrl | TriggerZones$ Battlefield | OptionalDecider$ You | Execute$ TrigToken | TriggerDescription$ Whenever CARDNAME or another Ally enters the battlefield under your control, you may put a 2/2 green Wolf creature token onto the battlefield. If you do, put a +1/+1 counter on CARDNAME.
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | OptionalDecider$ You | Execute$ TrigToken | TriggerDescription$ Whenever CARDNAME or another Ally enters the battlefield under your control, you may put a 2/2 green Wolf creature token onto the battlefield. If you do, put a +1/+1 counter on CARDNAME.
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Ally.YouCtrl | TriggerZones$ Battlefield | OptionalDecider$ You | Execute$ TrigToken | Secondary$ True | TriggerDescription$ Whenever CARDNAME or another Ally enters the battlefield under your control, you may put a 2/2 green Wolf creature token onto the battlefield. If you do, put a +1/+1 counter on CARDNAME.
 SVar:TrigToken:AB$Token | Cost$ 0 | TokenAmount$ 1 | TokenName$ Wolf | TokenTypes$ Creature,Wolf | TokenOwner$ You | TokenColors$ Green | TokenPower$ 2 | TokenToughness$ 2 | SubAbility$ SVar=DBPutCounter
 SVar:DBPutCounter:DB$PutCounter | Defined$ Self | CounterType$ P1P1 | CounterNum$ 1
 SVar:PlayMain1:TRUE