diff --git a/res/cardsfolder/a/ajani_vengeant.txt b/res/cardsfolder/a/ajani_vengeant.txt
index 20ed6f7a50d..3a9c0e00a32 100644
--- a/res/cardsfolder/a/ajani_vengeant.txt
+++ b/res/cardsfolder/a/ajani_vengeant.txt
@@ -6,7 +6,7 @@ Loyalty:3
 A:AB$ Pump | Cost$ AddCounter<1/LOYALTY> | Planeswalker$ True | KW$ HIDDEN This card doesn't untap during your next untap step. | ValidTgts$ Permanent | Permanent$ True | IsCurse$ True | SpellDescription$ Target permanent doesn't untap during its controller's next untap step.
 A:AB$ DealDamage | Cost$ SubCounter<2/LOYALTY> | Planeswalker$ True | Tgt$ TgtCP | NumDmg$ 3 | SubAbility$ SVar=DBGainLife | SpellDescription$ CARDNAME deals 3 damage to target creature or player and you gain 3 life.
 SVar:DBGainLife:DB$GainLife | LifeAmount$ 3
-A:AB$ DestroyAll | Cost$ SubCounter<7/LOYALTY> | ValidTgts$ Player | TgtPrompt$ Select target player | ValidCards$ Land | Planeswalker$ True | SpellDescription$ Destroy all lands target player controls.
+A:AB$ DestroyAll | Cost$ SubCounter<7/LOYALTY> | Planeswalker$ True | Ultimate$ True | ValidTgts$ Player | TgtPrompt$ Select target player | ValidCards$ Land | SpellDescription$ Destroy all lands target player controls.
 SVar:Rarity:Mythic
 SVar:Picture:http://www.wizards.com/global/images/magic/general/ajani_vengeant.jpg
 SetInfo:ALA|Mythic|http://magiccards.info/scans/en/ala/154.jpg
diff --git a/res/cardsfolder/c/chandra_the_firebrand.txt b/res/cardsfolder/c/chandra_the_firebrand.txt
index 205a897eedb..30d6ee5d0d7 100644
--- a/res/cardsfolder/c/chandra_the_firebrand.txt
+++ b/res/cardsfolder/c/chandra_the_firebrand.txt
@@ -5,7 +5,7 @@ Text:no text
 Loyalty:3
 A:AB$DealDamage | Cost$ AddCounter<1/LOYALTY> | Planeswalker$ True | Tgt$ TgtCP | NumDmg$ 1 | SpellDescription$ CARDNAME deals 1 damage to target creature or player.
 A:AB$Effect | Cost$ SubCounter<2/LOYALTY> | Planeswalker$ True | Name$ Chandra, the Firebrand effect. | Triggers$ TrigCopy,TrigCleanUp | SVars$ TrigCopyMain,TrigCleanUpMain | SpellDescription$ When you cast your next instant or sorcery spell this turn, copy that spell. You may choose new targets for the copy.
-A:AB$DealDamage | Cost$ SubCounter<6/LOYALTY> | Planeswalker$ True | Tgt$ TgtCP | TargetMin$ 0 | TargetMax$ 6 | NumDmg$ 6 | SpellDescription$ CARDNAME deals 6 damage to each of up to six target creatures and/or players.
+A:AB$DealDamage | Cost$ SubCounter<6/LOYALTY> | Planeswalker$ True | Ultimate$ True | Tgt$ TgtCP | TargetMin$ 0 | TargetMax$ 6 | NumDmg$ 6 | SpellDescription$ CARDNAME deals 6 damage to each of up to six target creatures and/or players.
 SVar:TrigCopy:Mode$ SpellCast | ValidCard$ Instant.YouCtrl,Sorcery.YouCtrl | Execute$ TrigCopyMain | TriggerDescription$ When you cast your next instant or sorcery spell this turn, copy that spell. You may choose new targets for the copy.
 SVar:TrigCopyMain:AB$CopySpell | Cost$ 0 | Defined$ TriggeredSpellAbility | Amount$ 1
 SVar:TrigCleanUp:Mode$ SpellCast | ValidCard$ Instant.YouCtrl,Sorcery.YouCtrl | Execute$ TrigCleanUpMain | Static$ True | Secondary$ True | TriggerDescription$ Ah, hell naw.
