diff --git a/res/cardsfolder/altar_of_dementia.txt b/res/cardsfolder/altar_of_dementia.txt
index 7e3f0d98539..12e6728c608 100644
--- a/res/cardsfolder/altar_of_dementia.txt
+++ b/res/cardsfolder/altar_of_dementia.txt
@@ -2,7 +2,7 @@ Name:Altar of Dementia
 ManaCost:2
 Types:Artifact
 Text:no text
-A:AB$Mill | Cost$ Sac<1/Creature> | NumCards$ X | ValidTgts$ Player | TgtPrompt$ Choose a player to mill | SpellDescription$ Target player puts a number of cards equal to the sacrificed creature's power from the top of his or her library into his or her graveyard.
+A:AB$ Mill | Cost$ Sac<1/Creature> | NumCards$ X | ValidTgts$ Player | TgtPrompt$ Choose a player | SpellDescription$ Target player puts a number of cards equal to the sacrificed creature's power from the top of his or her library into his or her graveyard.
 SVar:X:Sacrificed$CardPower
 SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/altar_of_dementia.jpg
diff --git a/res/cardsfolder/ambassador_laquatus.txt b/res/cardsfolder/ambassador_laquatus.txt
index bcbcd14a257..55953c04337 100644
--- a/res/cardsfolder/ambassador_laquatus.txt
+++ b/res/cardsfolder/ambassador_laquatus.txt
@@ -3,7 +3,7 @@ ManaCost:1 U U
 Types:Legendary Creature Merfolk Wizard
 Text:no text
 PT:1/3
-A:AB$Mill | Cost$ 3 | NumCards$ 3 | ValidTgts$ Player | TgtPrompt$ Choose a player to mill | SpellDescription$ Target player puts the top three cards of his or her library into his or her graveyard.
+A:AB$ Mill | Cost$ 3 | NumCards$ 3 | ValidTgts$ Player | TgtPrompt$ Choose a player | SpellDescription$ Target player puts the top three cards of his or her library into his or her graveyard.
 SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/ambassador_laquatus.jpg
 SetInfo:TOR|Rare|http://magiccards.info/scans/en/tr/23.jpg
diff --git a/res/cardsfolder/brain_freeze.txt b/res/cardsfolder/brain_freeze.txt
index 00678134ad7..068ce6eb898 100644
--- a/res/cardsfolder/brain_freeze.txt
+++ b/res/cardsfolder/brain_freeze.txt
@@ -2,7 +2,7 @@ Name:Brain Freeze
 ManaCost:1 U
 Types:Instant
 Text:no text
-A:SP$Mill | Cost$ 1 U | NumCards$ 3 | ValidTgts$ Player | TgtPrompt$ Choose a player to mill | SpellDescription$ Target player puts the top three cards of his or her library into his or her graveyard.
+A:SP$ Mill | Cost$ 1 U | NumCards$ 3 | ValidTgts$ Player | TgtPrompt$ Choose a player | SpellDescription$ Target player puts the top three cards of his or her library into his or her graveyard.
 K:Storm
 SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/brain_freeze.jpg
diff --git a/res/cardsfolder/cathartic_adept.txt b/res/cardsfolder/cathartic_adept.txt
index fbd6971b311..e3765e8bf2d 100644
--- a/res/cardsfolder/cathartic_adept.txt
+++ b/res/cardsfolder/cathartic_adept.txt
@@ -3,7 +3,7 @@ ManaCost:U
 Types:Creature Human Wizard
 Text:no text
 PT:1/1
-A:AB$Mill | Cost$ T | NumCards$ 1 | ValidTgts$ Player | TgtPrompt$ Choose a player to mill | SpellDescription$ Target player puts the top card of his or her library into his or her graveyard.
+A:AB$ Mill | Cost$ T | NumCards$ 1 | ValidTgts$ Player | TgtPrompt$ Choose a player | SpellDescription$ Target player puts the top card of his or her library into his or her graveyard.
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/cathartic_adept.jpg
 SetInfo:ALA|Common|http://magiccards.info/scans/en/ala/34.jpg
diff --git a/res/cardsfolder/drowner_of_secrets.txt b/res/cardsfolder/drowner_of_secrets.txt
index 2b8bffaf019..601e2b3a47e 100644
--- a/res/cardsfolder/drowner_of_secrets.txt
+++ b/res/cardsfolder/drowner_of_secrets.txt
@@ -2,7 +2,7 @@ Name:Drowner of Secrets
 ManaCost:2 U
 Types:Creature Merfolk Wizard
 Text:no text
