diff --git a/Mage.Sets/src/mage/sets/magic2012/AdaptiveAutomaton.java b/Mage.Sets/src/mage/sets/magic2012/AdaptiveAutomaton.java
index 8de273b2c74..4a29decd7a8 100644
--- a/Mage.Sets/src/mage/sets/magic2012/AdaptiveAutomaton.java
+++ b/Mage.Sets/src/mage/sets/magic2012/AdaptiveAutomaton.java
@@ -29,6 +29,7 @@ package mage.sets.magic2012;
 
 import mage.Constants;
 import mage.Constants.CardType;
+import mage.Constants.Duration;
 import mage.Constants.Rarity;
 import mage.MageInt;
 import mage.abilities.Ability;
@@ -47,8 +48,6 @@ import mage.sets.Sets;
 
 import java.util.UUID;
 
-import static mage.Constants.Duration;
-
 /**
  * @author nantuko
  */
@@ -83,8 +82,8 @@ public class AdaptiveAutomaton extends CardImpl<AdaptiveAutomaton> {
 class AdaptiveAutomatonEffect extends OneShotEffect<AdaptiveAutomatonEffect> {
 
 	public AdaptiveAutomatonEffect() {
-		super(Constants.Outcome.DrawCard);
-		staticText = "As Adaptive Automaton enters the battlefield, choose a creature type";
+		super(Constants.Outcome.BoostCreature);
+		staticText = "As {this} enters the battlefield, choose a creature type";
 	}
 
 	public AdaptiveAutomatonEffect(final AdaptiveAutomatonEffect effect) {
@@ -116,7 +115,7 @@ class AdaptiveAutomatonEffect extends OneShotEffect<AdaptiveAutomatonEffect> {
 class AdaptiveAutomatonAddSubtypeEffect extends ContinuousEffectImpl<AdaptiveAutomatonAddSubtypeEffect> {
 	public AdaptiveAutomatonAddSubtypeEffect() {
 		super(Duration.WhileOnBattlefield, Constants.Layer.TypeChangingEffects_4, Constants.SubLayer.NA, Constants.Outcome.Benefit);
-		staticText = "Adaptive Automaton is the chosen type in addition to its other types";
+		staticText = "{this} is the chosen type in addition to its other types";
 	}
 
 	public AdaptiveAutomatonAddSubtypeEffect(final AdaptiveAutomatonAddSubtypeEffect effect) {
diff --git a/Mage/src/mage/abilities/effects/Effects.java b/Mage/src/mage/abilities/effects/Effects.java
index bad39ef3a72..a37d66e5e1e 100644
--- a/Mage/src/mage/abilities/effects/Effects.java
+++ b/Mage/src/mage/abilities/effects/Effects.java
@@ -33,7 +33,6 @@ import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
 import mage.Constants.Outcome;
-import mage.abilities.Ability;
 import mage.abilities.Mode;
 
 /**
diff --git a/Mage/src/mage/abilities/effects/common/SkipEnchantedUntapEffect.java b/Mage/src/mage/abilities/effects/common/SkipEnchantedUntapEffect.java
index 1a5749e277f..32c6451ab8b 100644
--- a/Mage/src/mage/abilities/effects/common/SkipEnchantedUntapEffect.java
+++ b/Mage/src/mage/abilities/effects/common/SkipEnchantedUntapEffect.java
@@ -14,7 +14,7 @@ public class SkipEnchantedUntapEffect extends ReplacementEffectImpl<SkipEnchante
 
 	public SkipEnchantedUntapEffect() {
 		super(Constants.Duration.WhileOnBattlefield, Constants.Outcome.Detriment);
-		staticText = "Enchanted permanent doesn't untap during its controller's untap step.";
+		staticText = "Enchanted permanent doesn't untap during its controller's untap step";
 	}
 
 	public SkipEnchantedUntapEffect(final SkipEnchantedUntapEffect effect) {
diff --git a/Mage/src/mage/abilities/keyword/EnchantAbility.java b/Mage/src/mage/abilities/keyword/EnchantAbility.java
index d04fa935a07..df5a0553854 100644
--- a/Mage/src/mage/abilities/keyword/EnchantAbility.java
+++ b/Mage/src/mage/abilities/keyword/EnchantAbility.java
@@ -25,7 +25,6 @@
  *  authors and should not be interpreted as representing official policies, either expressed
  *  or implied, of BetaSteward_at_googlemail.com.
  */
-
 package mage.abilities.keyword;
 
 import mage.Constants.Zone;
@@ -34,30 +33,34 @@ import mage.abilities.StaticAbility;
 /**
  *
  * @author BetaSteward_at_googlemail.com
+ * @author North
  */
 public class EnchantAbility extends StaticAbility<EnchantAbility> {
 
-	protected String targetName;
+    protected String targetName;
 
-	public EnchantAbility(String targetName) {
-		super(Zone.BATTLEFIELD, null);
-		this.targetName = targetName;
-	}
+    public EnchantAbility(String targetName) {
+        super(Zone.BATTLEFIELD, null);
+        this.targetName = targetName;
+    }
 
-	public EnchantAbility(final EnchantAbility ability) {
-		super(ability);
-		this.targetName = ability.targetName;
-	}
-
-	@Override
-	public EnchantAbility copy() {
-		return new EnchantAbility(this);
-	}
-
-	@Override
-	public String getRule() {
-		return "Enchant " + targetName;
-	}
+    public EnchantAbility(final EnchantAbility ability) {
+        super(ability);
+        this.targetName = ability.targetName;
+    }
 
+    @Override
+    public EnchantAbility copy() {
+        return new EnchantAbility(this);
+    }
 
+    @Override
+    public String getRule() {
+        StringBuilder sb = new StringBuilder();
+        sb.append("Enchant ").append(targetName);
+        if (!this.getEffects().isEmpty()) {
+            sb.append(". ").append(super.getRule());
+        }
+        return sb.toString();
+    }
 }