diff --git a/res/cardsfolder/e/elspeth_tirel.txt b/res/cardsfolder/e/elspeth_tirel.txt
index 19acf8942fc..bb81dc8a794 100644
--- a/res/cardsfolder/e/elspeth_tirel.txt
+++ b/res/cardsfolder/e/elspeth_tirel.txt
@@ -5,7 +5,7 @@ Text:no text
 Loyalty:4
 A:AB$ GainLife | Cost$ AddCounter<2/LOYALTY> | LifeAmount$ XLife | Planeswalker$ True | SpellDescription$ You gain 1 life for each creature you control.
 A:AB$ Token | Cost$ SubCounter<2/LOYALTY> | TokenAmount$ 3 | TokenName$ Soldier | TokenTypes$ Creature,Soldier | TokenOwner$ You | TokenColors$ White | TokenPower$ 1 | TokenToughness$ 1 | Planeswalker$ True | SpellDescription$ Put three 1/1 white Soldier creature tokens onto the battlefield.
-A:AB$ DestroyAll | Cost$ SubCounter<5/LOYALTY> | ValidCards$ Permanent.nonLand+nonToken+Other | Planeswalker$ True | SpellDescription$ Destroy all other permanents except for lands and tokens.
+A:AB$ DestroyAll | Cost$ SubCounter<5/LOYALTY> | ValidCards$ Permanent.nonLand+nonToken+Other | Planeswalker$ True | Ultimate$ True | SpellDescription$ Destroy all other permanents except for lands and tokens.
 SVar:XLife:Count$TypeYouCtrl.Creature
 SVar:Rarity:Mythic
 SVar:Picture:http://www.wizards.com/global/images/magic/general/elspeth_tirel.jpg
diff --git a/res/cardsfolder/g/garruk_primal_hunter.txt b/res/cardsfolder/g/garruk_primal_hunter.txt
index f89c6c64a3b..6b5b2f21dab 100644
--- a/res/cardsfolder/g/garruk_primal_hunter.txt
+++ b/res/cardsfolder/g/garruk_primal_hunter.txt
@@ -6,7 +6,7 @@ Loyalty:3
 A:AB$ Token | Cost$ AddCounter<1/LOYALTY> | Planeswalker$ True | TokenAmount$ 1 | TokenName$ Beast | TokenTypes$ Creature,Beast | TokenOwner$ You | TokenColors$ Green | TokenPower$ 3 | TokenToughness$ 3 | SpellDescription$ Put a 3/3 green Beast creature token onto the battlefield.
 A:AB$ Draw | Cost$ SubCounter<3/LOYALTY> | Planeswalker$ True | Defined$ You | NumCards$ X | SpellDescription$ Draw cards equal to the greatest power among creatures you control.
 SVar:X:Count$GreatestPowerYouControl
-A:AB$ Token | Cost$ SubCounter<6/LOYALTY> | Planeswalker$ True | TokenAmount$ Y | TokenName$ Wurm | TokenTypes$ Creature,Wurm | TokenOwner$ You | TokenColors$ Green | TokenPower$ 6 | TokenToughness$ 6 | SpellDescription$ Put a 6/6 green Wurm creature token onto the battlefield for each land you control.
+A:AB$ Token | Cost$ SubCounter<6/LOYALTY> | Planeswalker$ True | Ultimate$ True | TokenAmount$ Y | TokenName$ Wurm | TokenTypes$ Creature,Wurm | TokenOwner$ You | TokenColors$ Green | TokenPower$ 6 | TokenToughness$ 6 | SpellDescription$ Put a 6/6 green Wurm creature token onto the battlefield for each land you control.
 SVar:Y:Count$Valid Land.YouCtrl
 SVar:Rarity:Mythic
 SVar:Picture:http://www.wizards.com/global/images/magic/general/garruk_primal_hunter.jpg
