diff --git a/projects/mtg/bin/Res/sets/mtg_todo.dat b/projects/mtg/bin/Res/sets/mtg_todo.dat
index 59cadeda9..59756ccba 100644
--- a/projects/mtg/bin/Res/sets/mtg_todo.dat
+++ b/projects/mtg/bin/Res/sets/mtg_todo.dat
@@ -441,15 +441,6 @@ mana={3}{U}{U}{U}
 type=Sorcery
 [/card]
 [card]
-name=Amphibious Kavu
-text=Whenever Amphibious Kavu blocks or becomes blocked by one or more blue and/or black creatures, Amphibious Kavu gets +3/+3 until end of turn.
-mana={2}{G}
-type=Creature
-subtype=Kavu
-power=2
-toughness=2
-[/card]
-[card]
 name=Amulet of Quoz
 text=Remove Amulet of Quoz from your deck before playing if you're not playing for ante. -- {T}, Sacrifice Amulet of Quoz: Target opponent may add the top card of his or her library to the ante. If he or she doesn't, you flip a coin. If you win the flip, that player loses the game. If you lose the flip, you lose the game. Activate this ability only during your upkeep.
 mana={6}
@@ -6493,15 +6484,6 @@ mana={1}{R}{R}
 type=Enchantment
 [/card]
 [card]
-name=Dwarven Soldier
-text=Whenever Dwarven Soldier blocks or becomes blocked by one or more Orcs, Dwarven Soldier gets +0/+2 until end of turn.
-mana={1}{R}
-type=Creature
-subtype=Dwarf Soldier
-power=2
-toughness=1
-[/card]
-[card]
 name=Dwarven Song
 text=Any number of target creatures become red until end of turn.
 mana={R}
@@ -21955,15 +21937,6 @@ type=Enchantment
 subtype=Aura
 [/card]
 [card]
-name=Serra Inquisitors
-text=Whenever Serra Inquisitors blocks or becomes blocked by one or more black creatures, Serra Inquisitors gets +2/+0 until end of turn.
-mana={4}{W}
-type=Creature
-subtype=Human Cleric
-power=3
-toughness=3
-[/card]
-[card]
 name=Serra's Hymn
 text=At the beginning of your upkeep, you may put a verse counter on Serra's Hymn. -- Sacrifice Serra's Hymn: Prevent the next X damage that would be dealt this turn to any number of target creatures and/or players, divided as you choose, where X is the number of verse counters on Serra's Hymn.
 mana={W}
diff --git a/projects/mtg/bin/Res/sets/primitives/mtg.txt b/projects/mtg/bin/Res/sets/primitives/mtg.txt
index 7453a1005..26aff8255 100644
--- a/projects/mtg/bin/Res/sets/primitives/mtg.txt
+++ b/projects/mtg/bin/Res/sets/primitives/mtg.txt
@@ -1435,6 +1435,19 @@ power=3
 toughness=1
 [/card]
 [card]
+name=Amphibious Kavu
+auto=@blocked(this) from(creature[blue]) turnlimited:3/3 ueot
+auto=@blocked(this) from(creature[black]) turnlimited:3/3 ueot
+auto=@blocking(this) from(creature[blue]) turnlimited:3/3 ueot
+auto=@blocking(this) from(creature[black]) turnlimited:3/3 ueot
+text=Whenever Amphibious Kavu blocks or becomes blocked by one or more blue and/or black creatures, Amphibious Kavu gets +3/+3 until end of turn.
+mana={2}{G}
+type=Creature
+subtype=Kavu
+power=2
+toughness=2
+[/card]
+[card]
 name=Amoeboid Changeling
 abilities=changeling
 auto={T}:transforms(allsubtypes) target(creature) ueot
@@ -12175,8 +12188,8 @@ subtype=Aura
 [card]
 name=Contested War Zone
 auto={T}:Add{1}
-auto={1}{T}:lord(creature[attacking]) 1/0 ueot
-auto=@combatdamaged(controller) from(creature):moveTo(opponentbattlefield)
+auto={1}{T}:all(creature[attacking]) 1/0 ueot
+auto=@combatdamaged(controller) from(creature) turnlimited:moveTo(opponentbattlefield)
 text=Whenever a creature deals combat damage to you, that creature's controller gains control of Contested War Zone. -- {T}: Add {1} to your mana pool. -- {1}, {T}: Attacking creatures get +1/+0 until end of turn.
 type=Land
 [/card]
@@ -17719,6 +17732,17 @@ text=Dwarven Ruins enters the battlefield tapped. -- {T}: Add {R} to your mana p
 type=Land
 [/card]
 [card]
+name=Dwarven Soldier
+auto=@blocked(this) from(orc) turnlimited:0/2 ueot
+auto=@blocking(this) from(orc) turnlimited:0/2 ueot
+text=Whenever Dwarven Soldier blocks or becomes blocked by one or more Orcs, Dwarven Soldier gets +0/+2 until end of turn.
+mana={1}{R}
+type=Creature
+subtype=Dwarf Soldier
+power=2
+toughness=1
+[/card]
+[card]
 name=Dwarven Strike Force
 auto={D}:first strike && haste
 text=Discard a card at random: Dwarven Strike Force gains first strike and haste until end of turn.
@@ -54975,6 +54999,17 @@ mana={3}{W}
 type=World Enchantment
 [/card]
 [card]
+name=Serra Inquisitors
+auto=@blocked(this) from(creature[black]) turnlimited:2/0 ueot
+auto=@blocking(this) from(creature[black]) turnlimited:2/0 ueot
+text=Whenever Serra Inquisitors blocks or becomes blocked by one or more black creatures, Serra Inquisitors gets +2/+0 until end of turn.
+mana={4}{W}
+type=Creature
+subtype=Human Cleric
+power=3
+toughness=3
+[/card]
+[card]
 name=Serra Paladin
 auto={T}:prevent:1 target(creature,player)
 auto={1}{W}{W}{T}:vigilance target(creature)