diff --git a/.gitattributes b/.gitattributes
index 676a172fd62..2ed2664e14a 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -3982,7 +3982,7 @@ res/cardsfolder/marker_beetles.txt svneol=native#text/plain
 res/cardsfolder/maro.txt -text svneol=native#text/plain
 res/cardsfolder/marrow_gnawer.txt -text svneol=native#text/plain
 res/cardsfolder/marsh_boa.txt -text svneol=native#text/plain
-res/cardsfolder/marsh_crocodile.txt svneol=native#text/plain
+res/cardsfolder/marsh_crocodile.txt -text svneol=native#text/plain
 res/cardsfolder/marsh_flats.txt -text svneol=native#text/plain
 res/cardsfolder/marsh_gas.txt -text svneol=native#text/plain
 res/cardsfolder/marsh_goblins.txt -text svneol=native#text/plain
diff --git a/res/cardsfolder/azorius_chancery.txt b/res/cardsfolder/azorius_chancery.txt
index acc1498535a..27d7fdfb2f9 100644
--- a/res/cardsfolder/azorius_chancery.txt
+++ b/res/cardsfolder/azorius_chancery.txt
@@ -5,7 +5,7 @@ Text:no text
 K:Azorius Chancery enters the battlefield tapped.
 A:AB$ Mana | Cost$ T | Produced$ W U | SpellDescription$ Add W U to your mana pool.
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigReturn | TriggerDescription$ When CARDNAME enters the battlefield, return a land you control to its owner's hand.
-SVar:TrigReturn:AB$ChangeZone | Origin$ Battlefield | Destination$ Hand | Cost$ 0 | Hidden$ True | ChangeType$ Land.YouCtrl
+SVar:TrigReturn:AB$ChangeZone | Origin$ Battlefield | Destination$ Hand | Cost$ 0 | Hidden$ True | Mandatory$ True | ChangeType$ Land.YouCtrl
 SVar:RemAIDeck:True
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/azorius_chancery.jpg
diff --git a/res/cardsfolder/boros_garrison.txt b/res/cardsfolder/boros_garrison.txt
index 7507a2eed77..1246797bfa2 100644
--- a/res/cardsfolder/boros_garrison.txt
+++ b/res/cardsfolder/boros_garrison.txt
@@ -5,7 +5,7 @@ Text:no text
 K:Boros Garrison enters the battlefield tapped.
 A:AB$ Mana | Cost$ T | Produced$ R W | SpellDescription$ Add R W to your mana pool.
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigReturn | TriggerDescription$ When CARDNAME enters the battlefield, return a land you control to its owner's hand.
-SVar:TrigReturn:AB$ChangeZone | Origin$ Battlefield | Destination$ Hand | Cost$ 0 | Hidden$ True | ChangeType$ Land.YouCtrl
+SVar:TrigReturn:AB$ChangeZone | Origin$ Battlefield | Destination$ Hand | Cost$ 0 | Hidden$ True | Mandatory$ True | ChangeType$ Land.YouCtrl
 SVar:RemAIDeck:True
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/boros_garrison.jpg
diff --git a/res/cardsfolder/cavern_harpy.txt b/res/cardsfolder/cavern_harpy.txt
index 2ecc765fb7a..370e4f1610b 100644
--- a/res/cardsfolder/cavern_harpy.txt
+++ b/res/cardsfolder/cavern_harpy.txt
@@ -6,7 +6,7 @@ PT:2/1
 K:Flying
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Creature.Self | TriggerZones$ Battlefield | Execute$ TrigChange | TriggerDescription$ When CARDNAME enters the battlefield, return a blue or black creature you control to its owner's hand.
 A:AB$ChangeZone | Cost$ PayLife<1> | Origin$ Battlefield | Destination$ Hand | SpellDescription$ Return CARDNAME to its owner's hand.  
