diff --git a/res/cardsfolder/e/elspeth_knight_errant.txt b/res/cardsfolder/e/elspeth_knight_errant.txt
index 2864124bd02..db91143c1d4 100644
--- a/res/cardsfolder/e/elspeth_knight_errant.txt
+++ b/res/cardsfolder/e/elspeth_knight_errant.txt
@@ -3,6 +3,11 @@ ManaCost:2 W W
 Types:Planeswalker Elspeth
 Text:no text
 Loyalty:4
+A:AB$ Token | Cost$ AddCounter<1/LOYALTY> | TokenAmount$ 1 | TokenName$ Soldier | TokenColors$ White | TokenTypes$ Creature,Soldier | TokenOwner$ You | TokenPower$ 1 | TokenToughness$ 1 | Planeswalker$ True | SpellDescription$ Put a 1/1 white Soldier creature token onto the battlefield.
+A:AB$ Pump | Cost$ AddCounter<1/LOYALTY> | ValidTgts$ Creature | TgtPrompt$ Select target creature | NumAtt$ 3 | NumDef$ 3 | KW$ Flying | Planeswalker$ True | SpellDescription$ Target creature gets +3/+3 and gains flying until end of turn.
+A:AB$ Effect | Cost$ SubCounter<8/LOYALTY> | Name$ Elspeth, Knight-Errant emblem | StaticAbilities$ STIndestructible | Keywords$ Indestructible | Planeswalker$ True | Ultimate$ True | Duration$ Permanent | SpellDescription$ You get an emblem with "Artifacts, creatures, enchantments, and lands you control are indestructible."
+SVar:STIndestructible:Mode$ Continuous | Affected$ Artifact.YouCtrl,Creature.YouCtrl,Enchantment.YouCtrl,Land.YouCtrl | AffectedZone$ Battlefield | AddKeyword$ Indestructible
+SVar:Indestructible:Artifacts, creatures, enchantments, and lands you control are indestructible.
 SVar:Rarity:Mythic
 SVar:Picture:http://www.wizards.com/global/images/magic/general/elspeth_knight_errant.jpg
 SetInfo:ALA|Mythic|http://magiccards.info/scans/en/ala/9.jpg
diff --git a/res/cardsfolder/k/koth_of_the_hammer.txt b/res/cardsfolder/k/koth_of_the_hammer.txt
index 422277c459a..2102b94a2ae 100644
--- a/res/cardsfolder/k/koth_of_the_hammer.txt
+++ b/res/cardsfolder/k/koth_of_the_hammer.txt
@@ -6,9 +6,10 @@ Loyalty:3
 A:AB$ Untap | Cost$ AddCounter<1/LOYALTY> | Planeswalker$ True | ValidTgts$ Mountain | TgtPrompt$ Select target Mountain | SubAbility$ DBAnimate | SpellDescription$ Untap target Mountain. It becomes a 4/4 red Elemental creature until end of turn. It's still a land.
 SVar:DBAnimate:DB$ Animate | Defined$ Targeted | Power$ 4 | Toughness$ 4 | Types$ Creature,Elemental | Colors$ Red
 A:AB$ Mana | Cost$ SubCounter<2/LOYALTY> | Planeswalker$ True | Produced$ R | Amount$ X | SpellDescription$ Add R to your mana pool for each Mountain you control.
-A:AB$ Effect | Cost$ SubCounter<5/LOYALTY> | Planeswalker$ True | Ultimate$ True | Name$ Koth of the Hammer emblem | Stackable$ False | StaticAbilities$ STDamage | SVars$ ABDealDamage | Duration$ Permanent | SpellDescription$ You get an emblem with "Mountains you control have '{T}: This land deals 1 damage to target creature or player."
+A:AB$ Effect | Cost$ SubCounter<5/LOYALTY> | Planeswalker$ True | Ultimate$ True | Name$ Koth of the Hammer emblem | StaticAbilities$ STDamage | SVars$ ABDealDamage | Stackable$ False | Keywords$ Damage | Duration$ Permanent | SpellDescription$ You get an emblem with "Mountains you control have '{T}: This land deals 1 damage to target creature or player."
 SVar:STDamage:Mode$ Continuous | Affected$ Mountain.YouCtrl | AddAbility$ ABDealDamage | AffectedZone$ Battlefield
 SVar:ABDealDamage:AB$ DealDamage | Cost$ T | ValidTgts$ Creature,Player | TgtPrompt$ Select target creature or player | NumDmg$ 1 | SpellDescription$ Deal 1 damage to target creature or player
+SVar:Damage:Mountains you control have '{T}: This land deals 1 damage to target creature or player.
 SVar:X:Count$Valid Mountain.YouCtrl
 SVar:PlayMain1:TRUE
 SVar:Rarity:Mythic
diff --git a/src/main/java/forge/card/cardFactory/CardFactory_Planeswalkers.java b/src/main/java/forge/card/cardFactory/CardFactory_Planeswalkers.java
index 06870712a15..3230738d763 100644
--- a/src/main/java/forge/card/cardFactory/CardFactory_Planeswalkers.java
+++ b/src/main/java/forge/card/cardFactory/CardFactory_Planeswalkers.java
@@ -57,6 +57,7 @@ public class CardFactory_Planeswalkers {
                     card.getBaseLoyalty()));
         }
 
+        /*
         // *************** START *********** START **************************
         if (cardName.equals("Elspeth, Knight-Errant")) {
             // computer only plays ability 1 and 3, put 1/1 Soldier in play and
@@ -216,6 +217,8 @@ public class CardFactory_Planeswalkers {
         }
         // *************** END ************ END **************************
 
+*/
+        
         // *************** START *********** START **************************
         else if (cardName.equals("Ajani Goldmane")) {
             // computer only plays ability 1 and 3, gain life and put X/X token