diff --git a/res/cardsfolder/ballynock_trapper.txt b/res/cardsfolder/ballynock_trapper.txt
index 2f3c7aa7c2c..7b7c4b64c7d 100644
--- a/res/cardsfolder/ballynock_trapper.txt
+++ b/res/cardsfolder/ballynock_trapper.txt
@@ -3,6 +3,7 @@ ManaCost:3 W
 Types:Creature Kithkin Soldier
 Text:no text
 PT:2/2
+K:abTapTgt T:Creature:Tap target creature.
 K:WheneverKeyword:CastSpell/Controller:Color/white:Play:UntapPermanent:Self:ASAP:Yes_No:No Special Condition:Whenever you cast a white spell, you may untap Ballynock Trapper.
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/ballynock_trapper.jpg
diff --git a/res/cardsfolder/benalish_trapper.txt b/res/cardsfolder/benalish_trapper.txt
index 36388eb3f16..a5bc6c4184f 100644
--- a/res/cardsfolder/benalish_trapper.txt
+++ b/res/cardsfolder/benalish_trapper.txt
@@ -3,6 +3,7 @@ ManaCost:1 W
 Types:Creature Human Soldier
 Text:no text
 PT:1/2
+K:abTapTgt W T:Creature:Tap target creature.
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/benalish_trapper.jpg
 End
diff --git a/res/cardsfolder/blinding_mage.txt b/res/cardsfolder/blinding_mage.txt
index 5cb95359567..f2395b6375f 100644
--- a/res/cardsfolder/blinding_mage.txt
+++ b/res/cardsfolder/blinding_mage.txt
@@ -3,6 +3,7 @@ ManaCost:1 W
 Types:Creature Human Wizard
 Text:no text
 PT:1/2
+K:abTapTgt W T:Creature:Tap target creature.
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/blinding_mage.jpg
 End
diff --git a/res/cardsfolder/crowd_favorites.txt b/res/cardsfolder/crowd_favorites.txt
index fade5b9f606..af31bcdc43b 100644
--- a/res/cardsfolder/crowd_favorites.txt
+++ b/res/cardsfolder/crowd_favorites.txt
@@ -3,6 +3,7 @@ ManaCost:6 W
 Types:Creature Human Soldier
 Text:no text
 PT:4/4
+K:adTapTgt 3 W:Creature:Tap target creature.
 K:abPump 3 W:+0/+5
 SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/crowd_favorites.jpg
diff --git a/res/cardsfolder/goldmeadow_harrier.txt b/res/cardsfolder/goldmeadow_harrier.txt
index e47d70ff43d..895a8a94592 100644
--- a/res/cardsfolder/goldmeadow_harrier.txt
+++ b/res/cardsfolder/goldmeadow_harrier.txt
@@ -3,6 +3,7 @@ ManaCost:W
 Types:Creature Kithkin Soldier
 Text:no text
 PT:1/1
+K:abTapTgt W T:Creature:Tap target creature.
 SVar:Rarity:Common
 SVar:Picture:http://www.magickartenmarkt.de/img/cards/Lorwyn/goldmeadow_harrier.jpg
 End
diff --git a/res/cardsfolder/icy_manipulator.txt b/res/cardsfolder/icy_manipulator.txt
index 2d7950f01e7..fab09a0aa5e 100644
--- a/res/cardsfolder/icy_manipulator.txt
+++ b/res/cardsfolder/icy_manipulator.txt
@@ -2,6 +2,7 @@ Name:Icy Manipulator
 ManaCost:4
 Types:Artifact
 Text:no text
+K:abTapTgt 1 T:Artifact,Creature,Land:Tap target artifact, creature, or land.
 SVar:RemAIDeck:True
 SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/icy_manipulator.jpg
diff --git a/res/cardsfolder/kor_line_slinger.txt b/res/cardsfolder/kor_line_slinger.txt
index f66140d40d9..7fefd8bd7b6 100644
--- a/res/cardsfolder/kor_line_slinger.txt
+++ b/res/cardsfolder/kor_line_slinger.txt
@@ -1,8 +1,9 @@
 Name:Kor Line-Slinger
 ManaCost:1 W
 Types:Creature Kor Scout
