diff --git a/projects/mtg/bin/Res/sets/PLC/_cards.dat b/projects/mtg/bin/Res/sets/PLC/_cards.dat
index 721537b9d..4e1f8dbba 100644
--- a/projects/mtg/bin/Res/sets/PLC/_cards.dat
+++ b/projects/mtg/bin/Res/sets/PLC/_cards.dat
@@ -144,6 +144,17 @@ power=1
 toughness=1
 [/card]
 [card]
+id=124047
+name=Evolution Charm
+mana={1}{G}
+type=Instant
+text=Choose one - Search your library for a basic land card, reveal it, put it into your hand, then shuffle your library; or return target creature card from your graveyard to your hand; or target creature gains flying until end of turn.
+auto=may moveTo(myhand) target(land[basic]|mylibrary)
+auto=may moveTo(myhand) target(land[basic]|mygraveyard)
+auto=may flying target(creature)
+rarity=C
+[/card]
+[card]
 text=Creatures you control get +1/+1.
 auto=lord(creature|myBattlefield) 1/1
 id=122367
@@ -264,6 +275,17 @@ toughness=2
 rarity=R
 [/card]
 [card]
+id=124034
+name=Midnight Charm
+mana={B}
+type=Instant
+text=Choose one - Midnight Charm deals 1 damage to target creature and you gain 1 life; or target creature gains first strike until end of turn; or tap target creature.
+auto=may damage:1 target(creature) && life:1 controller
+auto=may first strike target(creature)
+auto=may tap target(creature)
+rarity=C
+[/card]
+[card]
 text=All Slivers have "{3}, Sacrifice this permanent: Destroy target permanent."
 id=126023
 name=Necrotic Sliver
diff --git a/projects/mtg/bin/Res/sets/PLC/todo.dat b/projects/mtg/bin/Res/sets/PLC/todo.dat
index 8b3055296..2ad5b846e 100644
--- a/projects/mtg/bin/Res/sets/PLC/todo.dat
+++ b/projects/mtg/bin/Res/sets/PLC/todo.dat
@@ -207,7 +207,7 @@ id=124080
 name=Dawn Charm
 mana={1}{W}
 type=Instant
-text=Choose one  EPrevent all combat damage that would be dealt this turn; or regenerate target creature; or counter target spell that targets you.
+text=Choose one - Prevent all combat damage that would be dealt this turn; or regenerate target creature; or counter target spell that targets you.
 rarity=C
 [/card]
 [card]
@@ -317,14 +317,7 @@ text=Choose target creature. Reveal cards from the top of your library until you
 rarity=C
 [/card]
 
-[card]
-id=124047
-name=Evolution Charm
-mana={1}{G}
-type=Instant
-text=Choose one  ESearch your library for a basic land card, reveal it, put it into your hand, then shuffle your library; or return target creature card from your graveyard to your hand; or target creature gains flying until end of turn.
-rarity=C
-[/card]
+
 [card]
 id=126804
 name=Extirpate
@@ -398,7 +391,7 @@ id=124039
 name=Fury Charm
 mana={1}{R}
 type=Instant
-text=Choose one  EDestroy target artifact; or target creature gets +1/+1 and gains trample until end of turn; or remove two time counters from target permanent or suspended card.
+text=Choose one - Destroy target artifact; or target creature gets +1/+1 and gains trample until end of turn; or remove two time counters from target permanent or suspended card.
 rarity=C
 [/card]
 
@@ -451,7 +444,7 @@ id=122371
 name=Healing Leaves
 mana={G}
 type=Instant
-text=Choose one  ETarget player gains 3 life; or prevent the next 3 damage that would be dealt to target creature or player this turn.
+text=Choose one - Target player gains 3 life; or prevent the next 3 damage that would be dealt to target creature or player this turn.
 rarity=C
 [/card]
 
@@ -635,14 +628,7 @@ text={T}: Switch target creature's power and toughness until end of turn.
 rarity=C
 [/card]
 
-[card]
-id=124034
-name=Midnight Charm
-mana={B}
-type=Instant
-text=Choose one  EMidnight Charm deals 1 damage to target creature and you gain 1 life; or target creature gains first strike until end of turn; or tap target creature.
-rarity=C
-[/card]
+
 
 [card]
 id=122406
@@ -755,7 +741,7 @@ id=124066
 name=Piracy Charm
 mana={U}
 type=Instant
-text=Choose one  ETarget creature gains islandwalk until end of turn; or target creature gets +2/-1 until end of turn; or target player discards a card.
+text=Choose one - Target creature gains islandwalk until end of turn; or target creature gets +2/-1 until end of turn; or target player discards a card.
 rarity=C
 [/card]
 [card]
