diff --git a/Mage.Sets/src/mage/cards/b/Blindblast.java b/Mage.Sets/src/mage/cards/b/Blindblast.java
index 963e4410811..4d6abe5a479 100644
--- a/Mage.Sets/src/mage/cards/b/Blindblast.java
+++ b/Mage.Sets/src/mage/cards/b/Blindblast.java
@@ -1,5 +1,6 @@
 package mage.cards.b;
 
+import java.util.UUID;
 import mage.abilities.effects.common.DamageTargetEffect;
 import mage.abilities.effects.common.DrawCardSourceControllerEffect;
 import mage.abilities.effects.common.combat.CantBlockTargetEffect;
@@ -9,8 +10,6 @@ import mage.constants.CardType;
 import mage.constants.Duration;
 import mage.target.common.TargetCreaturePermanent;
 
-import java.util.UUID;
-
 /**
  * @author TheElk801
  */
@@ -23,7 +22,7 @@ public final class Blindblast extends CardImpl {
         this.getSpellAbility().addEffect(new DamageTargetEffect(1));
         this.getSpellAbility().addEffect(new CantBlockTargetEffect(
                 Duration.EndOfTurn
-        ).setText("That creature can't block this turn. "));
+        ).setText("That creature can't block this turn"));
         this.getSpellAbility().addTarget(new TargetCreaturePermanent());
 
         // Draw a card.
diff --git a/Mage.Sets/src/mage/cards/b/BurningProphet.java b/Mage.Sets/src/mage/cards/b/BurningProphet.java
index 99085c2af78..1fd95238a17 100644
--- a/Mage.Sets/src/mage/cards/b/BurningProphet.java
+++ b/Mage.Sets/src/mage/cards/b/BurningProphet.java
@@ -1,5 +1,6 @@
 package mage.cards.b;
 
+import java.util.UUID;
 import mage.MageInt;
 import mage.abilities.Ability;
 import mage.abilities.common.SpellCastControllerTriggeredAbility;
@@ -12,8 +13,6 @@ import mage.constants.Duration;
 import mage.constants.SubType;
 import mage.filter.StaticFilters;
 
-import java.util.UUID;
-
 /**
  * @author TheElk801
  */
@@ -32,7 +31,7 @@ public final class BurningProphet extends CardImpl {
                 new BoostSourceEffect(
                         1, 0, Duration.EndOfTurn
                 ).setText("{this} gets +1/+0 until end of turn, then"),
-                StaticFilters.FILTER_SPELL_NON_CREATURE, false
+                StaticFilters.FILTER_SPELL_A_NON_CREATURE, false
         );
         ability.addEffect(new ScryEffect(1));
         this.addAbility(ability);
diff --git a/Mage.Sets/src/mage/cards/c/ChandrasPyrohelix.java b/Mage.Sets/src/mage/cards/c/ChandrasPyrohelix.java
index 7e31f1a07c2..f2520c040c5 100644
--- a/Mage.Sets/src/mage/cards/c/ChandrasPyrohelix.java
+++ b/Mage.Sets/src/mage/cards/c/ChandrasPyrohelix.java
@@ -1,4 +1,3 @@
-
 package mage.cards.c;
 
 import java.util.UUID;