-Text:tap: Tap target creature with power 3 or less.
+Text:no text
 PT:0/1
+K:abTapTgt T:Creature.powerLE3:Tap target creature with power 3 or less.
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/kor_line_slinger.jpg
 End
diff --git a/res/cardsfolder/loxodon_mystic.txt b/res/cardsfolder/loxodon_mystic.txt
index 50d6e622107..bdd5db2b3cc 100644
--- a/res/cardsfolder/loxodon_mystic.txt
+++ b/res/cardsfolder/loxodon_mystic.txt
@@ -3,6 +3,7 @@ ManaCost:3 W W
 Types:Creature Elephant Cleric
 Text:no text
 PT:3/3
+K:abTapTgt W T:Creature:Tap target creature.
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/loxodon_mystic.jpg
 End
diff --git a/res/cardsfolder/master_decoy.txt b/res/cardsfolder/master_decoy.txt
index a7e01f4e8b0..69ce9663649 100644
--- a/res/cardsfolder/master_decoy.txt
+++ b/res/cardsfolder/master_decoy.txt
@@ -3,6 +3,7 @@ ManaCost:1 W
 Types:Creature Human Soldier
 Text:no text
 PT:1/2
+K:abTapTgt W T:Creature:Tap target creature.
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/master_decoy.jpg
 End
diff --git a/res/cardsfolder/minister_of_impediments.txt b/res/cardsfolder/minister_of_impediments.txt
index 3f5fade86a5..6610427d71e 100644
--- a/res/cardsfolder/minister_of_impediments.txt
+++ b/res/cardsfolder/minister_of_impediments.txt
@@ -3,6 +3,7 @@ ManaCost:2 WU
 Types:Creature Human Advisor
 Text:no text
 PT:1/1
+K:abTapTgt T:Creature:Tap target creature.
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/minister_of_impediments.jpg
 End
diff --git a/res/cardsfolder/naya_battlemage.txt b/res/cardsfolder/naya_battlemage.txt
index ec6446c8e17..8bdb50e97df 100644
--- a/res/cardsfolder/naya_battlemage.txt
+++ b/res/cardsfolder/naya_battlemage.txt
@@ -4,6 +4,7 @@ Types:Creature Human Shaman
 Text:no text
 PT:2/2
 K:abPumpTgtC R T:+2/+0
+K:abTapTgt W T:Creature:Tap target creature.
 SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/naya_battlemage.jpg
 End
diff --git a/res/cardsfolder/ostiary_thrull.txt b/res/cardsfolder/ostiary_thrull.txt
index b204726e43e..c737ed8e3ba 100644
--- a/res/cardsfolder/ostiary_thrull.txt
+++ b/res/cardsfolder/ostiary_thrull.txt
@@ -3,6 +3,7 @@ ManaCost:3 B
 Types:Creature Thrull
 Text:no text
 PT:2/2
+K:abTapTgt W T:Creature:Tap target creature.
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/ostiary_thrull.jpg
 End
diff --git a/res/cardsfolder/rathi_trapper.txt b/res/cardsfolder/rathi_trapper.txt
index 4ce04be8163..c0560f0032f 100644
--- a/res/cardsfolder/rathi_trapper.txt
+++ b/res/cardsfolder/rathi_trapper.txt
@@ -3,6 +3,7 @@ ManaCost:1 B
 Types:Creature Human Rebel Rogue
 Text:no text
 PT:1/2
+K:abTapTgt B T:Creature:Tap target creature.
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/rathi_trapper.jpg
 End
diff --git a/res/cardsfolder/ring_of_gix.txt b/res/cardsfolder/ring_of_gix.txt
index cbc93c46605..4e4658f539f 100644
--- a/res/cardsfolder/ring_of_gix.txt
+++ b/res/cardsfolder/ring_of_gix.txt
@@ -3,6 +3,7 @@ ManaCost:3
 Types:Artifact
 Text:no text
 K:Echo:3