@@ -1107,7 +1093,7 @@ id=129012
 name=Timecrafting
 mana={X}{R}
 type=Instant
-text=Choose one  ERemove X time counters from target permanent or suspended card; or put X time counters on target permanent with a time counter on it or suspended card.
+text=Choose one - Remove X time counters from target permanent or suspended card; or put X time counters on target permanent with a time counter on it or suspended card.
 rarity=U
 [/card]
 [card]
diff --git a/projects/mtg/bin/Res/sets/PLS/todo.dat b/projects/mtg/bin/Res/sets/PLS/todo.dat
index bb9c9975a..c51c4af0a 100644
--- a/projects/mtg/bin/Res/sets/PLS/todo.dat
+++ b/projects/mtg/bin/Res/sets/PLS/todo.dat
@@ -287,7 +287,7 @@ id=25872
 name=Hull Breach
 mana={R}{G}
 type=Sorcery
-text=Choose one  EDestroy target artifact; or destroy target enchantment; or destroy target artifact and target enchantment.
+text=Choose one - Destroy target artifact; or destroy target enchantment; or destroy target artifact and target enchantment.
 rarity=C
 [/card]
 [card]
@@ -906,7 +906,7 @@ id=25866
 name=Treva's Charm
 mana={G}{W}{U}
 type=Instant
-text=Choose one  EDestroy target enchantment; or exile target attacking creature; or draw a card, then discard a card.
+text=Choose one - Destroy target enchantment; or exile target attacking creature; or draw a card, then discard a card.
 rarity=U
 [/card]
 [card]
diff --git a/projects/mtg/bin/Res/sets/SOK/_cards.dat b/projects/mtg/bin/Res/sets/SOK/_cards.dat
index 0b7615a20..0f127984b 100644
--- a/projects/mtg/bin/Res/sets/SOK/_cards.dat
+++ b/projects/mtg/bin/Res/sets/SOK/_cards.dat
@@ -12,6 +12,16 @@ toughness=*
 rarity=R
 [/card]
 [card]
+text=Choose one � Tap all Spirits; or tap all non-Spirit creatures.
+name=Aether Shockwave
+id=74208
+mana={3}{W}
+type=Instant
+auto=may tap all(spirit)
+auto=may tap all(creature[-spirit])
+rarity=U
+[/card]
+[card]
 text={T}: Target creature gains haste until end of turn.
 name=Akki Drillmaster
 id=74393
diff --git a/projects/mtg/bin/Res/sets/SOK/todo.dat b/projects/mtg/bin/Res/sets/SOK/todo.dat
index 94c310f23..73eff9a83 100644
--- a/projects/mtg/bin/Res/sets/SOK/todo.dat
+++ b/projects/mtg/bin/Res/sets/SOK/todo.dat
@@ -1,12 +1,4 @@
 [card]
-text=Choose one � Tap all Spirits; or tap all non-Spirit creatures.
-name=Aether Shockwave
-id=74208
-mana={3}{W}
-type=Instant
-rarity=U
-[/card]
-[card]
 text=Haste At the beginning of your upkeep, if you have more cards in hand than each opponent, you may sacrifice a Swamp. If you do, return Akuta, Born of Ash from your graveyard to the battlefield.
 name=Akuta, Born of Ash
 id=74148
diff --git a/projects/mtg/bin/Res/sets/TSP/_cards.dat b/projects/mtg/bin/Res/sets/TSP/_cards.dat
index 58bed6ce8..db57dc1f6 100644
--- a/projects/mtg/bin/Res/sets/TSP/_cards.dat
+++ b/projects/mtg/bin/Res/sets/TSP/_cards.dat
@@ -251,6 +251,16 @@ auto={T}:Add {G}
 rarity=L
 [/card]
 [card]
+id=116732
+name=Fortify
+mana={2}{W}
+type=Instant
+text=Choose one - Creatures you control get +2/+0 until end of turn; or creatures you control get +0/+2 until end of turn.
+auto=may lord(creature|myinplay) 2/0
+auto=may lord(creature|myinplay) 0/2
+rarity=C
+[/card]
+[card]
 text=All Sliver creatures have double strike.
 id=109722
 name=Fury Sliver
