diff --git a/res/cardsfolder/c/cerebral_eruption.txt b/res/cardsfolder/c/cerebral_eruption.txt
index b3de0c8773e..c4723214b3c 100644
--- a/res/cardsfolder/c/cerebral_eruption.txt
+++ b/res/cardsfolder/c/cerebral_eruption.txt
@@ -1,9 +1,10 @@
 Name:Cerebral Eruption
 ManaCost:2 R R
 Types:Sorcery
-A:SP$ Dig | Cost$ 2 R R | ValidTgts$ Opponent | TgtPrompt$ Select target opponent | DigNum$ 1 | Reveal$ True | ChangeNum$ All | ChangeValid$ Card.YouDontCtrl | DestinationZone$ Library | LibraryPosition$ 0 | RememberChanged$ True | ForgetOtherRemembered$ True | SubAbility$ DBDamage | SpellDescription$ Target opponent reveals the top card of his or her library. Cerebral Eruption deals damage equal to the revealed card's converted mana cost to that player and each creature he or she controls. If a land card is revealed this way, return Cerebral Eruption to its owner's hand.
+A:SP$ Dig | Cost$ 2 R R | ValidTgts$ Opponent | TgtPrompt$ Select target opponent | DigNum$ 1 | Reveal$ True | NoMove$ True | RememberRevealed$ True | SubAbility$ DBDamage | SpellDescription$ Target opponent reveals the top card of his or her library. Cerebral Eruption deals damage equal to the revealed card's converted mana cost to that player and each creature he or she controls. If a land card is revealed this way, return Cerebral Eruption to its owner's hand.
 SVar:DBDamage:DB$ DamageAll | ValidCards$ Creature.TargetedPlayerCtrl | ValidPlayers$ Targeted | ValidDescription$ that player and each creature he or she controls. | NumDmg$ X | SubAbility$ DBReturn | References$ X
-SVar:DBReturn:DB$ ChangeZone | Defined$ Self | Origin$ Stack | Destination$ Hand | ConditionDefined$ Remembered | ConditionPresent$ Land | ConditionCompare$ EQ1 | ConditionDescription$ If a land card is revealed this way,
+SVar:DBReturn:DB$ ChangeZone | Defined$ Self | Origin$ Stack | Destination$ Hand | ConditionDefined$ Remembered | ConditionPresent$ Land | ConditionCompare$ EQ1 | ConditionDescription$ If a land card is revealed this way, | SubAbility$ DBCleanup
+SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
 SVar:X:Remembered$CardManaCost
 SVar:Picture:http://www.wizards.com/global/images/magic/general/cerebral_eruption.jpg
 Oracle:Target opponent reveals the top card of his or her library. Cerebral Eruption deals damage equal to the revealed card's converted mana cost to that player and each creature he or she controls. If a land card is revealed this way, return Cerebral Eruption to its owner's hand.
\ No newline at end of file
diff --git a/res/cardsfolder/c/crypt_champion.txt b/res/cardsfolder/c/crypt_champion.txt
index b8f87c54c42..087deb2f1eb 100644
--- a/res/cardsfolder/c/crypt_champion.txt
+++ b/res/cardsfolder/c/crypt_champion.txt
@@ -3,10 +3,10 @@ ManaCost:3 B
 Types:Creature Zombie
 PT:2/2
 K:Double Strike
