diff --git a/Mage/src/main/java/mage/Mana.java b/Mage/src/main/java/mage/Mana.java
index 79a36018a96..5f4c1995646 100644
--- a/Mage/src/main/java/mage/Mana.java
+++ b/Mage/src/main/java/mage/Mana.java
@@ -671,7 +671,7 @@ public class Mana implements Comparable<Mana>, Serializable, Copyable<Mana> {
         }
 
         // normal mana
-        if (colorless < 20) {
+        if (colorless < 6) {
             for (int i = 0; i < colorless; i++) {
                 sbMana.append("{C}");
             }
diff --git a/Mage/src/main/java/mage/abilities/common/EntersBattlefieldOneOrMoreTriggeredAbility.java b/Mage/src/main/java/mage/abilities/common/EntersBattlefieldOneOrMoreTriggeredAbility.java
index ff689e33093..9e2f49966e8 100644
--- a/Mage/src/main/java/mage/abilities/common/EntersBattlefieldOneOrMoreTriggeredAbility.java
+++ b/Mage/src/main/java/mage/abilities/common/EntersBattlefieldOneOrMoreTriggeredAbility.java
@@ -71,13 +71,13 @@ public class EntersBattlefieldOneOrMoreTriggeredAbility extends TriggeredAbility
     }
 
     private String generateTriggerPhrase() {
-        StringBuilder sb = new StringBuilder("Whenever one or more " + this.filterPermanent.getMessage() + " enter the battlefield under ");
+        StringBuilder sb = new StringBuilder("Whenever one or more " + this.filterPermanent.getMessage());
         switch (targetController) {
             case YOU:
-                sb.append("your control, ");
+                sb.append(" you control enter, ");
                 break;
             case OPPONENT:
-                sb.append("an opponent's control, ");
+                sb.append(" enter under an opponent's control, ");
                 break;
             default:
                 throw new UnsupportedOperationException();
diff --git a/Mage/src/main/java/mage/abilities/condition/common/SourceMatchesFilterCondition.java b/Mage/src/main/java/mage/abilities/condition/common/SourceMatchesFilterCondition.java
index f0ab7eaa1b7..570ce68ed00 100644
--- a/Mage/src/main/java/mage/abilities/condition/common/SourceMatchesFilterCondition.java
+++ b/Mage/src/main/java/mage/abilities/condition/common/SourceMatchesFilterCondition.java
@@ -13,7 +13,7 @@ import mage.game.permanent.Permanent;
  */
 public class SourceMatchesFilterCondition implements Condition {
 
-    private final FilterPermanent FILTER;
+    private final FilterPermanent filter;
     private final String text;
 
     public SourceMatchesFilterCondition(FilterPermanent filter) {
@@ -24,14 +24,14 @@ public class SourceMatchesFilterCondition implements Condition {
         if (filter == null) {
             throw new IllegalArgumentException("Wrong code usage: filter param can't be empty");
         }
-        this.FILTER = filter;
+        this.filter = filter;
         this.text = text;
     }
 
     @Override
     public boolean apply(Game game, Ability source) {
         Permanent permanent = source.getSourcePermanentOrLKI(game);
-        return FILTER.match(permanent, permanent.getControllerId(), source, game);
+        return filter.match(permanent, permanent.getControllerId(), source, game);
     }
 
     @Override
@@ -39,6 +39,6 @@ public class SourceMatchesFilterCondition implements Condition {
         if (text != null) {
             return text;
         }
-        return super.toString();
+        return filter.toString();
     }
 }
diff --git a/Mage/src/main/java/mage/abilities/effects/common/GainsChoiceOfAbilitiesEffect.java b/Mage/src/main/java/mage/abilities/effects/common/GainsChoiceOfAbilitiesEffect.java
index 7fec44185a2..1113997c767 100644
--- a/Mage/src/main/java/mage/abilities/effects/common/GainsChoiceOfAbilitiesEffect.java
+++ b/Mage/src/main/java/mage/abilities/effects/common/GainsChoiceOfAbilitiesEffect.java
@@ -1,4 +1,3 @@
-
 package mage.abilities.effects.common;
 
 import mage.abilities.Ability;
@@ -49,7 +48,7 @@ public class GainsChoiceOfAbilitiesEffect extends OneShotEffect {
         this.includeEnd = includeEnd;
         this.abilityMap = new LinkedHashMap<>();
         for (Ability ability : abilities) {
-            this.abilityMap.put(ability.getRule(), ability);
+            this.abilityMap.put(CardUtil.stripReminderText(ability.getRule()), ability);
         }
     }
 
@@ -138,4 +137,4 @@ public class GainsChoiceOfAbilitiesEffect extends OneShotEffect {
         }
         return sb.toString();
     }
-}
\ No newline at end of file
+}
diff --git a/Mage/src/main/java/mage/abilities/effects/common/ReturnFromGraveyardToBattlefieldWithCounterTargetEffect.java b/Mage/src/main/java/mage/abilities/effects/common/ReturnFromGraveyardToBattlefieldWithCounterTargetEffect.java
index 510ee45c48d..1410e327387 100644
--- a/Mage/src/main/java/mage/abilities/effects/common/ReturnFromGraveyardToBattlefieldWithCounterTargetEffect.java
+++ b/Mage/src/main/java/mage/abilities/effects/common/ReturnFromGraveyardToBattlefieldWithCounterTargetEffect.java
@@ -49,17 +49,18 @@ public class ReturnFromGraveyardToBattlefieldWithCounterTargetEffect extends Ret
 
     private String makeText(Counter counter, boolean additional) {
         StringBuilder sb = new StringBuilder(" with ");
-        if (additional) {
-            sb.append(CardUtil.numberToText(counter.getCount(), "an"));
-            sb.append(" additional");
+        if (counter.getCount() == 1) {
+            if (additional) {
+                sb.append("an additional ").append(counter.getName());
+            } else {
+                sb.append(CardUtil.addArticle(counter.getName()));
+            }
+            sb.append(" counter");
         } else {
-            sb.append(CardUtil.numberToText(counter.getCount(), "a"));
-        }
-        sb.append(' ');
-        sb.append(counter.getName());
-        sb.append(" counter");
-        if (counter.getCount() != 1) {
-            sb.append('s');
+            sb.append(CardUtil.numberToText(counter.getCount()));
+            sb.append(additional ? " additional" : " ");
+            sb.append(counter.getName());
+            sb.append(" counters");
         }
         return sb.toString();
     }