diff --git a/res/cardsfolder/g/garruk_wildspeaker.txt b/res/cardsfolder/g/garruk_wildspeaker.txt
index 1d2eeeff879..dce6f813834 100644
--- a/res/cardsfolder/g/garruk_wildspeaker.txt
+++ b/res/cardsfolder/g/garruk_wildspeaker.txt
@@ -5,7 +5,7 @@ Text:no text
 Loyalty:3
 A:AB$ Untap | Cost$ AddCounter<1/LOYALTY> | Planeswalker$ True | ValidTgts$ Land | TgtPrompt$ Select target land | TargetMin$ 2 | TargetMax$ 2 | SpellDescription$ Untap two target lands.
 A:AB$ Token | Cost$ SubCounter<1/LOYALTY> | Planeswalker$ True | TokenAmount$ 1 | TokenName$ Beast | TokenTypes$ Creature,Beast | TokenOwner$ You | TokenColors$ Green | TokenPower$ 3 | TokenToughness$ 3 | SpellDescription$ Put a 3/3 green Beast creature token onto the battlefield.
-A:AB$ PumpAll | Cost$ SubCounter<4/LOYALTY> | Planeswalker$ True | ValidCards$ Creature.YouCtrl | NumAtt$ +3 | NumDef$ +3 | KW$ Trample | SpellDescription$ Creatures you control get +3/+3 and gain trample until end of turn.
+A:AB$ PumpAll | Cost$ SubCounter<4/LOYALTY> | Planeswalker$ True | Ultimate$ True | ValidCards$ Creature.YouCtrl | NumAtt$ +3 | NumDef$ +3 | KW$ Trample | SpellDescription$ Creatures you control get +3/+3 and gain trample until end of turn.
 SVar:Rarity:Mythic
 SVar:Picture:http://resources.wizards.com/magic/cards/lrw/en/card140205.jpg
 SetInfo:M11|Mythic|http://magiccards.info/scans/en/m11/175.jpg
diff --git a/res/cardsfolder/j/jace_beleren.txt b/res/cardsfolder/j/jace_beleren.txt
index 73e418110c7..112d0c1282a 100644
--- a/res/cardsfolder/j/jace_beleren.txt
+++ b/res/cardsfolder/j/jace_beleren.txt
@@ -5,7 +5,7 @@ Text:no text
 Loyalty:3
 A:AB$ Draw | Cost$ AddCounter<2/LOYALTY> | Defined$ Each | Planeswalker$ True | SpellDescription$ Each player draws a card.
 A:AB$ Draw | Cost$ SubCounter<1/LOYALTY> | ValidTgts$ Player | Planeswalker$ True | SpellDescription$ Target player draws a card.
-A:AB$ Mill | Cost$ SubCounter<10/LOYALTY> | NumCards$ 20 | ValidTgts$ Player | Planeswalker$ True | SpellDescription$ Target player puts the top twenty cards of his or her library into his or her graveyard.
+A:AB$ Mill | Cost$ SubCounter<10/LOYALTY> | NumCards$ 20 | ValidTgts$ Player | Planeswalker$ True | Ultimate$ True | SpellDescription$ Target player puts the top twenty cards of his or her library into his or her graveyard.
 SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/jace_beleren.jpg
 SetInfo:M11|Mythic|http://magiccards.info/scans/en/m11/58.jpg
diff --git a/res/cardsfolder/j/jace_memory_adept.txt b/res/cardsfolder/j/jace_memory_adept.txt
index acab06a76a0..63720eaa745 100644
--- a/res/cardsfolder/j/jace_memory_adept.txt
+++ b/res/cardsfolder/j/jace_memory_adept.txt
@@ -6,7 +6,7 @@ Loyalty:4
 A:AB$ Draw | Cost$ AddCounter<1/LOYALTY> | Defined$ You | SubAbility$ DBMill | Planeswalker$ True | SpellDescription$ Draw a card.  Target player puts the top card of his or her library into his or her graveyard.
 SVar:DBMill:DB$ Mill | ValidTgts$ Player | TgtPrompt$ Select target player | NumCards$ 1
 A:AB$ Mill | Cost$ 0 | ValidTgts$ Player | TgtPrompt$ Select target player | NumCards$ 10 | Planeswalker$ True | SpellDescription$ Target player puts the top 10 cards of his or her library in his or her graveyard.