-T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigChangeZoneHuman | TriggerDescription$ When CARDNAME enters the battlefield, each player puts a creature card with converted mana cost 3 or less from his or her graveyard onto the battlefield.
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigChangeZone | TriggerDescription$ When CARDNAME enters the battlefield, each player puts a creature card with converted mana cost 3 or less from his or her graveyard onto the battlefield.
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigSac | ManaNotSpent$ R | TriggerDescription$ When CARDNAME enters the battlefield, sacrifice it unless R was spent to cast it.
-SVar:TrigChangeZoneHuman:AB$ ChangeZone | Cost$ 0 | Origin$ Graveyard | Destination$ Battlefield | ChangeType$ Creature.YouCtrl+cmcLE3 | ChangeNum$ 1 | Hidden$ True | SubAbility$ DBChangeZoneOpp | SpellDescription$ Each player puts a creature card with converted mana cost 3 or less from his or her graveyard onto the battlefield.
-SVar:DBChangeZoneOpp:DB$ ChangeZone | Origin$ Graveyard | Destination$ Battlefield | ChangeType$ Creature.YouDontCtrl+cmcLE3 | DefinedPlayer$ Opponent | ChangeNum$ 1 | Hidden$ True
+SVar:TrigChangeZone:AB$ RepeatEach | RepeatPlayers$ Player | Cost$ 0 | RepeatSubAbility$ DBChangeZone
+SVar:DBChangeZone:DB$ ChangeZone | Origin$ Graveyard | Destination$ Battlefield | ChangeType$ Creature.RememberedPlayerCtrl+cmcLE3 | ChangeNum$ 1 | Hidden$ True | DefinedPlayer$ Player.IsRemembered | Chooser$ Player.IsRemembered
 SVar:TrigSac:AB$ Sacrifice | Cost$ 0 | Defined$ Self
 SVar:ManaNeededToAvoidNegativeEffect:red
 SVar:Picture:http://www.wizards.com/global/images/magic/general/crypt_champion.jpg
diff --git a/res/cardsfolder/d/descent_into_madness.txt b/res/cardsfolder/d/descent_into_madness.txt
index 0582ab92f4f..aba6a1d3fa9 100644
--- a/res/cardsfolder/d/descent_into_madness.txt
+++ b/res/cardsfolder/d/descent_into_madness.txt
@@ -3,8 +3,8 @@ ManaCost:3 B B
 Types:Enchantment
 T:Mode$ Phase | Phase$ Upkeep | ValidPlayer$ You | TriggerZones$ Battlefield | Execute$ TrigPutCounter | TriggerDescription$ At the beginning of your upkeep, put a despair counter on CARDNAME, then each player exiles X permanents he or she controls and/or cards from his or her hand, where X is the number of despair counters on CARDNAME.
 SVar:TrigPutCounter:AB$ PutCounter | Cost$ 0 | Defined$ Self | CounterType$ DESPAIR | CounterNum$ 1 | SubAbility$ DBExileSelf
-SVar:DBExileSelf:DB$ ChangeZone | Cost$ 0 | DefinedPlayer$ Self | ChangeType$ Permanent.YouCtrl,Card | ChangeNum$ X | Hidden$ True | Origin$ Battlefield,Hand | Destination$ Exile | SubAbility$ DBExileOpponent | References$ X
-SVar:DBExileOpponent:DB$ ChangeZone | Cost$ 0 | DefinedPlayer$ Opponent | ChangeType$ Permanent.YouDontCtrl,Card | ChangeNum$ X | Hidden$ True | Origin$ Battlefield,Hand | Destination$ Exile | References$ X
+SVar:DBExileSelf:DB$ RepeatEach | RepeatPlayers$ Player | RepeatSubAbility$ DBExile
+SVar:DBExile:DB$ ChangeZone | DefinedPlayer$ Player.IsRemembered | Chooser$ Player.IsRemembered | ChangeType$ Permanent.RememberedPlayerCtrl,Card.RememberedPlayerCtrl | ChangeNum$ X | Hidden$ True | Origin$ Battlefield,Hand | Destination$ Exile | References$ X
 SVar:X:Count$CardCounters.DESPAIR
 SVar:RemAIDeck:True
 SVar:RemRandomDeck:True
diff --git a/res/cardsfolder/m/monsoon.txt b/res/cardsfolder/m/monsoon.txt
index e1cc3887ccf..2c1c04966ed 100644
--- a/res/cardsfolder/m/monsoon.txt
+++ b/res/cardsfolder/m/monsoon.txt
@@ -8,4 +8,5 @@ SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
 SVar:X:Remembered$Amount
 SVar:AITapDown:Island
 SVar:RemRandomDeck:True
-SVar:Picture:http://www.wizards.com/global/images/magic/general/monsoon.jpg
\ No newline at end of file
+SVar:Picture:http://www.wizards.com/global/images/magic/general/monsoon.jpg
+Oracle:At the beginning of each player's end step, tap all untapped Islands that player controls and Monsoon deals X damage to the player, where X is the number of Islands tapped this way.
diff --git a/res/cardsfolder/o/omen_machine.txt b/res/cardsfolder/o/omen_machine.txt
index 39b944acf4b..633ba6ea6e7 100644
--- a/res/cardsfolder/o/omen_machine.txt
+++ b/res/cardsfolder/o/omen_machine.txt
@@ -2,15 +2,11 @@ Name:Omen Machine
 ManaCost:6
 Types:Artifact
 S:Mode$ Continuous | Affected$ Player | AddKeyword$ You can't draw cards. | Description$ Players can't draw cards.