-A:AB$Mill | Cost$ tapXType<1/Merfolk> | NumCards$ 1 | ValidTgts$ Player | TgtPrompt$ Choose a player to mill | SpellDescription$ Target player puts the top card of his or her library into his or her graveyard.
+A:AB$ Mill | Cost$ tapXType<1/Merfolk> | NumCards$ 1 | ValidTgts$ Player | TgtPrompt$ Choose a player | SpellDescription$ Target player puts the top card of his or her library into his or her graveyard.
 PT:1/3
 SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/drowner_of_secrets.jpg
diff --git a/res/cardsfolder/extractor_demon.txt b/res/cardsfolder/extractor_demon.txt
index 74cf3739945..fd630c85535 100644
--- a/res/cardsfolder/extractor_demon.txt
+++ b/res/cardsfolder/extractor_demon.txt
@@ -6,7 +6,7 @@ PT:5/5
 K:Flying
 K:Unearth:2 B
 T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Any | ValidCard$ Creature.Other | TriggerZones$ Battlefield | Optional$ True | Execute$ TrigMill | TriggerDescription$ Whenever another creature leaves the battlefield, you may have target player put the top two cards of his or her library into his or her graveyard.
-SVar:TrigMill:AB$Mill | Cost$ 0 | NumCards$ 2 | ValidTgts$ Player | TgtPrompt$ Choose a player to mill
+SVar:TrigMill:AB$Mill | Cost$ 0 | NumCards$ 2 | ValidTgts$ Player | TgtPrompt$ Choose a player
 SVar:Picture:http://www.wizards.com/global/images/magic/general/extractor_demon.jpg
 SVar:Rarity:Rare
 SetInfo:CFX|Rare|http://magiccards.info/scans/en/cfx/44.jpg
diff --git a/res/cardsfolder/glimpse_the_unthinkable.txt b/res/cardsfolder/glimpse_the_unthinkable.txt
index de11e2c52fb..44c68b831c8 100644
--- a/res/cardsfolder/glimpse_the_unthinkable.txt
+++ b/res/cardsfolder/glimpse_the_unthinkable.txt
@@ -2,7 +2,7 @@ Name:Glimpse the Unthinkable
 ManaCost:U B
 Types:Sorcery
 Text:no text
-A:SP$Mill | Cost$ U B | NumCards$ 10 | ValidTgts$ Player | TgtPrompt$ Choose a player to mill | SpellDescription$ Target player puts the top ten cards of his or her library into his or her graveyard.
+A:SP$ Mill | Cost$ U B | NumCards$ 10 | ValidTgts$ Player | TgtPrompt$ Choose a player | SpellDescription$ Target player puts the top ten cards of his or her library into his or her graveyard.
 SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/glimpse_the_unthinkable.jpg
 SetInfo:RAV|Rare|http://magiccards.info/scans/en/rav/208.jpg
diff --git a/res/cardsfolder/grindclock.txt b/res/cardsfolder/grindclock.txt
index 0a7b3eb5d9b..484302e598b 100644
--- a/res/cardsfolder/grindclock.txt
+++ b/res/cardsfolder/grindclock.txt
@@ -2,8 +2,8 @@ Name:Grindclock
 ManaCost:2
 Types:Artifact
 Text:no text
-A:AB$PutCounter | Cost$ T | CounterType$ CHARGE | CounterNum$ 1 | SpellDescription$ Put a charge counter on Grindclock.
-A:AB$Mill | Cost$ T | NumCards$ X | ValidTgts$ Player | TgtPrompt$ Choose a player to mill | SpellDescription$ Target player puts the top X cards of his or her library into his or her graveyard, where X is the number of charge counters on Grindclock.
+A:AB$ PutCounter | Cost$ T | CounterType$ CHARGE | CounterNum$ 1 | SpellDescription$ Put a charge counter on Grindclock.
+A:AB$ Mill | Cost$ T | NumCards$ X | ValidTgts$ Player | TgtPrompt$ Choose a player | SpellDescription$ Target player puts the top X cards of his or her library into his or her graveyard, where X is the number of charge counters on Grindclock.
 SVar:X:Count$CardCounters.CHARGE
 SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/grindclock.jpg
diff --git a/res/cardsfolder/hair_strung_koto.txt b/res/cardsfolder/hair_strung_koto.txt
index cb025cceaca..1f327b9b9df 100644
--- a/res/cardsfolder/hair_strung_koto.txt
+++ b/res/cardsfolder/hair_strung_koto.txt
@@ -2,7 +2,7 @@ Name:Hair-Strung Koto
 ManaCost:6
 Types:Artifact
 Text:no text
-A:AB$Mill | Cost$ tapXType<1/Creature> | NumCards$ 1 | ValidTgts$ Player | TgtPrompt$ Choose a player to mill | SpellDescription$ Target player puts the top card of his or her library into his or her graveyard.
+A:AB$ Mill | Cost$ tapXType<1/Creature> | NumCards$ 1 | ValidTgts$ Player | TgtPrompt$ Choose a player | SpellDescription$ Target player puts the top card of his or her library into his or her graveyard.
 SVar:RemAIDeck:True
 SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/hair_strung_koto.jpg