-A:AB$ Draw | Cost$ SubCounter<7/LOYALTY> | ValidTgts$ Player | TgtPrompt$ Select target player | TargetMin$ 0 | TargetMax$ 2 | NumCards$ 20 | Planeswalker$ True | SpellDescription$ Any number of target players each draw 20 cards.
+A:AB$ Draw | Cost$ SubCounter<7/LOYALTY> | ValidTgts$ Player | TgtPrompt$ Select target player | TargetMin$ 0 | TargetMax$ 2 | NumCards$ 20 | Planeswalker$ True | Ultimate$ True | SpellDescription$ Any number of target players each draw 20 cards.
 SVar:Rarity:Mythic
 SVar:Picture:http://www.wizards.com/global/images/magic/general/jace_memory_adept.jpg
 SetInfo:M12|Mythic|http://magiccards.info/scans/en/m12/58.jpg
diff --git a/res/cardsfolder/k/kagemaros_clutch.txt b/res/cardsfolder/k/kagemaros_clutch.txt
index 89e0fd8bdb9..56cdd22c496 100644
--- a/res/cardsfolder/k/kagemaros_clutch.txt
+++ b/res/cardsfolder/k/kagemaros_clutch.txt
@@ -1,14 +1,14 @@
-Name:Kagemaro's Clutch
-ManaCost:3 B
-Types:Enchantment Aura
-Text:no text
-K:Enchant creature
-A:SP$ Attach | Cost$ 3 B | ValidTgts$ Creature | AILogic$ Curse
-S:Mode$ Continuous | Affected$ Creature.EnchantedBy | AddPower$ X | AddToughness$ X | Description$ Enchanted creature gets -X/-X, where X is the number of cards in your hand.
-SVar:X:Count$InYourHand/Times.-1
-SVar:RemRandomDeck:True
-SVar:Rarity:Common
-SVar:Picture:http://www.wizards.com/global/images/magic/general/kagemaros_clutch.jpg
+Name:Kagemaro's Clutch
+ManaCost:3 B
+Types:Enchantment Aura
+Text:no text
+K:Enchant creature
+A:SP$ Attach | Cost$ 3 B | ValidTgts$ Creature | AILogic$ Curse
+S:Mode$ Continuous | Affected$ Creature.EnchantedBy | AddPower$ X | AddToughness$ X | Description$ Enchanted creature gets -X/-X, where X is the number of cards in your hand.
+SVar:X:Count$InYourHand/Times.-1
+SVar:RemAIDeck:True
+SVar:Rarity:Common
+SVar:Picture:http://www.wizards.com/global/images/magic/general/kagemaros_clutch.jpg
 SetInfo:SOK|Common|http://magiccards.info/scans/en/sok/74.jpg
 Oracle:Enchant creature\nEnchanted creature gets -X/-X, where X is the number of cards in your hand.
 End
\ No newline at end of file
diff --git a/res/cardsfolder/l/liliana_vess.txt b/res/cardsfolder/l/liliana_vess.txt
index ffc70a1fce9..554f5f708bb 100644
--- a/res/cardsfolder/l/liliana_vess.txt
+++ b/res/cardsfolder/l/liliana_vess.txt
@@ -5,7 +5,7 @@ Text:no text
 Loyalty:5
 A:AB$ Discard | Cost$ AddCounter<1/LOYALTY> | Planeswalker$ True | ValidTgts$ Player | NumCards$ 1 | Mode$ TgtChoose | SpellDescription$ Target player discards a card.
 A:AB$ ChangeZone | Cost$ SubCounter<2/LOYALTY> | Planeswalker$ True | Origin$ Library | Destination$ Library | LibraryPosition$ 0 | ChangeType$ Card | ChangeNum$ 1 | Mandatory$ True | SpellDescription$ Search your library for a card, then shuffle your library and put that card on top of it.
-A:AB$ ChangeZoneAll | Cost$ SubCounter<8/LOYALTY> | Planeswalker$ True | ChangeType$ Creature | Origin$ Graveyard | Destination$ Battlefield | GainControl$ True | SpellDescription$ Put all creature cards in all graveyards onto the battlefield under your control.
+A:AB$ ChangeZoneAll | Cost$ SubCounter<8/LOYALTY> | Planeswalker$ True | Ultimate$ True | ChangeType$ Creature | Origin$ Graveyard | Destination$ Battlefield | GainControl$ True | SpellDescription$ Put all creature cards in all graveyards onto the battlefield under your control.
 SVar:Rarity:Rare
 SVar:Picture:http://resources.wizards.com/magic/cards/lrw/en/card140212.jpg
 SetInfo:M11|Mythic|http://magiccards.info/scans/en/m11/102.jpg