-T:Mode$ Phase | Phase$ Draw | ValidPlayer$ You | Execute$ TrigOmenExileCardYou | TriggerZones$ Battlefield | TriggerDescription$ At the beginning of each player's draw step, that player exiles the top card of his or her library. If it's a land card, the player puts it onto the battlefield. Otherwise, the player casts it without paying its mana cost if able.
-SVar:TrigOmenExileCardYou:AB$ Mill | Cost$ 0 | NumCards$ 1 | Defined$ You | Destination$ Exile | RememberMilled$ True | SubAbility$ DBOmenLandYou
-SVar:DBOmenLandYou:DB$ ChangeZone | Origin$ Exile | Destination$ Battlefield | ChangeType$ Remembered.Land+YouCtrl | ChangeNum$ 1 | DefinedPlayer$ You | Hidden$ True | Mandatory$ True | SubAbility$ DBOmenPlayYou
-SVar:DBOmenPlayYou:DB$ Play | ValidZone$ Exile | Controller$ TriggeredPlayer | Valid$ Card.IsRemembered | WithoutManaCost$ True | SubAbility$ DBOmenCleanup
+T:Mode$ Phase | Phase$ Draw | ValidPlayer$ Player | Execute$ TrigOmenExileCard | TriggerZones$ Battlefield | TriggerDescription$ At the beginning of each player's draw step, that player exiles the top card of his or her library. If it's a land card, the player puts it onto the battlefield. Otherwise, the player casts it without paying its mana cost if able.
+SVar:TrigOmenExileCard:AB$ Mill | Cost$ 0 | NumCards$ 1 | Defined$ TriggeredPlayer | Destination$ Exile | RememberMilled$ True | SubAbility$ DBOmenLand
+SVar:DBOmenLand:DB$ ChangeZone | Origin$ Exile | Destination$ Battlefield | ChangeType$ Land.IsRemembered+ActivePlayerCtrl | ChangeNum$ 1 | DefinedPlayer$ TriggeredPlayer | Chooser$ TriggeredPlayer | Hidden$ True | Mandatory$ True | SubAbility$ DBOmenPlay
+SVar:DBOmenPlay:DB$ Play | ValidZone$ Exile | Controller$ TriggeredPlayer | Valid$ Card.IsRemembered | WithoutManaCost$ True | SubAbility$ DBOmenCleanup
 SVar:DBOmenCleanup:DB$ Cleanup | ClearRemembered$ True
-T:Mode$ Phase | Phase$ Draw | ValidPlayer$ Opponent | Execute$ TrigOmenExileCardOpp | TriggerZones$ Battlefield | Secondary$ True | TriggerDescription$ At the beginning of each player's draw step, that player exiles the top card of his or her library. If it's a land card, the player puts it onto the battlefield. Otherwise, the player casts it without paying its mana cost if able.
-SVar:TrigOmenExileCardOpp:AB$ Mill | Cost$ 0 | NumCards$ 1 | Destination$ Exile | Defined$ Opponent | RememberMilled$ True | SubAbility$ DBOmenLandOpp
-SVar:DBOmenLandOpp:DB$ ChangeZone | Origin$ Exile | Destination$ Battlefield | ChangeType$ Remembered.Land+YouDontCtrl | DefinedPlayer$ Opponent | ChangeNum$ 1 | Hidden$ True | Mandatory$ True | SubAbility$ DBOmenPlayOpp
-SVar:DBOmenPlayOpp:DB$ Play | ValidZone$ Exile | Controller$ TriggeredPlayer | Valid$ Card.IsRemembered | WithoutManaCost$ True | SubAbility$ DBOmenCleanup
 SVar:RemRandomDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/omen_machine.jpg
 Oracle:Players can't draw cards.\nAt the beginning of each player's draw step, that player exiles the top card of his or her library. If it's a land card, the player puts it onto the battlefield. Otherwise, the player casts it without paying its mana cost if able.