diff --git a/projects/mtg/bin/Res/sets/TSP/todo.dat b/projects/mtg/bin/Res/sets/TSP/todo.dat
index c9138556d..89538c8ed 100644
--- a/projects/mtg/bin/Res/sets/TSP/todo.dat
+++ b/projects/mtg/bin/Res/sets/TSP/todo.dat
@@ -673,14 +673,7 @@ type=Artifact
 text={T}: Add {R} to your mana pool. {4}{R}: Foriysian Totem becomes a 4/4 red Giant artifact creature with trample until end of turn. As long as Foriysian Totem is a creature, it can block an additional creature.
 rarity=U
 [/card]
-[card]
-id=116732
-name=Fortify
-mana={2}{W}
-type=Instant
-text=Choose one: Creatures you control get +2/+0 until end of turn; or creatures you control get +0/+2 until end of turn.
-rarity=C
-[/card]
+
 [card]
 id=126289
 name=Fortune Thief
diff --git a/projects/mtg/bin/Res/sets/ULG/_cards.dat b/projects/mtg/bin/Res/sets/ULG/_cards.dat
index c4b5289b8..b5d2edcd9 100644
--- a/projects/mtg/bin/Res/sets/ULG/_cards.dat
+++ b/projects/mtg/bin/Res/sets/ULG/_cards.dat
@@ -325,6 +325,16 @@ mana={4}{U}{U}
 type=Instant
 [/card]
 [card]
+id=12415
+name=Parch
+mana={1}{R}
+type=Instant
+text=Choose one - Parch deals 2 damage to target creature or player; or Parch deals 4 damage to target blue creature.
+auto=may damage:2 target(creature,player)
+auto=may damage:4 target(creature[blue])
+rarity=C
+[/card]
+[card]
 text={1}, Sacrifice a creature: Put a +1/+1 counter on Phyrexian Broodlings.
 id=12392
 name=Phyrexian Broodlings
diff --git a/projects/mtg/bin/Res/sets/ULG/todo.dat b/projects/mtg/bin/Res/sets/ULG/todo.dat
index 715c4cdc2..86da5b566 100644
--- a/projects/mtg/bin/Res/sets/ULG/todo.dat
+++ b/projects/mtg/bin/Res/sets/ULG/todo.dat
@@ -423,14 +423,7 @@ toughness=5
 text=Flying When Palinchron enters the battlefield, untap up to seven lands. {2}{U}{U}: Return Palinchron to its owner's hand.
 rarity=R
 [/card]
-[card]
-id=12415
-name=Parch
-mana={1}{R}
-type=Instant
-text=Choose one  EParch deals 2 damage to target creature or player; or Parch deals 4 damage to target blue creature.
-rarity=C
-[/card]
+
 [card]
 id=9709
 name=Peace and Quiet
diff --git a/projects/mtg/bin/Res/sets/VIS/_cards.dat b/projects/mtg/bin/Res/sets/VIS/_cards.dat
index 4f4cbe2ba..b9a37c019 100644
--- a/projects/mtg/bin/Res/sets/VIS/_cards.dat
+++ b/projects/mtg/bin/Res/sets/VIS/_cards.dat
@@ -107,6 +107,17 @@ mana={2}{G}{G}
 type=Sorcery
 [/card]
 [card]
+id=3663
+name=Emerald Charm
+mana={G}
+type=Instant
+text=Choose one - Untap target permanent; or destroy target non-Aura enchantment; or target creature loses flying until end of turn.
+auto=may untap target(*)
+auto=may destroy target(enchantment[-aura])
+auto=may -flying target(creature)
+rarity=C
+[/card]
+[card]
 text=Whenever an enchantment is put into a graveyard from the battlefield, draw a card.
 auto=@movedTo(enchantment|graveyard) from(battlefield):draw:1 controller
 id=3736
@@ -163,6 +174,17 @@ auto={T}:Add {1}
 auto={T}:1/1 target(griffin) && untap
 [/card]
 [card]
+id=3715
+name=Hope Charm
+mana={W}
+type=Instant
+text=Choose one - Target creature gains first strike until end of turn; or target player gains 2 life; or destroy target Aura.
+auto=may first strike target(creature)
+auto=may life:2 target(player)
+auto=may destroy target(aura)
+rarity=C
+[/card]
+[card]
 text=Hulking Cyclops can't block.
 id=3691
 name=Hulking Cyclops
diff --git a/projects/mtg/bin/Res/sets/VIS/todo.dat b/projects/mtg/bin/Res/sets/VIS/todo.dat
index 032d69fcb..c39860011 100644
--- a/projects/mtg/bin/Res/sets/VIS/todo.dat
+++ b/projects/mtg/bin/Res/sets/VIS/todo.dat
@@ -225,14 +225,7 @@ type=World Enchantment
 text=At the beginning of each player's upkeep, that player exiles a card at random from his or her hand. The player may play that card this turn. At the beginning of the next end step, if the player hasn't played the card, he or she puts it into his or her graveyard.
 rarity=R
 [/card]