diff --git a/res/cardsfolder/hedron_crab.txt b/res/cardsfolder/hedron_crab.txt
index c4eb031341e..64853f4bfb2 100644
--- a/res/cardsfolder/hedron_crab.txt
+++ b/res/cardsfolder/hedron_crab.txt
@@ -4,7 +4,7 @@ Types:Creature Crab
 Text:no text
 PT:0/2
 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Land.YouCtrl | TriggerZones$ Battlefield | Execute$ TrigMill | TriggerDescription$ Landfall - Whenever a land enters the battlefield under your control, target player puts the top three cards of his or her library into his or her graveyard.
-SVar:TrigMill:AB$Mill | Cost$ 0 | NumCards$ 3 | ValidTgts$ Player | TgtPrompt$ Choose a player to mill
+SVar:TrigMill:AB$Mill | Cost$ 0 | NumCards$ 3 | ValidTgts$ Player | TgtPrompt$ Choose a player
 SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/hedron_crab.jpg
 SetInfo:ZEN|Uncommon|http://magiccards.info/scans/en/zen/47.jpg
diff --git a/res/cardsfolder/horrifying_revelation.txt b/res/cardsfolder/horrifying_revelation.txt
index 686c732bef8..1629e50696b 100644
--- a/res/cardsfolder/horrifying_revelation.txt
+++ b/res/cardsfolder/horrifying_revelation.txt
@@ -2,7 +2,7 @@ Name:Horrifying Revelation
 ManaCost:B
 Types:Sorcery
 Text:no text
-A:SP$ Discard | Cost$ B | ValidTgts$ Player | TgtPrompt$ Choose a player to discard a card | NumCards$ 1 | Mode$ TgtChoose | SubAbility$ SVar=DBMill | SpellDescription$ Target player discards a card, then puts the top card of his or her library into his or her graveyard.
+A:SP$ Discard | Cost$ B | ValidTgts$ Player | TgtPrompt$ Choose a player | NumCards$ 1 | Mode$ TgtChoose | SubAbility$ SVar=DBMill | SpellDescription$ Target player discards a card, then puts the top card of his or her library into his or her graveyard.
 SVar:DBMill:DB$Mill | NumCards$ 1 | Defined$ Targeted
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/horrifying_revelation.jpg
diff --git a/res/cardsfolder/jaces_erasure.txt b/res/cardsfolder/jaces_erasure.txt
index b265996f1e1..a730396b103 100644
--- a/res/cardsfolder/jaces_erasure.txt
+++ b/res/cardsfolder/jaces_erasure.txt
@@ -3,7 +3,7 @@ ManaCost:1 U
 Types:Enchantment
 Text:no text
 T:Mode$ Drawn | ValidCard$ Card.YouCtrl | TriggerZones$ Battlefield | Optional$ True | Execute$ TrigMill | TriggerDescription$ Whenever you draw a card, you may have target player put the top card of his or her library into his or her graveyard.
-SVar:TrigMill:AB$Mill | Cost$ 0 | NumCards$ 1 | ValidTgts$ Player | TgtPrompt$ Choose a player to mill
+SVar:TrigMill:AB$Mill | Cost$ 0 | NumCards$ 1 | ValidTgts$ Player | TgtPrompt$ Choose a player
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/jaces_erasure.jpg
 SetInfo:M11|Common|http://magiccards.info/scans/en/m11/59.jpg
diff --git a/res/cardsfolder/millstone.txt b/res/cardsfolder/millstone.txt
index 1aed39f0266..30f22a0869e 100644
--- a/res/cardsfolder/millstone.txt
+++ b/res/cardsfolder/millstone.txt
@@ -2,7 +2,7 @@ Name:Millstone
 ManaCost:2
 Types:Artifact
 Text:no text
-A:AB$Mill | Cost$ 2 T | NumCards$ 2 | ValidTgts$ Player | TgtPrompt$ Choose a player to mill | SpellDescription$ Target player puts the top two cards of his or her library into his or her graveyard.
+A:AB$ Mill | Cost$ 2 T | NumCards$ 2 | ValidTgts$ Player | TgtPrompt$ Choose a player | SpellDescription$ Target player puts the top two cards of his or her library into his or her graveyard.
 SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/millstone.jpg
 SetInfo:8ED|Rare|http://magiccards.info/scans/en/8e/307.jpg
diff --git a/res/cardsfolder/shriekhorn.txt b/res/cardsfolder/shriekhorn.txt
index d0eb0594457..d4308284d64 100644
--- a/res/cardsfolder/shriekhorn.txt
+++ b/res/cardsfolder/shriekhorn.txt
@@ -3,7 +3,7 @@ ManaCost:1
 Types:Artifact
 Text:no text
 K:etbCounter:CHARGE:3