@@ -16,11 +15,11 @@ import mage.target.common.TargetAnyTargetAmount;
 public final class ChandrasPyrohelix extends CardImpl {
 
     public ChandrasPyrohelix(UUID ownerId, CardSetInfo setInfo) {
-        super(ownerId,setInfo,new CardType[]{CardType.INSTANT},"{1}{R}");
+        super(ownerId, setInfo, new CardType[]{CardType.INSTANT}, "{1}{R}");
 
-        // Chandra's Pyrohelix deals 2 damage divided as you choose among one or two target creatures and/or players.
+        // Chandra's Pyrohelix deals 2 damage divided as you choose among one or two targets.
         Effect effect = new DamageMultiEffect(2);
-        effect.setText("{this} deals 2 damage divided as you choose among one or two target creatures and/or players");
+        effect.setText("{this} deals 2 damage divided as you choose among one or two targets");
         this.getSpellAbility().addEffect(effect);
         this.getSpellAbility().addTarget(new TargetAnyTargetAmount(2));
     }
diff --git a/Mage.Sets/src/mage/cards/h/HonorTheGodPharaoh.java b/Mage.Sets/src/mage/cards/h/HonorTheGodPharaoh.java
index 1f8f365df05..654318e1ed3 100644
--- a/Mage.Sets/src/mage/cards/h/HonorTheGodPharaoh.java
+++ b/Mage.Sets/src/mage/cards/h/HonorTheGodPharaoh.java
@@ -1,5 +1,6 @@
 package mage.cards.h;
 
+import java.util.UUID;
 import mage.abilities.costs.common.DiscardCardCost;
 import mage.abilities.effects.common.DrawCardSourceControllerEffect;
 import mage.abilities.effects.keyword.AmassEffect;
@@ -7,8 +8,6 @@ import mage.cards.CardImpl;
 import mage.cards.CardSetInfo;
 import mage.constants.CardType;
 
-import java.util.UUID;
-
 /**
  * @author TheElk801
  */
@@ -21,7 +20,7 @@ public final class HonorTheGodPharaoh extends CardImpl {
         this.getSpellAbility().addCost(new DiscardCardCost(false));
 
         // Draw two cards. Amass 1.
-        this.getSpellAbility().addEffect(new DrawCardSourceControllerEffect(2).setText("draw two cards."));
+        this.getSpellAbility().addEffect(new DrawCardSourceControllerEffect(2).setText("draw two cards"));
         this.getSpellAbility().addEffect(new AmassEffect(1));
     }
 
diff --git a/Mage.Sets/src/mage/cards/s/SaheeliSublimeArtificer.java b/Mage.Sets/src/mage/cards/s/SaheeliSublimeArtificer.java
index 484e5e423d7..bb20999d03e 100644
--- a/Mage.Sets/src/mage/cards/s/SaheeliSublimeArtificer.java
+++ b/Mage.Sets/src/mage/cards/s/SaheeliSublimeArtificer.java
@@ -1,5 +1,6 @@
 package mage.cards.s;
 
+import java.util.UUID;
 import mage.abilities.Ability;
 import mage.abilities.LoyaltyAbility;
 import mage.abilities.common.PlaneswalkerEntersWithLoyaltyCountersAbility;
@@ -26,8 +27,6 @@ import mage.target.TargetPermanent;
 import mage.target.targetpointer.FixedTarget;
 import mage.util.functions.EmptyApplyToPermanent;
 
-import java.util.UUID;
-
 /**
  * @author TheElk801
  */
@@ -56,7 +55,7 @@ public final class SaheeliSublimeArtificer extends CardImpl {
 
         // Whenever you cast a noncreature spell, create a 1/1 colorless Servo artifact creature token.
         this.addAbility(new SpellCastControllerTriggeredAbility(
-                new CreateTokenEffect(new ServoToken()), StaticFilters.FILTER_SPELL_NON_CREATURE, false
+                new CreateTokenEffect(new ServoToken()), StaticFilters.FILTER_SPELL_A_NON_CREATURE, false
         ));
 
         // -2: Target artifact you control becomes a copy of another target artifact or creature you control until end of turn, except it's an artifact in addition to its other types.
@@ -84,8 +83,8 @@ class SaheeliSublimeArtificerEffect extends OneShotEffect {
 
     SaheeliSublimeArtificerEffect() {
         super(Outcome.Benefit);
-        staticText = "Target artifact you control becomes a copy of another target artifact or creature you control" +
-                " until end of turn, except it's an artifact in addition to its other types.";
+        staticText = "Target artifact you control becomes a copy of another target artifact or creature you control"
+                + " until end of turn, except it's an artifact in addition to its other types.";
     }
 
     private SaheeliSublimeArtificerEffect(final SaheeliSublimeArtificerEffect effect) {
@@ -111,4 +110,4 @@ class SaheeliSublimeArtificerEffect extends OneShotEffect {
         }
         return true;
     }
-}
\ No newline at end of file
+}
diff --git a/Mage.Sets/src/mage/cards/s/SamutTyrantSmasher.java b/Mage.Sets/src/mage/cards/s/SamutTyrantSmasher.java
index 4ff56c00d31..8468e13ebb7 100644
--- a/Mage.Sets/src/mage/cards/s/SamutTyrantSmasher.java
+++ b/Mage.Sets/src/mage/cards/s/SamutTyrantSmasher.java
@@ -1,5 +1,6 @@
 package mage.cards.s;
 
+import java.util.UUID;
 import mage.abilities.Ability;
 import mage.abilities.LoyaltyAbility;
 import mage.abilities.common.PlaneswalkerEntersWithLoyaltyCountersAbility;
@@ -18,8 +19,6 @@ import mage.constants.SuperType;
 import mage.filter.StaticFilters;
 import mage.target.common.TargetCreaturePermanent;
 
-import java.util.UUID;
-
 /**
  * @author TheElk801
  */
@@ -44,7 +43,7 @@ public final class SamutTyrantSmasher extends CardImpl {
         ).setText("target creature gets +2/+1"), -1);
         ability.addEffect(new GainAbilityTargetEffect(
                 HasteAbility.getInstance(), Duration.EndOfTurn
-        ).setText("and gains haste until end of turn. "));
+        ).setText("and gains haste until end of turn"));
         ability.addEffect(new ScryEffect(1));
         ability.addTarget(new TargetCreaturePermanent());
         this.addAbility(ability);