-SVar:TrigChange:AB$ChangeZone | Origin$ Battlefield | Destination$ Hand | Cost$ 0 | Hidden$ True | ChangeType$ Creature.Black+YouCtrl,Creature.Blue+YouCtrl
+SVar:TrigChange:AB$ChangeZone | Origin$ Battlefield | Destination$ Hand | Cost$ 0 | Hidden$ True | Mandatory$ True | ChangeType$ Creature.Black+YouCtrl,Creature.Blue+YouCtrl
 SVar:RemAIDeck:True
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/cavern_harpy.jpg
diff --git a/res/cardsfolder/dimir_aqueduct.txt b/res/cardsfolder/dimir_aqueduct.txt
index 9844526a8fb..28b27c04725 100644
--- a/res/cardsfolder/dimir_aqueduct.txt
+++ b/res/cardsfolder/dimir_aqueduct.txt
@@ -5,7 +5,7 @@ Text:no text
 K:Dimir Aqueduct enters the battlefield tapped.
 A:AB$ Mana | Cost$ T | Produced$ U B | SpellDescription$ Add U B to your mana pool.
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigReturn | TriggerDescription$ When CARDNAME enters the battlefield, return a land you control to its owner's hand.
-SVar:TrigReturn:AB$ChangeZone | Origin$ Battlefield | Destination$ Hand | Cost$ 0 | Hidden$ True | ChangeType$ Land.YouCtrl
+SVar:TrigReturn:AB$ChangeZone | Origin$ Battlefield | Destination$ Hand | Cost$ 0 | Hidden$ True | Mandatory$ True | ChangeType$ Land.YouCtrl
 SVar:RemAIDeck:True
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/dimir_aqueduct.jpg
diff --git a/res/cardsfolder/doomsday_specter.txt b/res/cardsfolder/doomsday_specter.txt
index 959ebdca321..868a24e69de 100644
--- a/res/cardsfolder/doomsday_specter.txt
+++ b/res/cardsfolder/doomsday_specter.txt
@@ -6,7 +6,7 @@ PT:2/3
 K:Flying
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Creature.Self | TriggerZones$ Battlefield | Execute$ TrigChange | TriggerDescription$ When CARDNAME enters the battlefield, return a blue or black creature you control to its owner's hand.
 T:Mode$ DamageDone | ValidSource$ Card.Self | ValidTarget$ Opponent | CombatDamage$ True | Execute$ TrigDiscard | TriggerZones$ Battlefield | TriggerDescription$ Whenever CARDNAME deals combat damage to a player, look at that player's hand and choose a card from it. The player discards that card.
-SVar:TrigChange:AB$ChangeZone | Origin$ Battlefield | Destination$ Hand | Cost$ 0 | Hidden$ True | ChangeType$ Creature.Black+YouCtrl,Creature.Blue+YouCtrl
+SVar:TrigChange:AB$ChangeZone | Origin$ Battlefield | Destination$ Hand | Cost$ 0 | Hidden$ True | Mandatory$ True | ChangeType$ Creature.Black+YouCtrl,Creature.Blue+YouCtrl
 SVar:TrigDiscard:AB$Discard | Cost$ 0 | Defined$ Opponent | NumCards$ 1 | Mode$ RevealYouChoose
 SVar:RemAIDeck:True
 SVar:Rarity:Rare
