diff --git a/projects/mtg/bin/Res/sets/ICE/_cards.dat b/projects/mtg/bin/Res/sets/ICE/_cards.dat
index 323ba692b..5c923daa6 100644
--- a/projects/mtg/bin/Res/sets/ICE/_cards.dat
+++ b/projects/mtg/bin/Res/sets/ICE/_cards.dat
@@ -274,6 +274,16 @@ toughness=*
 abilities=defender
 [/card]
 [card]
+text={2}, Sacrifice a land: Put a +2/+2 counter on target creature. Play this ability only during any upkeep step.
+auto={2}{S(land|myBattlefield):counter(2/2,1) target(creature) myUpkeepOnly
+auto={2}{S(land|myBattlefield):counter(2/2,1) target(creature) OpponentUpkeepOnly
+id=2618
+name=Dwarven Armory
+rarity=R
+mana={2}{R}{R}
+type=Enchantment
+[/card]
+[card]
 text={3}{G}, {T}: You may tap or untap target artifact, creature, or land.
 id=2556
 auto={3}{G}{T}:tap target(creature,artifact,land)
diff --git a/projects/mtg/bin/Res/sets/ICE/todo.dat b/projects/mtg/bin/Res/sets/ICE/todo.dat
index b3a98993e..027ae4472 100644
--- a/projects/mtg/bin/Res/sets/ICE/todo.dat
+++ b/projects/mtg/bin/Res/sets/ICE/todo.dat
@@ -498,14 +498,6 @@ type=Enchantment
 mana={2}{W}{W}
 [/card]
 [card]
-text={2}, Sacrifice a land: Put a +2/+2 counter on target creature. Play this ability only during any upkeep step.
-id=2618
-name=Dwarven Armory
-rarity=R
-type=Enchantment
-mana={2}{R}{R}
-[/card]
-[card]
 text=At the beginning of your upkeep, sacrifice Earthlink unless you pay {2}.     Whenever a creature is put into a graveyard from play, that creature's controller sacrifices a land.
 id=2721
 name=Earthlink
diff --git a/projects/mtg/bin/Res/sets/PTK/_cards.dat b/projects/mtg/bin/Res/sets/PTK/_cards.dat
index 6224d27a8..ff66e8feb 100644
--- a/projects/mtg/bin/Res/sets/PTK/_cards.dat
+++ b/projects/mtg/bin/Res/sets/PTK/_cards.dat
@@ -203,6 +203,17 @@ mana={1}{R}
 type=Sorcery
 [/card]
 [card]
+id=10578
+name=Fire Bowman
+rarity=C
+mana={R}
+type=Creature
+subtype=Human Soldier Archer
+auto={S}:damage:1 target(creature,player) myTurnOnly
+power=1
+toughness=1
+[/card]
+[card]
 text=Put target creature on top of its owner's library.
 id=10622
 target=creature|battlefield
diff --git a/projects/mtg/bin/Res/sets/RAV/_cards.dat b/projects/mtg/bin/Res/sets/RAV/_cards.dat
index 33a9c075c..d6f171eff 100644
--- a/projects/mtg/bin/Res/sets/RAV/_cards.dat
+++ b/projects/mtg/bin/Res/sets/RAV/_cards.dat
@@ -309,6 +309,21 @@ mana={1}{G}
 type=Sorcery
 [/card]
 [card]
+text=Flying, first strike   At the beginning of your upkeep, if Firemane Angel is in your graveyard or on the battlefield, you may gain 1 life.   {6}{R}{R}{W}{W}: Return Firemane Angel from your graveyard to the battlefield. Play this ability only during your upkeep.
+auto=@each my upkeep:may life:1 controller
+autograveyard={0}:may life:1 controller limit:1 myUpkeepOnly
+autograveyard={6}{R}{R}{W}{W}:moveTo(myBattlefield) myUpkeepOnly
+id=89074
+name=Firemane Angel
+rarity=R
+mana={3}{R}{W}{W}
+type=Creature
+subtype=Angel
+power=4
+toughness=3
+abilities=flying,first strike
+[/card]
+[card]
 text=Enchant creature   When Fists of Ironwood enters the battlefield, put two 1/1 green Saproling creature tokens onto the battlefield.   Enchanted creature has trample.
 target=creature
 auto=token(Saproling,creature saproling, 1/1,green)*2
diff --git a/projects/mtg/bin/Res/sets/RAV/todo.dat b/projects/mtg/bin/Res/sets/RAV/todo.dat
index 8695d562e..bd47855de 100644
--- a/projects/mtg/bin/Res/sets/RAV/todo.dat
+++ b/projects/mtg/bin/Res/sets/RAV/todo.dat
@@ -587,17 +587,6 @@ type=Instant
 mana={1}{R}
 [/card]
 [card]
-text=Flying, first strike     At the beginning of your upkeep, if Firemane Angel is in your graveyard or in play, you may gain 1 life.     {6}{R}{R}{W}{W}: Return Firemane Angel from your graveyard to play. Play this ability only during your upkeep.
-id=89074
-name=Firemane Angel
-rarity=R
-type=Creature
-mana={3}{R}{W}{W}
-power=4
-subtype=Angel
-toughness=3
-[/card]
-[card]
 text=When Flame-Kin Zealot comes into play, creatures you control get +1/+1 and gain haste until end of turn.
 id=83562
 auto=1/1 all(creature|myBattlefield)
diff --git a/projects/mtg/bin/Res/sets/SCG/_cards.dat b/projects/mtg/bin/Res/sets/SCG/_cards.dat
index fc8b70808..804752c9d 100644
--- a/projects/mtg/bin/Res/sets/SCG/_cards.dat
+++ b/projects/mtg/bin/Res/sets/SCG/_cards.dat
@@ -181,6 +181,20 @@ auto=X/0
 rarity=U
 [/card]
 [card]
+text=Flying   {3}{W}{W}: Return Eternal Dragon from your graveyard to your hand. Activate this ability only during your upkeep.   Plainscycling {2} ({2}, Discard this card: Search your library for a Plains card, reveal it, and put it into your hand. Then shuffle your library.)
+autograveyard={3}{W}{W}:moveTo(myhand) myUpkeepOnly
+id=44398
+name=Eternal Dragon
+rarity=R
+mana={5}{W}{W}
+type=Creature
+subtype=Dragon Spirit
+autohand={2}{S}:moveTo(myhand) target(plains|mylibrary)
+power=5
+toughness=5
+abilities=flying
+[/card]
+[card]
 id=43525
 name=Goblin Brigand
 mana={1}{R}
diff --git a/projects/mtg/bin/Res/sets/SCG/todo.dat b/projects/mtg/bin/Res/sets/SCG/todo.dat
index d502b1692..849888332 100644
--- a/projects/mtg/bin/Res/sets/SCG/todo.dat
+++ b/projects/mtg/bin/Res/sets/SCG/todo.dat
@@ -373,17 +373,6 @@ text=Cleric spells you cast cost {W}{B} less to cast. This effect reduces only t
 rarity=U
 [/card]
 [card]
-id=44398
-name=Eternal Dragon
-mana={5}{W}{W}
-type=Creature
-subtype=Dragon Spirit
-power=5
-toughness=5
-text=Flying {3}{W}{W}: Return Eternal Dragon from your graveyard to your hand. Activate this ability only during your upkeep. Plainscycling {2} ({2}, Discard this card: Search your library for a Plains card, reveal it, and put it into your hand. Then shuffle your library.)
-rarity=R
-[/card]
-[card]
 id=40648
 name=Exiled Doomsayer
 mana={1}{W}