+K:abTapTgt 1 T:Artifact,Creature,Land:Tap target artifact, creature, or land.
 SVar:RemAIDeck:True
 SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/ring_of_gix.jpg
diff --git a/res/cardsfolder/squall_drifter.txt b/res/cardsfolder/squall_drifter.txt
index bba69fc420f..4e6629889b1 100644
--- a/res/cardsfolder/squall_drifter.txt
+++ b/res/cardsfolder/squall_drifter.txt
@@ -4,6 +4,7 @@ Types:Snow Creature Elemental
 Text:no text
 PT:1/1
 K:Flying
+K:abTapTgt W T:Creature:Tap target creature.
 SVar:Rarity:Common
 SVar:Picture:http://resources.wizards.com/magic/cards/csp/en-us/card121273.jpg
 End
diff --git a/res/cardsfolder/staff_of_domination.txt b/res/cardsfolder/staff_of_domination.txt
index eed5d98639d..b69e69b1c66 100644
--- a/res/cardsfolder/staff_of_domination.txt
+++ b/res/cardsfolder/staff_of_domination.txt
@@ -3,6 +3,9 @@ ManaCost:3
 Types:Artifact
 Text:no text
 K:Untap:1
+K:abGainLife 2 T:1
+K:abTapTgt 4 T:Creature:Tap target creature.
+K:abDrawCards 5 T:1:Draw a card.:Staff of Domination - draw a card
 SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/staff_of_domination.jpg
 End
diff --git a/res/cardsfolder/stalking_assassin.txt b/res/cardsfolder/stalking_assassin.txt
index 8f441be8272..93a5716df64 100644
--- a/res/cardsfolder/stalking_assassin.txt
+++ b/res/cardsfolder/stalking_assassin.txt
@@ -3,6 +3,7 @@ ManaCost:1 U B
 Types:Creature Human Assassin
 Text:no text
 PT:1/1
+K:abTapTgt 3 U T:Creature:Tap target creature.
 SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/stalking_assassin.jpg
 End
diff --git a/res/cardsfolder/stormscape_apprentice.txt b/res/cardsfolder/stormscape_apprentice.txt
index 5a068529733..7bd1654c679 100644
--- a/res/cardsfolder/stormscape_apprentice.txt
+++ b/res/cardsfolder/stormscape_apprentice.txt
@@ -4,6 +4,7 @@ Types:Creature Human Wizard
 Text:no text
 PT:1/1
 K:abLoseLifeTgt B T:1
+K:abTapTgt W T:Creature:Tap target creature.
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/stormscape_apprentice.jpg
 End
diff --git a/res/cardsfolder/thornscape_apprentice.txt b/res/cardsfolder/thornscape_apprentice.txt
index 0e73fcc032d..ce0244f9cec 100644
--- a/res/cardsfolder/thornscape_apprentice.txt
+++ b/res/cardsfolder/thornscape_apprentice.txt
@@ -4,6 +4,7 @@ Types:Creature Human Wizard
 Text:no text
 PT:1/1
 K:abPumpTgtC R T:First Strike
+K:abTapTgt W T:Creature:Tap target creature.
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/thornscape_apprentice.jpg
 End
diff --git a/res/cardsfolder/tumble_magnet.txt b/res/cardsfolder/tumble_magnet.txt
index 8b6ce926cf1..5399de22ec2 100644
--- a/res/cardsfolder/tumble_magnet.txt
+++ b/res/cardsfolder/tumble_magnet.txt
@@ -1,8 +1,9 @@
 Name:Tumble Magnet
 ManaCost:3
 Types:Artifact
-Text:Tap, Remove a charge counter from Tumble Magnet: Tap target artifact or creature.
+Text:no text
 K:etbCounter:CHARGE:3