diff --git a/res/cardsfolder/dream_stalker.txt b/res/cardsfolder/dream_stalker.txt
index 480b9549adf..120f9e32558 100644
--- a/res/cardsfolder/dream_stalker.txt
+++ b/res/cardsfolder/dream_stalker.txt
@@ -4,7 +4,7 @@ Types:Creature Illusion
 Text:no text
 PT:1/5
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Creature.Self | TriggerZones$ Battlefield | Execute$ TrigChange | TriggerDescription$ When CARDNAME enters the battlefield, return a permanent you control to its owner's hand.
-SVar:TrigChange:AB$ChangeZone | Origin$ Battlefield | Destination$ Hand | Cost$ 0 | Hidden$ True | ChangeType$ Permanent.YouCtrl
+SVar:TrigChange:AB$ChangeZone | Origin$ Battlefield | Destination$ Hand | Cost$ 0 | Hidden$ True | Mandatory$ True | ChangeType$ Permanent.YouCtrl
 SVar:RemAIDeck:True
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/dream_stalker.jpg
diff --git a/res/cardsfolder/fleetfoot_panther.txt b/res/cardsfolder/fleetfoot_panther.txt
index 8104e209b8e..a73121808ff 100644
--- a/res/cardsfolder/fleetfoot_panther.txt
+++ b/res/cardsfolder/fleetfoot_panther.txt
@@ -5,7 +5,7 @@ Text:no text
 PT:3/4
 K:Flash
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Creature.Self | TriggerZones$ Battlefield | Execute$ TrigChange | TriggerDescription$ When CARDNAME enters the battlefield, return a green or white creature you control to its owner's hand.
-SVar:TrigChange:AB$ChangeZone | Origin$ Battlefield | Destination$ Hand | Cost$ 0 | Hidden$ True | ChangeType$ Creature.White+YouCtrl,Creature.Green+YouCtrl
+SVar:TrigChange:AB$ChangeZone | Origin$ Battlefield | Destination$ Hand | Cost$ 0 | Hidden$ True | Mandatory$ True | ChangeType$ Creature.White+YouCtrl,Creature.Green+YouCtrl
 SVar:RemAIDeck:True
 SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/fleetfoot_panther.jpg
diff --git a/res/cardsfolder/golgari_rot_farm.txt b/res/cardsfolder/golgari_rot_farm.txt
index afb4c24a555..f218331b58b 100644
--- a/res/cardsfolder/golgari_rot_farm.txt
+++ b/res/cardsfolder/golgari_rot_farm.txt
@@ -5,7 +5,7 @@ Text:no text
 K:Golgari Rot Farm enters the battlefield tapped.
 A:AB$ Mana | Cost$ T | Produced$ B G | SpellDescription$ Add B G to your mana pool.
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigReturn | TriggerDescription$ When CARDNAME enters the battlefield, return a land you control to its owner's hand.
-SVar:TrigReturn:AB$ChangeZone | Origin$ Battlefield | Destination$ Hand | Cost$ 0 | Hidden$ True | ChangeType$ Land.YouCtrl
+SVar:TrigReturn:AB$ChangeZone | Origin$ Battlefield | Destination$ Hand | Cost$ 0 | Hidden$ True | Mandatory$ True | ChangeType$ Land.YouCtrl
 SVar:RemAIDeck:True
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/golgari_rot_farm.jpg
diff --git a/res/cardsfolder/gruul_turf.txt b/res/cardsfolder/gruul_turf.txt
index 70d5da4be71..ca51f69f8fb 100644
--- a/res/cardsfolder/gruul_turf.txt
+++ b/res/cardsfolder/gruul_turf.txt
@@ -5,7 +5,7 @@ Text:no text
 K:Gruul Turf enters the battlefield tapped.
 A:AB$ Mana | Cost$ T | Produced$ R G | SpellDescription$ Add R G to your mana pool.
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigReturn | TriggerDescription$ When CARDNAME enters the battlefield, return a land you control to its owner's hand.
-SVar:TrigReturn:AB$ChangeZone | Origin$ Battlefield | Destination$ Hand | Cost$ 0 | Hidden$ True | ChangeType$ Land.YouCtrl
+SVar:TrigReturn:AB$ChangeZone | Origin$ Battlefield | Destination$ Hand | Cost$ 0 | Hidden$ True | Mandatory$ True | ChangeType$ Land.YouCtrl
 SVar:RemAIDeck:True
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/gruul_turf.jpg
diff --git a/res/cardsfolder/horned_kavu.txt b/res/cardsfolder/horned_kavu.txt
index d4ba16d4478..d067fd9e936 100644
--- a/res/cardsfolder/horned_kavu.txt
+++ b/res/cardsfolder/horned_kavu.txt
@@ -4,7 +4,7 @@ Types:Creature Kavu
 Text:no text
 PT:3/4
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Creature.Self | TriggerZones$ Battlefield | Execute$ TrigChange | TriggerDescription$ When CARDNAME enters the battlefield, return a red or green creature you control to its owner's hand.
-SVar:TrigChange:AB$ChangeZone | Origin$ Battlefield | Destination$ Hand | Cost$ 0 | Hidden$ True | ChangeType$ Creature.Red+YouCtrl,Creature.Green+YouCtrl
+SVar:TrigChange:AB$ChangeZone | Origin$ Battlefield | Destination$ Hand | Cost$ 0 | Hidden$ True | Mandatory$ True | ChangeType$ Creature.Red+YouCtrl,Creature.Green+YouCtrl
 SVar:RemAIDeck:True
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/horned_kavu.jpg
diff --git a/res/cardsfolder/izzet_boilerworks.txt b/res/cardsfolder/izzet_boilerworks.txt
index 943c68f099c..439628c148f 100644
--- a/res/cardsfolder/izzet_boilerworks.txt
+++ b/res/cardsfolder/izzet_boilerworks.txt
@@ -5,7 +5,7 @@ Text:no text
 K:Izzet Boilerworks enters the battlefield tapped.
 A:AB$ Mana | Cost$ T | Produced$ U R | SpellDescription$ Add U R to your mana pool.
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigReturn | TriggerDescription$ When CARDNAME enters the battlefield, return a land you control to its owner's hand.
-SVar:TrigReturn:AB$ChangeZone | Origin$ Battlefield | Destination$ Hand | Cost$ 0 | Hidden$ True | ChangeType$ Land.YouCtrl
+SVar:TrigReturn:AB$ChangeZone | Origin$ Battlefield | Destination$ Hand | Cost$ 0 | Hidden$ True | Mandatory$ True | ChangeType$ Land.YouCtrl
 SVar:RemAIDeck:True
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/izzet_boilerworks.jpg
diff --git a/res/cardsfolder/khalni_gem.txt b/res/cardsfolder/khalni_gem.txt
index 8cb71055a46..199d6efa7db 100644
--- a/res/cardsfolder/khalni_gem.txt
+++ b/res/cardsfolder/khalni_gem.txt
@@ -8,7 +8,7 @@ A:AB$Mana | Cost$ T | Produced$ U | Amount$ 2 | SpellDescription$ Add U U to you
 A:AB$Mana | Cost$ T | Produced$ R | Amount$ 2 | SpellDescription$ Add R R to your mana pool.
 A:AB$Mana | Cost$ T | Produced$ G | Amount$ 2 | SpellDescription$ Add G G to your mana pool.
 T:Mode$ ChangesZone$ | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigBounce | TriggerDescription$ When CARDNAME enters the battlefield, return two lands you control to their owner's hand.
