all text and no fix makes elk a dull boy

Mage/src/main/java/mage/abilities/condition/common/CardsInControllerGraveyardCondition.java

@@ -37,9 +37,9 @@ public class CardsInControllerGraveyardCondition implements Condition {
 
     @Override
     public String toString() {
-        return "there are " + CardUtil.numberToText(value, "one") + " or more "
+        return CardUtil.numberToText(value, "one") + " or more "
                 + (filter == null ? "cards" : filter.getMessage())
-                + " in your graveyard";
+                + " are in your graveyard";
     }
 
 }

Mage/src/main/java/mage/abilities/dynamicvalue/common/ColorsOfManaSpentToCastCount.java

@@ -70,7 +70,7 @@ public class ColorsOfManaSpentToCastCount implements DynamicValue {
 
     @Override
     public String getMessage() {
-        return "the number of colors of mana spent to cast {this}";
+        return "the number of colors of mana spent to cast this spell";
     }
 
 }

Mage/src/main/java/mage/abilities/dynamicvalue/common/DiscardCostCardManaValue.java

@@ -11,7 +11,7 @@ import mage.game.Game;
 /**
  * @author LevelX2
  */
-public enum DiscardCostCardConvertedMana implements DynamicValue {
+public enum DiscardCostCardManaValue implements DynamicValue {
     instance;
 
     @Override
@@ -26,8 +26,8 @@ public enum DiscardCostCardConvertedMana implements DynamicValue {
     }
 
     @Override
-    public DiscardCostCardConvertedMana copy() {
-        return DiscardCostCardConvertedMana.instance;
+    public DiscardCostCardManaValue copy() {
+        return DiscardCostCardManaValue.instance;
     }
 
     @Override
@@ -37,6 +37,6 @@ public enum DiscardCostCardConvertedMana implements DynamicValue {
 
     @Override
     public String getMessage() {
-        return "the discarded card's mana value";
+        return "the mana value of the discarded card";
     }
 }

Mage/src/main/java/mage/abilities/effects/common/DamageTargetEffect.java

@@ -152,9 +152,9 @@ public class DamageTargetEffect extends OneShotEffect {
         String message = amount.getMessage();
         sb.append(this.sourceName).append(" deals ");
         if (message.isEmpty() || !message.equals("1")) {
-            sb.append(amount);
+            sb.append(amount).append(' ');
         }
-        sb.append(" damage to ");
+        sb.append("damage to ");
         if (!targetDescription.isEmpty()) {
             sb.append(targetDescription);
         } else {

Mage/src/main/java/mage/abilities/effects/common/ExileTargetAndSearchGraveyardHandLibraryEffect.java

@@ -9,6 +9,7 @@ import mage.game.permanent.Permanent;
 import mage.players.Player;
 import mage.target.Target;
 import mage.target.TargetPermanent;
+import mage.util.CardUtil;
 
 import java.util.UUID;
 
@@ -60,7 +61,7 @@ public class ExileTargetAndSearchGraveyardHandLibraryEffect extends SearchTarget
     public String getText(Mode mode) {
         StringBuilder sb = new StringBuilder();
         sb.append("Exile target ").append(mode.getTargets().get(0).getTargetName()).append(". ");
-        sb.append(super.getText(mode));
+        sb.append(CardUtil.getTextWithFirstCharUpperCase(super.getText(mode)));
         return sb.toString();
     }
 }

Mage/src/main/java/mage/abilities/effects/common/search/SearchLibraryWithLessCMCPutInPlayEffect.java

@@ -12,6 +12,7 @@ import mage.filter.predicate.mageobject.ManaValuePredicate;
 import mage.game.Game;
 import mage.players.Player;
 import mage.target.common.TargetCardInLibrary;
+import mage.util.CardUtil;
 
 /**
  *
@@ -28,7 +29,7 @@ public class SearchLibraryWithLessCMCPutInPlayEffect extends OneShotEffect {
     public SearchLibraryWithLessCMCPutInPlayEffect(FilterCard filter) {
         super(Outcome.PutCreatureInPlay);
         this.filter = filter;
-        staticText = "Search your library for a " + filter.getMessage() + " with mana value X or less, put it onto the battlefield, then shuffle";
+        staticText = "Search your library for " + CardUtil.addArticle(filter.getMessage()) + " with mana value X or less, put it onto the battlefield, then shuffle";
     }
 
     public SearchLibraryWithLessCMCPutInPlayEffect(final SearchLibraryWithLessCMCPutInPlayEffect effect) {

Mage/src/main/java/mage/filter/StaticFilters.java

@@ -322,6 +322,12 @@ public final class StaticFilters {
         FILTER_CONTROLLED_PERMANENT_ARTIFACT.setLockedFilter(true);
     }
 
+    public static final FilterControlledPermanent FILTER_CONTROLLED_PERMANENT_ARTIFACTS = new FilterControlledArtifactPermanent("artifacts you control");
+
+    static {
+        FILTER_CONTROLLED_PERMANENT_ARTIFACTS.setLockedFilter(true);
+    }
+
     public static final FilterControlledPermanent FILTER_CONTROLLED_PERMANENT_ARTIFACT_AN = new FilterControlledArtifactPermanent("an artifact");
 
     static {