diff --git a/res/cardsfolder/n/nicol_bolas_planeswalker.txt b/res/cardsfolder/n/nicol_bolas_planeswalker.txt
index 7a387cfec98..6a04feaf8d3 100644
--- a/res/cardsfolder/n/nicol_bolas_planeswalker.txt
+++ b/res/cardsfolder/n/nicol_bolas_planeswalker.txt
@@ -5,8 +5,8 @@ Text:no text
 Loyalty:5
 A:AB$ Destroy | Cost$ AddCounter<3/LOYALTY> | ValidTgts$ Permanent.nonCreature | TgtPrompt$ Select a noncreature permanent. | Planeswalker$ True | SpellDescription$ Destroy target noncreature permanent.
 A:AB$ GainControl | Cost$ SubCounter<2/LOYALTY> | ValidTgts$ Creature | Planeswalker$ True | SpellDescription$ Gain control of target creature.
-A:AB$ DealDamage | Cost$ SubCounter<9/LOYALTY> | NumDmg$ 7 | ValidTgts$ Player | Planeswalker$ True | SubAbility$ SVar=DBDiscard | SpellDescription$ CARDNAME deals 7 damage to target player. That player discards seven cards, then sacrifices seven permanents.
-SVar:DBDiscard:DB$Discard | Defined$ Targeted | NumCards$ 7 | Mode$ TgtChoose | SubAbility$ SVar=DBSac
+A:AB$ DealDamage | Cost$ SubCounter<9/LOYALTY> | NumDmg$ 7 | ValidTgts$ Player | Planeswalker$ True | Ultimate$ True | SubAbility$ DBDiscard | SpellDescription$ CARDNAME deals 7 damage to target player. That player discards seven cards, then sacrifices seven permanents.
+SVar:DBDiscard:DB$Discard | Defined$ Targeted | NumCards$ 7 | Mode$ TgtChoose | SubAbility$ DBSac
 SVar:DBSac:DB$Sacrifice | Defined$ Targeted | SacValid$ Permanent | Amount$ 7
 SVar:Rarity:Mythic
 SVar:Picture:http://www.wizards.com/global/images/magic/general/nicol_bolas_planeswalker.jpg
diff --git a/res/cardsfolder/n/nissa_revane.txt b/res/cardsfolder/n/nissa_revane.txt
index 13db0e934e9..5c438737110 100644
--- a/res/cardsfolder/n/nissa_revane.txt
+++ b/res/cardsfolder/n/nissa_revane.txt
@@ -5,7 +5,7 @@ Text:no text
 Loyalty:2
 A:AB$ ChangeZone | Cost$ AddCounter<1/LOYALTY> | Origin$ Library | Destination$ Battlefield | ChangeType$ Permanent.namedNissa's Chosen | ChangeNum$ 1 | Planeswalker$ True | SpellDescription$ Search your library for a card named Nissa's Chosen and put it onto the battlefield. Then shuffle your library.
 A:AB$ GainLife | Cost$ AddCounter<1/LOYALTY> | LifeAmount$ XLife | Planeswalker$ True | SpellDescription$ You gain 2 life for each Elf you control.
-A:AB$ ChangeZone | Cost$ SubCounter<7/LOYALTY> | Origin$ Library | Destination$ Battlefield | ChangeType$ Creature.Elf | ChangeNum$ XFetch | Planeswalker$ True | SpellDescription$ Search your library for any number of Elf creature cards and put them onto the battlefield. Then shuffle your library.
+A:AB$ ChangeZone | Cost$ SubCounter<7/LOYALTY> | Origin$ Library | Destination$ Battlefield | ChangeType$ Creature.Elf | ChangeNum$ XFetch | Planeswalker$ True | Ultimate$ True | SpellDescription$ Search your library for any number of Elf creature cards and put them onto the battlefield. Then shuffle your library.
 SVar:XLife:Count$TypeYouCtrl.Elf/Times.2
 SVar:XFetch:Count$TypeInYourLibrary.Elf
 SVar:RemRandomDeck:True