+K:abTapTgt T SubCounter<1/CHARGE>:Artifact,Creature:Tap target artifact or creature.
 SVar:RemAIDeck:True
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/tumble_magnet.jpg
diff --git a/res/cardsfolder/whipcorder.txt b/res/cardsfolder/whipcorder.txt
index 4f4d1e1f507..d1da621fc3f 100644
--- a/res/cardsfolder/whipcorder.txt
+++ b/res/cardsfolder/whipcorder.txt
@@ -4,6 +4,7 @@ Types:Creature Human Soldier Rebel
 Text:no text
 PT:2/2
 K:Morph:W
+K:abTapTgt W T:Creature:Tap target creature.
 SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/whipcorder.jpg
 End
diff --git a/src/forge/CardFactory.java b/src/forge/CardFactory.java
index 6a320f31ad8..8397cc12e13 100644
--- a/src/forge/CardFactory.java
+++ b/src/forge/CardFactory.java
@@ -5753,6 +5753,7 @@ public class CardFactory implements NewConstants {
 
         		@Override
         		public boolean canPlayAI() {
+        			//TODO: perhaps this can borrow from the Crowd Favorites AI...
         			if (!ComputerUtil.canPayCost(this))
         				return false;
 
@@ -8951,7 +8952,7 @@ public class CardFactory implements NewConstants {
         
         //*************** START *********** START **************************
         else if(cardName.equals("Staff of Domination")) {
-            
+            /*
             final Ability_Tap ability2 = new Ability_Tap(card, "2") {
                 
                 private static final long serialVersionUID = -5513078874305811825L;
@@ -8972,7 +8973,7 @@ public class CardFactory implements NewConstants {
             StringBuilder sb2 = new StringBuilder();
             sb2.append(cardName).append(" - You gain 1 life.");
             ability2.setStackDescription(sb2.toString());
-            
+            */
             final SpellAbility ability3 = new Ability_Tap(card, "3") {
                 private static final long serialVersionUID = 1125696151526415705L;
                 
@@ -9010,7 +9011,7 @@ public class CardFactory implements NewConstants {
             
             ability3.setDescription("3, tap: Untap target creature.");
             ability3.setBeforePayMana(CardFactoryUtil.input_targetCreature(ability3));
-            
+            /*
             final SpellAbility ability4 = new Ability_Tap(card, "4") {
                 
                 private static final long serialVersionUID = 8102011024731535257L;
@@ -9032,7 +9033,8 @@ public class CardFactory implements NewConstants {
             
             ability4.setDescription("4, tap: Tap target creature.");
             ability4.setBeforePayMana(CardFactoryUtil.input_targetCreature(ability4));
-            
+            */
+            /*
             final Ability_Tap ability5 = new Ability_Tap(card, "5") {
                 
                 private static final long serialVersionUID = -8459438547823091716L;
@@ -9053,12 +9055,12 @@ public class CardFactory implements NewConstants {
             StringBuilder sb5 = new StringBuilder();
             sb5.append(card.getName()).append(" - draw a card.");
             ability5.setStackDescription(sb5.toString());
+            */
             
-            card.addSpellAbility(ability2);
+            //card.addSpellAbility(ability2);
             card.addSpellAbility(ability3);
-            card.addSpellAbility(ability4);
-            card.addSpellAbility(ability5);
-            
+            //card.addSpellAbility(ability4);
+            //card.addSpellAbility(ability5);         
         }//*************** END ************ END **************************
         
         
@@ -9502,10 +9504,10 @@ public class CardFactory implements NewConstants {
       }
       //*************** END ************ END **************************
         
-    
+    /*
         //*****************************START*******************************
         else if(cardName.equals("Icy Manipulator") || cardName.equals("Ring of Gix")) {
-           /* The Rules state that this can target a tapped card, but it won't do anything */
+           // The Rules state that this can target a tapped card, but it won't do anything 
            
            final Ability_Tap ability = new Ability_Tap(card, "1") {
 			private static final long serialVersionUID = 6349074398830621348L;
@@ -9527,6 +9529,7 @@ public class CardFactory implements NewConstants {
            ability.setBeforePayMana(CardFactoryUtil.input_targetType(ability, "Artifact;Creature;Land"));
         }//end Icy Manipulator
         //****************END*******END***********************
+        */
  
         
         //*****************************START*******************************
diff --git a/src/forge/CardFactory_Creatures.java b/src/forge/CardFactory_Creatures.java
index 35371d42579..db77bef0c79 100644
--- a/src/forge/CardFactory_Creatures.java
+++ b/src/forge/CardFactory_Creatures.java
@@ -9001,7 +9001,7 @@ public class CardFactory_Creatures {
             }));
         }//*************** END ************ END **************************
         
-        
+        /*
         //*************** START *********** START **************************
         if(cardName.equals("Goldmeadow Harrier") || cardName.equals("Loxodon Mystic")
                 || cardName.equals("Master Decoy") || cardName.equals("Benalish Trapper")
@@ -9059,7 +9059,7 @@ public class CardFactory_Creatures {
             ability.setBeforePayMana(CardFactoryUtil.input_targetCreature(ability));
             
         }//*************** END ************ END **************************
-        
+        */
         
         //*************** START *********** START **************************
         if(cardName.equals("Rathi Trapper")) {
@@ -9114,7 +9114,7 @@ public class CardFactory_Creatures {
             
         }//*************** END ************ END **************************
         
-        
+        /*
         //*************** START *********** START **************************
         if(cardName.equals("Minister of Impediments") || cardName.equals("Ballynock Trapper")) {
             final SpellAbility ability = new Ability_Tap(card, "0") {
@@ -9167,8 +9167,9 @@ public class CardFactory_Creatures {
             ability.setBeforePayMana(CardFactoryUtil.input_targetCreature(ability));
             
         }//*************** END ************ END **************************
+        */
         
-        
+        /*
         //*************** START *********** START **************************
         if(cardName.equals("Crowd Favorites")) {
             final SpellAbility ability = new Ability_Tap(card, "3 W") {
@@ -9220,7 +9221,7 @@ public class CardFactory_Creatures {
             ability.setBeforePayMana(CardFactoryUtil.input_targetCreature(ability));
             
         }//*************** END ************ END **************************
-        
+        */
         
         //*************** START *********** START **************************
         else if (cardName.equals("Stalking Assassin")) {
@@ -9290,7 +9291,7 @@ public class CardFactory_Creatures {
                     }
                 }//selectCard()
             };//Input
-            
+            /*
             final SpellAbility tap = new Ability_Tap(card, "3 U") {
                 private static final long serialVersionUID = -8634280576775825017L;
 
@@ -9339,10 +9340,11 @@ public class CardFactory_Creatures {
                     
                 }//canPlayAI
             };//SpellAbility
+            */
             
-            card.addSpellAbility(tap);
-            tap.setDescription("3 U, tap: Tap target creature.");
-            tap.setBeforePayMana(CardFactoryUtil.input_targetCreature(tap));
+            //card.addSpellAbility(tap);
+            //tap.setDescription("3 U, tap: Tap target creature.");
+            //tap.setBeforePayMana(CardFactoryUtil.input_targetCreature(tap));
             card.addSpellAbility(destroy);
             destroy.setDescription("3 B, tap: Destroy target tapped creature.");
             destroy.setBeforePayMana(target);
@@ -18068,7 +18070,7 @@ public class CardFactory_Creatures {
         	ability.setStackDescription(cardName+" - add a +1+1 counter and draw a card.");
         }//*************** END ************ END **************************
         
-        
+        /*
         //*************** START *********** START **************************
         else if(cardName.equals("Kor Line-Slinger")) {
         	final Ability_Tap ability = new Ability_Tap(card) {
@@ -18125,6 +18127,7 @@ public class CardFactory_Creatures {
         	card.addSpellAbility(ability);
         	ability.setBeforePayMana(target);
         }//*************** END ************ END **************************
+        */
         
         
         //*************** START *********** START **************************