-[card]
-id=3663
-name=Emerald Charm
-mana={G}
-type=Instant
-text=Choose one ?EUntap target permanent; or destroy target non-Aura enchantment; or target creature loses flying until end of turn.
-rarity=C
-[/card]
+
 [card]
 id=3710
 name=Equipoise
@@ -316,7 +309,7 @@ id=3618
 name=Funeral Charm
 mana={B}
 type=Instant
-text=Choose one ?ETarget player discards a card; or target creature gets +2/-1 until end of turn; or target creature gains swampwalk until end of turn.
+text=Choose one - Target player discards a card; or target creature gets +2/-1 until end of turn; or target creature gains swampwalk until end of turn.
 rarity=C
 [/card]
 [card]
@@ -365,7 +358,7 @@ id=3689
 name=Hearth Charm
 mana={R}
 type=Instant
-text=Choose one ?EDestroy target artifact creature; or attacking creatures get +1/+0 until end of turn; or target creature with power 2 or less is unblockable this turn.
+text=Choose one - Destroy target artifact creature; or attacking creatures get +1/+0 until end of turn; or target creature with power 2 or less is unblockable this turn.
 rarity=C
 [/card]
 [card]
@@ -392,14 +385,7 @@ type=Instant
 text=The next time a source of your choice would deal damage to target creature or player this turn, prevent that damage. If damage from a red source is prevented this way, Honorable Passage deals that much damage to the source's controller.
 rarity=U
 [/card]
-[card]
-id=3715
-name=Hope Charm
-mana={W}
-type=Instant
-text=Choose one ?ETarget creature gains first strike until end of turn; or target player gains 2 life; or destroy target Aura.
-rarity=C
-[/card]
+
 [card]
 id=3641
 name=Impulse
@@ -1092,7 +1078,7 @@ id=3656
 name=Vision Charm
 mana={U}
 type=Instant
-text=Choose one ?ETarget player puts the top four cards of his or her library into his or her graveyard; or choose a land type and a basic land type, and each land of the first chosen type becomes the second chosen type until end of turn; or target artifact phases out. (While it's phased out, it's treated as though it doesn't exist. It phases in before its controller untaps during his or her next untap step. )
+text=Choose one - Target player puts the top four cards of his or her library into his or her graveyard; or choose a land type and a basic land type, and each land of the first chosen type becomes the second chosen type until end of turn; or target artifact phases out. (While it's phased out, it's treated as though it doesn't exist. It phases in before its controller untaps during his or her next untap step. )
 rarity=C
 [/card]
 [card]
diff --git a/projects/mtg/bin/Res/sets/WTH/_cards.dat b/projects/mtg/bin/Res/sets/WTH/_cards.dat
index 983f8a519..07126c08f 100644
--- a/projects/mtg/bin/Res/sets/WTH/_cards.dat
+++ b/projects/mtg/bin/Res/sets/WTH/_cards.dat
@@ -419,6 +419,16 @@ power=2
 toughness=2
 [/card]
 [card]
+id=4561
+name=Thunderbolt
+mana={1}{R}
+type=Instant
+text=Choose one - Thunderbolt deals 3 damage to target player; or Thunderbolt deals 4 damage to target creature with flying.
+auto=may damage:3 target(player)
+auto=may damage:4 target(creature[-flying])
+rarity=C
+[/card]
+[card]
 text=Haste (This creature can attack the turn it comes under your control.)  When Thundermare comes into play, tap all other creatures.
 auto=tap all(other creature)
 id=4562
diff --git a/projects/mtg/bin/Res/sets/WTH/todo.dat b/projects/mtg/bin/Res/sets/WTH/todo.dat
index c2a5ace39..f1c8b3dda 100644
--- a/projects/mtg/bin/Res/sets/WTH/todo.dat
+++ b/projects/mtg/bin/Res/sets/WTH/todo.dat
@@ -1035,14 +1035,7 @@ type=Artifact
 text={5}, {T}: Reveal the top three cards of your library. Target opponent chooses one of those cards. Put that card into your graveyard, then draw two cards.
 rarity=R
 [/card]
-[card]
-id=4561
-name=Thunderbolt
-mana={1}{R}
-type=Instant
-text=Choose one  EThunderbolt deals 3 damage to target player; or Thunderbolt deals 4 damage to target creature with flying.
-rarity=C
-[/card]
+
 [card]
 id=4501
 name=Tolarian Drake