diff --git a/res/cardsfolder/s/sarkhan_vol.txt b/res/cardsfolder/s/sarkhan_vol.txt
index b7587de8f20..cd19dda2452 100644
--- a/res/cardsfolder/s/sarkhan_vol.txt
+++ b/res/cardsfolder/s/sarkhan_vol.txt
@@ -5,7 +5,7 @@ Text:no text
 Loyalty:4
 A:AB$ PumpAll | Cost$ AddCounter<1/LOYALTY> | Planeswalker$ True | ValidCards$ Creature.YouCtrl | NumAtt$ +1 | NumDef$ +1 | KW$ Haste | SpellDescription$ Creatures you control get +1/+1 and gain haste until end of turn.
 A:AB$ GainControl | Cost$ SubCounter<2/LOYALTY> | Planeswalker$ True | ValidTgts$ Creature | TgtPrompt$ Select target creature | LoseControl$ EOT | Untap$ True | AddKWs$ Haste | SpellDescription$ Gain control of target creature until end of turn. Untap that creature. It gains haste until end of turn.
-A:AB$ Token | Cost$ SubCounter<6/LOYALTY> | Planeswalker$ True | TokenAmount$ 5 | TokenName$ Dragon | TokenTypes$ Creature,Dragon | TokenOwner$ You | TokenColors$ Red | TokenPower$ 4 | TokenToughness$ 4 | TokenKeywords$ Flying | SpellDescription$ Put five 4/4 red Dragon creature tokens with flying onto the battlefield.
+A:AB$ Token | Cost$ SubCounter<6/LOYALTY> | Planeswalker$ True | Ultimate$ True | TokenAmount$ 5 | TokenName$ Dragon | TokenTypes$ Creature,Dragon | TokenOwner$ You | TokenColors$ Red | TokenPower$ 4 | TokenToughness$ 4 | TokenKeywords$ Flying | SpellDescription$ Put five 4/4 red Dragon creature tokens with flying onto the battlefield.
 SVar:PlayMain1:TRUE
 SVar:Rarity:Mythic
 SVar:Picture:http://www.wizards.com/global/images/magic/general/sarkhan_vol.jpg
diff --git a/res/cardsfolder/v/venser_the_sojourner.txt b/res/cardsfolder/v/venser_the_sojourner.txt
index 1fb462a9fac..a5052690253 100644
--- a/res/cardsfolder/v/venser_the_sojourner.txt
+++ b/res/cardsfolder/v/venser_the_sojourner.txt
@@ -8,7 +8,7 @@ SVar:DelTrig:DB$ DelayedTrigger | Mode$ Phase | Phase$ End of Turn | Execute$ Tr
 SVar:TrigReturn:DB$ ChangeZone | Origin$ Exile | Destination$ Battlefield | Defined$ Remembered | SubAbility$ DBCleanup
 SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
 A:AB$PumpAll | Cost$ SubCounter<1/LOYALTY> | Planeswalker$ True | ValidCards$ Creature | KW$ Unblockable | SpellDescription$ Creatures are unblockable this turn.
-A:AB$Effect | Cost$ SubCounter<8/LOYALTY> | Planeswalker$ True | Name$ Venser, the Sojourner emblem | Triggers$ TrigSpellCast | SVars$ EffSpellCast | Duration$ Permanent | SpellDescription$ You get an emblem with "Whenever you cast a spell, exile target permanent."
+A:AB$Effect | Cost$ SubCounter<8/LOYALTY> | Planeswalker$ True | Ultimate$ True | Name$ Venser, the Sojourner emblem | Triggers$ TrigSpellCast | SVars$ EffSpellCast | Duration$ Permanent | SpellDescription$ You get an emblem with "Whenever you cast a spell, exile target permanent."
 SVar:TrigSpellCast:Mode$ SpellCast | ValidControllingPlayer$ You | Execute$ EffSpellCast | TriggerDescription$ Whenever you cast a spell, exile target permanent.
 SVar:EffSpellCast:AB$ChangeZone | Cost$ 0 | Origin$ Battlefield | Destination$ Exile | ValidTgts$ Permanent
 SVar:Rarity:Mythic