-SVar:TrigBounce:AB$ChangeZone | Cost$ 0 | Origin$ Battlefield | Destination$ Hand | ValidTgts$ Land.YouCtrl | TargetMin$ 2 | TargetMax$ 2 | TgtPrompt$ Select 2 target lands you control.
+SVar:TrigBounce:AB$ChangeZone | Cost$ 0 | Origin$ Battlefield | Destination$ Hand | Mandatory$ True | ValidTgts$ Land.YouCtrl | TargetMin$ 2 | TargetMax$ 2 | TgtPrompt$ Select 2 target lands you control.
 SVar:RemAIDeck:True
 SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/khalni_gem.jpg
diff --git a/res/cardsfolder/kor_skyfisher.txt b/res/cardsfolder/kor_skyfisher.txt
index ac5741be41f..694e063b610 100644
--- a/res/cardsfolder/kor_skyfisher.txt
+++ b/res/cardsfolder/kor_skyfisher.txt
@@ -5,7 +5,7 @@ Text:no text
 PT:2/3
 K:Flying
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Creature.Self | TriggerZones$ Battlefield | Execute$ TrigChange | TriggerDescription$ When CARDNAME enters the battlefield, return a permanent you control to its owner's hand.
-SVar:TrigChange:AB$ChangeZone | Origin$ Battlefield | Destination$ Hand | Cost$ 0 | Hidden$ True | ChangeType$ Permanent.YouCtrl
+SVar:TrigChange:AB$ChangeZone | Origin$ Battlefield | Destination$ Hand | Cost$ 0 | Hidden$ True | Mandatory$ True | ChangeType$ Permanent.YouCtrl
 SVar:RemAIDeck:True
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/kor_skyfisher.jpg
diff --git a/res/cardsfolder/lava_zombie.txt b/res/cardsfolder/lava_zombie.txt
index 82d1a1ef4ec..4d712f879fd 100644
--- a/res/cardsfolder/lava_zombie.txt
+++ b/res/cardsfolder/lava_zombie.txt
@@ -5,7 +5,7 @@ Text:no text
 PT:4/3
 A:AB$Pump | Cost$ 2 | NumAtt$ +1 | SpellDescription$ CARDNAME gets +1/+0 until end of turn.
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Creature.Self | TriggerZones$ Battlefield | Execute$ TrigChange | TriggerDescription$ When CARDNAME enters the battlefield, return a black or red creature you control to its owner's hand.
-SVar:TrigChange:AB$ChangeZone | Origin$ Battlefield | Destination$ Hand | Cost$ 0 | Hidden$ True | ChangeType$ Creature.Black+YouCtrl,Creature.Red+YouCtrl
+SVar:TrigChange:AB$ChangeZone | Origin$ Battlefield | Destination$ Hand | Cost$ 0 | Hidden$ True | Mandatory$ True | ChangeType$ Creature.Black+YouCtrl,Creature.Red+YouCtrl
 SVar:RemAIDeck:True
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/lava_zombie.jpg
diff --git a/res/cardsfolder/marsh_crocodile.txt b/res/cardsfolder/marsh_crocodile.txt
index f215ee8ee83..ac46b9dede6 100644
--- a/res/cardsfolder/marsh_crocodile.txt
+++ b/res/cardsfolder/marsh_crocodile.txt
@@ -1,14 +1,14 @@
-Name:Marsh Crocodile
-ManaCost:2 U B
-Types:Creature Crocodile
-Text:no text
-PT:4/4
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Creature.Self | TriggerZones$ Battlefield | Execute$ TrigChange | TriggerDescription$ When CARDNAME enters the battlefield, return a blue or black creature you control to its owner's hand.
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigDiscard | TriggerDescription$ When CARDNAME enters the battlefield, each player discards a card.
-SVar:TrigChange:AB$ChangeZone | Cost$ 0 | Origin$ Battlefield | Destination$ Hand | Hidden$ True | ChangeType$ Creature.Black+YouCtrl,Creature.Blue+YouCtrl
-SVar:TrigDiscard:AB$Discard | Cost$ 0 | Defined$ Each | NumCards$ 1 | Mode$ TgtChoose
-SVar:RemAIDeck:True
-SVar:Rarity:Uncommon
-SVar:Picture:http://www.wizards.com/global/images/magic/general/marsh_crocodile.jpg
-SetInfo:PLS|Uncommon|http://magiccards.info/scans/en/ps/115.jpg
+Name:Marsh Crocodile
+ManaCost:2 U B
+Types:Creature Crocodile
+Text:no text
+PT:4/4
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Creature.Self | TriggerZones$ Battlefield | Execute$ TrigChange | TriggerDescription$ When CARDNAME enters the battlefield, return a blue or black creature you control to its owner's hand.
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigDiscard | TriggerDescription$ When CARDNAME enters the battlefield, each player discards a card.
+SVar:TrigChange:AB$ChangeZone | Cost$ 0 | Origin$ Battlefield | Destination$ Hand | Hidden$ True | Mandatory$ True | ChangeType$ Creature.Black+YouCtrl,Creature.Blue+YouCtrl
+SVar:TrigDiscard:AB$Discard | Cost$ 0 | Defined$ Each | NumCards$ 1 | Mode$ TgtChoose
+SVar:RemAIDeck:True
+SVar:Rarity:Uncommon
+SVar:Picture:http://www.wizards.com/global/images/magic/general/marsh_crocodile.jpg
+SetInfo:PLS|Uncommon|http://magiccards.info/scans/en/ps/115.jpg
 End
\ No newline at end of file