diff --git a/Mage.Sets/src/mage/cards/s/SamutsSprint.java b/Mage.Sets/src/mage/cards/s/SamutsSprint.java
index 28862ab5737..1d631dd6027 100644
--- a/Mage.Sets/src/mage/cards/s/SamutsSprint.java
+++ b/Mage.Sets/src/mage/cards/s/SamutsSprint.java
@@ -1,5 +1,6 @@
 package mage.cards.s;
 
+import java.util.UUID;
 import mage.abilities.effects.common.continuous.BoostTargetEffect;
 import mage.abilities.effects.common.continuous.GainAbilityTargetEffect;
 import mage.abilities.effects.keyword.ScryEffect;
@@ -10,8 +11,6 @@ import mage.constants.CardType;
 import mage.constants.Duration;
 import mage.target.common.TargetCreaturePermanent;
 
-import java.util.UUID;
-
 /**
  * @author TheElk801
  */
@@ -26,7 +25,7 @@ public final class SamutsSprint extends CardImpl {
         ).setText("target creature gets +2/+1"));
         this.getSpellAbility().addEffect(new GainAbilityTargetEffect(
                 HasteAbility.getInstance(), Duration.EndOfTurn
-        ).setText("and gains haste until end of turn."));
+        ).setText("and gains haste until end of turn"));
         this.getSpellAbility().addEffect(new ScryEffect(1));
         this.getSpellAbility().addTarget(new TargetCreaturePermanent());
     }
diff --git a/Mage.Sets/src/mage/cards/s/SpellgorgerWeird.java b/Mage.Sets/src/mage/cards/s/SpellgorgerWeird.java
index 9b0625f2535..263a47f6afb 100644
--- a/Mage.Sets/src/mage/cards/s/SpellgorgerWeird.java
+++ b/Mage.Sets/src/mage/cards/s/SpellgorgerWeird.java
@@ -1,5 +1,6 @@
 package mage.cards.s;
 
+import java.util.UUID;
 import mage.MageInt;
 import mage.abilities.common.SpellCastControllerTriggeredAbility;
 import mage.abilities.effects.common.counter.AddCountersSourceEffect;
@@ -10,8 +11,6 @@ import mage.constants.SubType;
 import mage.counters.CounterType;
 import mage.filter.StaticFilters;
 
-import java.util.UUID;
-
 /**
  * @author TheElk801
  */
@@ -27,7 +26,7 @@ public final class SpellgorgerWeird extends CardImpl {
         // Whenever you cast a noncreature spell, put a +1/+1 counter on Spellgorger Weird.
         this.addAbility(new SpellCastControllerTriggeredAbility(
                 new AddCountersSourceEffect(CounterType.P1P1.createInstance()),
-                StaticFilters.FILTER_SPELL_NON_CREATURE, false
+                StaticFilters.FILTER_SPELL_A_NON_CREATURE, false
         ));
     }
 
diff --git a/Mage.Sets/src/mage/cards/t/TenthDistrictLegionnaire.java b/Mage.Sets/src/mage/cards/t/TenthDistrictLegionnaire.java
index 0391f1e5fa5..3f1dd366522 100644
--- a/Mage.Sets/src/mage/cards/t/TenthDistrictLegionnaire.java
+++ b/Mage.Sets/src/mage/cards/t/TenthDistrictLegionnaire.java
@@ -1,5 +1,6 @@
 package mage.cards.t;
 
+import java.util.UUID;
 import mage.MageInt;
 import mage.abilities.Ability;
 import mage.abilities.effects.common.counter.AddCountersSourceEffect;
@@ -12,8 +13,6 @@ import mage.constants.CardType;
 import mage.constants.SubType;
 import mage.counters.CounterType;
 
-import java.util.UUID;
-
 /**
  * @author TheElk801
  */
@@ -34,7 +33,7 @@ public final class TenthDistrictLegionnaire extends CardImpl {
         Ability ability = new HeroicAbility(new AddCountersSourceEffect(
                 CounterType.P1P1.createInstance()
         ), false, false);
-        ability.addEffect(new ScryEffect(1));
+        ability.addEffect(new ScryEffect(1).setText(", then scry 1"));
         this.addAbility(ability);
     }
 
diff --git a/Mage/src/main/java/mage/filter/StaticFilters.java b/Mage/src/main/java/mage/filter/StaticFilters.java
index b40ed887021..f6439e21255 100644
--- a/Mage/src/main/java/mage/filter/StaticFilters.java
+++ b/Mage/src/main/java/mage/filter/StaticFilters.java
@@ -460,6 +460,12 @@ public final class StaticFilters {
         FILTER_SPELL_NON_CREATURE.setLockedFilter(true);
     }
 
+    public static final FilterSpell FILTER_SPELL_A_NON_CREATURE = (FilterSpell) new FilterSpell("a noncreature spell").add(Predicates.not(new CardTypePredicate(CardType.CREATURE)));
+
+    static {
+        FILTER_SPELL_A_NON_CREATURE.setLockedFilter(true);
+    }
+
     public static final FilterSpell FILTER_SPELL = new FilterSpell();
 
     static {