diff --git a/Mage.Sets/src/mage/sets/lorwyn/Goatnapper.java b/Mage.Sets/src/mage/sets/lorwyn/Goatnapper.java
index 50b2c63a7d..4a9e4707f4 100644
--- a/Mage.Sets/src/mage/sets/lorwyn/Goatnapper.java
+++ b/Mage.Sets/src/mage/sets/lorwyn/Goatnapper.java
@@ -33,6 +33,8 @@ import mage.Constants;
 import mage.Constants.CardType;
 import mage.Constants.Rarity;
 import mage.MageInt;
+import mage.abilities.Ability;
+import mage.abilities.common.EntersBattlefieldTriggeredAbility;
 import mage.abilities.effects.common.UntapTargetEffect;
 import mage.abilities.effects.common.continious.GainAbilityTargetEffect;
 import mage.abilities.effects.common.continious.GainControlTargetEffect;
@@ -64,10 +66,11 @@ public class Goatnapper extends CardImpl<Goatnapper> {
         this.color.setRed(true);
         this.power = new MageInt(2);
         this.toughness = new MageInt(2);
-        this.getSpellAbility().addTarget(new TargetPermanent(filter));
-		this.getSpellAbility().addEffect(new GainControlTargetEffect(Constants.Duration.EndOfTurn));
-		this.getSpellAbility().addEffect(new UntapTargetEffect());
-		this.getSpellAbility().addEffect(new GainAbilityTargetEffect(HasteAbility.getInstance(), Constants.Duration.EndOfTurn));
+        Ability ability = new EntersBattlefieldTriggeredAbility(new UntapTargetEffect(), false);
+        ability.addTarget(new TargetPermanent(filter));
+        ability.addEffect(new GainControlTargetEffect(Constants.Duration.EndOfTurn));
+        ability.addEffect(new GainAbilityTargetEffect(HasteAbility.getInstance(), Constants.Duration.EndOfTurn));
+        this.addAbility(ability);
     }
 
     public Goatnapper(final Goatnapper card) {
diff --git a/Mage/src/mage/game/permanent/token/ElfToken.java b/Mage/src/mage/game/permanent/token/ElfToken.java
index 60f4296d1a..5a31593ea6 100644
--- a/Mage/src/mage/game/permanent/token/ElfToken.java
+++ b/Mage/src/mage/game/permanent/token/ElfToken.java
@@ -38,7 +38,7 @@ import mage.MageInt;
 public class ElfToken extends Token {
 
 	public ElfToken() {
-		super("", "a 1/1 green Elf Warrior creature token");
+		super("", "1/1 green Elf Warrior creature token");
         cardType.add(Constants.CardType.CREATURE);
         color.setGreen(true);
         subtype.add("Elf");