\ No newline at end of file
diff --git a/res/cardsfolder/p/pox.txt b/res/cardsfolder/p/pox.txt
index 81c7e071eea..7033b7a052c 100644
--- a/res/cardsfolder/p/pox.txt
+++ b/res/cardsfolder/p/pox.txt
@@ -1,22 +1,15 @@
 Name:Pox
 ManaCost:B B B
 Types:Sorcery
-A:SP$ LoseLife | Cost$ B B B | LifeAmount$ A | References$ A | Defined$ You | SubAbility$ DBOppLife | SpellDescription$ Each player loses a third of his or her life, then discards a third of the cards in his or her hand, then sacrifices a third of the creatures he or she controls, then sacrifices a third of the lands he or she controls. Round up each time.
-SVar:DBOppLife:DB$ LoseLife | LifeAmount$ B | References$ B | Defined$ Opponent | SubAbility$ DBDiscardYou
-SVar:DBDiscardYou:DB$ Discard | NumCards$ C | References$ C | Defined$ You | Mode$ TgtChoose | SubAbility$ DBDiscardOpp
-SVar:DBDiscardOpp:DB$ Discard | NumCards$ D | References$ D | Defined$ Opponent | Mode$ TgtChoose | SubAbility$ DBCreatureYou
-SVar:DBCreatureYou:DB$ Sacrifice | SacValid$ Creature | Amount$ E | References$ E | Defined$ You | SubAbility$ DBCreatureOpp
-SVar:DBCreatureOpp:DB$ Sacrifice | SacValid$ Creature | Amount$ F | References$ F | Defined$ Opponent | SubAbility$ DBLandYou
-SVar:DBLandYou:DB$ Sacrifice | SacValid$ Land | Amount$ G | References$ G | Defined$ You | SubAbility$ DBLandOpp
-SVar:DBLandOpp:DB$ Sacrifice | SacValid$ Land | Amount$ H | References$ H | Defined$ Opponent
-SVar:A:Count$YourLifeTotal/ThirdUp
-SVar:B:Count$OppLifeTotal/ThirdUp
-SVar:C:Count$InYourHand/ThirdUp
-SVar:D:Count$InOppHand/ThirdUp
-SVar:E:Count$Valid Creature.YouCtrl/ThirdUp
-SVar:F:Count$Valid Creature.YouDontCtrl/ThirdUp
-SVar:G:Count$Valid Land.YouCtrl/ThirdUp
-SVar:H:Count$Valid Land.YouDontCtrl/ThirdUp
+A:SP$ RepeatEach | Cost$ B B B | RepeatPlayers$ Player | RepeatSubAbility$ DBLoseLife | SpellDescription$ Each player loses a third of his or her life, then discards a third of the cards in his or her hand, then sacrifices a third of the creatures he or she controls, then sacrifices a third of the lands he or she controls. Round up each time.
+SVar:DBLoseLife:DB$ LoseLife | LifeAmount$ A | References$ A | Defined$ Player.IsRemembered | SubAbility$ DBDiscard
+SVar:DBDiscard:DB$ Discard | NumCards$ C | References$ C | Defined$ Player.IsRemembered | Mode$ TgtChoose | SubAbility$ DBCreature
+SVar:DBCreature:DB$ Sacrifice | SacValid$ Creature | Amount$ E | References$ E | Defined$ Player.IsRemembered | SubAbility$ DBLand
+SVar:DBLand:DB$ Sacrifice | SacValid$ Land | Amount$ G | References$ G | Defined$ Player.IsRemembered
+SVar:A:PlayerCountRemembered$LifeTotal/ThirdUp
+SVar:C:PlayerCountRemembered$CardsInHand/ThirdUp
+SVar:E:PlayerCountRemembered$Valid Creature.RememberedPlayerCtrl/ThirdUp
+SVar:G:PlayerCountRemembered$Valid Land.RememberedPlayerCtrl/ThirdUp
 SVar:RemAIDeck:True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/pox.jpg
 Oracle:Each player loses a third of his or her life, then discards a third of the cards in his or her hand, then sacrifices a third of the creatures he or she controls, then sacrifices a third of the lands he or she controls. Round up each time.
\ No newline at end of file