diff --git a/res/cardsfolder/w/wine_of_blood_and_iron.txt b/res/cardsfolder/w/wine_of_blood_and_iron.txt
index 0e0fb07a1b4..fa2b1328878 100644
--- a/res/cardsfolder/w/wine_of_blood_and_iron.txt
+++ b/res/cardsfolder/w/wine_of_blood_and_iron.txt
@@ -1,12 +1,13 @@
-Name:Wine of Blood and Iron
-ManaCost:3
-Types:Artifact
-Text:no text
-A:AB$ Pump | Cost$ 4 | ValidTgts$ Creature | TgtPrompt$ Select target creature | NumAtt$ +X | SubAbility$ DBPump | SpellDescription$ Target creature gets +X/+0 until end of turn, where X is its power. Sacrifice CARDNAME at the beginning of the next end step.
-SVar:DBPump:DB$ Pump | KW$ HIDDEN At the beginning of the end step, sacrifice CARDNAME. | Defined$ Self
-SVar:X:Targeted$CardPower
-SVar:Rarity:Rare
-SVar:Picture:http://www.wizards.com/global/images/magic/general/wine_of_blood_and_iron.jpg
+Name:Wine of Blood and Iron
+ManaCost:3
+Types:Artifact
+Text:no text
+A:AB$ Pump | Cost$ 4 | ValidTgts$ Creature | TgtPrompt$ Select target creature | NumAtt$ +X | SubAbility$ DBPump | SpellDescription$ Target creature gets +X/+0 until end of turn, where X is its power. Sacrifice CARDNAME at the beginning of the next end step.
+SVar:DBPump:DB$ Pump | KW$ HIDDEN At the beginning of the end step, sacrifice CARDNAME. | Defined$ Self
+SVar:X:Targeted$CardPower
+SVar:RemAIDeck:True
+SVar:Rarity:Rare
+SVar:Picture:http://www.wizards.com/global/images/magic/general/wine_of_blood_and_iron.jpg
 SetInfo:SOK|Rare|http://magiccards.info/scans/en/sok/161.jpg
 Oracle:{4}: Target creature gets +X/+0 until end of turn, where X is its power. Sacrifice Wine of Blood and Iron at the beginning of the next end step.
 End
\ No newline at end of file
diff --git a/src/main/java/forge/ComputerUtil.java b/src/main/java/forge/ComputerUtil.java
index c10ec583d7a..91581a77538 100644
--- a/src/main/java/forge/ComputerUtil.java
+++ b/src/main/java/forge/ComputerUtil.java
@@ -4,6 +4,8 @@ import forge.Constant.Zone;
 import forge.card.abilityFactory.AbilityFactory;
 import forge.card.cardFactory.CardFactoryUtil;
 import forge.card.cost.Cost;
+import forge.card.cost.CostPart;
+import forge.card.cost.CostRemoveCounter;
 import forge.card.cost.CostUtil;
 import forge.card.cost.Cost_Payment;
 import forge.card.mana.ManaCost;
@@ -55,7 +57,7 @@ public class ComputerUtil {
                 continue;
 
             sa.setActivatingPlayer(AllZone.getComputerPlayer());
-            if (canBePlayedAndPayedByAI(sa)) //checks everything nescessary
+            if (canBePlayedAndPayedByAI(sa)) //checks everything necessary
             {
                 handlePlayingSpellAbility(sa);
 
@@ -1189,6 +1191,15 @@ public class ComputerUtil {
                 if (b.getSourceCard().isCreature())
                     b1 += 1;
 
+                //sort planeswalker abilities for ultimate
+                if(a.getRestrictions().getPlaneswalker() && b.getRestrictions().getPlaneswalker()) {
+                    if(a.getAbilityFactory() != null && a.getAbilityFactory().getMapParams().containsKey("Ultimate")) {
+                        a1 += 1;
+                    }
+                    else if(b.getAbilityFactory() != null && b.getAbilityFactory().getMapParams().containsKey("Ultimate")) {
+                        b1 += 1;
+                    }
+                }
 
                 return b1 - a1;
             }