-A:AB$Mill | Cost$ T SubCounter<1/CHARGE> | NumCards$ 2 | ValidTgts$ Player | TgtPrompt$ Choose a player to mill | SpellDescription$ Target player puts the top two cards of his or her library into his or her graveyard.
+A:AB$ Mill | Cost$ T SubCounter<1/CHARGE> | NumCards$ 2 | ValidTgts$ Player | TgtPrompt$ Choose a player | SpellDescription$ Target player puts the top two cards of his or her library into his or her graveyard.
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/shriekhorn.jpg
 SetInfo:MBS|Common|http://magiccards.info/scans/en/mbs/130.jpg
diff --git a/res/cardsfolder/soratami_mindsweeper.txt b/res/cardsfolder/soratami_mindsweeper.txt
index a9247b7c3ea..1de1b26554c 100644
--- a/res/cardsfolder/soratami_mindsweeper.txt
+++ b/res/cardsfolder/soratami_mindsweeper.txt
@@ -4,7 +4,7 @@ Types:Creature Moonfolk Wizard
 Text:no text
 PT:1/4
 K:Flying
-A:AB$Mill | Cost$ 2 Return<1/Land> | NumCards$ 2 | ValidTgts$ Player | TgtPrompt$ Choose a player to mill | SpellDescription$ Target player puts the top two cards of his or her library into his or her graveyard.
+A:AB$ Mill | Cost$ 2 Return<1/Land> | NumCards$ 2 | ValidTgts$ Player | TgtPrompt$ Choose a player | SpellDescription$ Target player puts the top two cards of his or her library into his or her graveyard.
 SVar:RemAIDeck:True
 SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/soratami_mindsweeper.jpg
diff --git a/res/cardsfolder/tome_scour.txt b/res/cardsfolder/tome_scour.txt
index cb765ca6c30..d657566cb97 100644
--- a/res/cardsfolder/tome_scour.txt
+++ b/res/cardsfolder/tome_scour.txt
@@ -2,7 +2,7 @@ Name:Tome Scour
 ManaCost:U
 Types:Sorcery
 Text:no text
-A:SP$Mill | Cost$ U | NumCards$ 5 | ValidTgts$ Player | TgtPrompt$ Choose a player to mill | SpellDescription$ Target player puts the top five cards of his or her library into his or her graveyard.
+A:SP$ Mill | Cost$ U | NumCards$ 5 | ValidTgts$ Player | TgtPrompt$ Choose a player | SpellDescription$ Target player puts the top five cards of his or her library into his or her graveyard.
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/tome_scour.jpg
 SetInfo:M11|Common|http://magiccards.info/scans/en/m11/76.jpg
diff --git a/res/cardsfolder/tower_of_murmurs.txt b/res/cardsfolder/tower_of_murmurs.txt
index d133c85cf26..3aa18c8abae 100644
--- a/res/cardsfolder/tower_of_murmurs.txt
+++ b/res/cardsfolder/tower_of_murmurs.txt
@@ -2,7 +2,7 @@ Name:Tower of Murmurs
 ManaCost:4
 Types:Artifact
 Text:no text
-A:AB$Mill | Cost$ 8 T | NumCards$ 8 | ValidTgts$ Player | TgtPrompt$ Choose a player to mill | SpellDescription$ Target player puts the top eight cards of his or her library into his or her graveyard.
+A:AB$ Mill | Cost$ 8 T | NumCards$ 8 | ValidTgts$ Player | TgtPrompt$ Choose a player | SpellDescription$ Target player puts the top eight cards of his or her library into his or her graveyard.
 SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/tower_of_murmurs.jpg
 SetInfo:MRD|Rare|http://magiccards.info/scans/en/mi/268.jpg
diff --git a/res/cardsfolder/vedalken_entrancer.txt b/res/cardsfolder/vedalken_entrancer.txt
index 72e6af98627..a63588b6f74 100644
--- a/res/cardsfolder/vedalken_entrancer.txt
+++ b/res/cardsfolder/vedalken_entrancer.txt
@@ -2,7 +2,7 @@ Name:Vedalken Entrancer
 ManaCost:3 U
 Types:Creature Vedalken Wizard
 Text:no text
-A:AB$Mill | Cost$ U T | NumCards$ 2 | ValidTgts$ Player | TgtPrompt$ Choose a player to mill | SpellDescription$ Target player puts the top two cards of his or her library into his or her graveyard.
+A:AB$ Mill | Cost$ U T | NumCards$ 2 | ValidTgts$ Player | TgtPrompt$ Choose a player | SpellDescription$ Target player puts the top two cards of his or her library into his or her graveyard.
 PT:1/4
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/vedalken_entrancer.jpg