diff --git a/Mage.Sets/src/mage/cards/e/ElementalSpectacle.java b/Mage.Sets/src/mage/cards/e/ElementalSpectacle.java
index 3d1d0e729c2..8435f31d33e 100644
--- a/Mage.Sets/src/mage/cards/e/ElementalSpectacle.java
+++ b/Mage.Sets/src/mage/cards/e/ElementalSpectacle.java
@@ -1,19 +1,19 @@
 package mage.cards.e;
 
-import java.util.UUID;
-
 import mage.abilities.dynamicvalue.common.ColorsAmongControlledPermanentsCount;
 import mage.abilities.dynamicvalue.common.CreaturesYouControlCount;
 import mage.abilities.effects.common.CreateTokenEffect;
 import mage.abilities.effects.common.GainLifeEffect;
+import mage.abilities.hint.common.CreaturesYouControlHint;
 import mage.cards.CardImpl;
 import mage.cards.CardSetInfo;
 import mage.constants.AbilityWord;
 import mage.constants.CardType;
 import mage.game.permanent.token.OmnathElementalToken;
 
+import java.util.UUID;
+
 /**
- *
  * @author muz
  */
 public final class ElementalSpectacle extends CardImpl {
@@ -23,13 +23,14 @@ public final class ElementalSpectacle extends CardImpl {
 
         // Vivid -- Create a number of 5/5 red and green Elemental creature tokens equal to the number of colors among permanents you control. Then you gain life equal to the number of creatures you control.
         this.getSpellAbility().addEffect(new CreateTokenEffect(
-            new OmnathElementalToken(),
-            ColorsAmongControlledPermanentsCount.ALL_PERMANENTS
-        ));
+                new OmnathElementalToken(), ColorsAmongControlledPermanentsCount.ALL_PERMANENTS
+        ).setText("create a number of 5/5 red and green Elemental creature tokens " +
+                "equal to the number of colors among permanents you control"));
         this.getSpellAbility().addEffect(new GainLifeEffect(CreaturesYouControlCount.PLURAL)
-            .setText(", then you gain life equal to the number of creatures you control"));
+                .setText("Then you gain life equal to the number of creatures you control"));
         this.getSpellAbility().setAbilityWord(AbilityWord.VIVID);
         this.getSpellAbility().addHint(ColorsAmongControlledPermanentsCount.ALL_PERMANENTS.getHint());
+        this.getSpellAbility().addHint(CreaturesYouControlHint.instance);
     }
 
     private ElementalSpectacle(final ElementalSpectacle card) {
diff --git a/Mage.Sets/src/mage/cards/g/GlissaSunslayer.java b/Mage.Sets/src/mage/cards/g/GlissaSunslayer.java
index 91ee16b5ae6..25de8e777a6 100644
--- a/Mage.Sets/src/mage/cards/g/GlissaSunslayer.java
+++ b/Mage.Sets/src/mage/cards/g/GlissaSunslayer.java
@@ -12,7 +12,9 @@ import mage.abilities.keyword.DeathtouchAbility;
 import mage.abilities.keyword.FirstStrikeAbility;
 import mage.cards.CardImpl;
 import mage.cards.CardSetInfo;
-import mage.constants.*;
+import mage.constants.CardType;
+import mage.constants.SubType;
+import mage.constants.SuperType;
 import mage.target.TargetPermanent;
 import mage.target.common.TargetEnchantmentPermanent;
 
@@ -41,8 +43,10 @@ public final class GlissaSunslayer extends CardImpl {
 
         // Whenever Glissa Sunslayer deals combat damage to a player, choose one —
         // • You draw a card and you lose 1 life.
-        Ability ability = new DealsCombatDamageToAPlayerTriggeredAbility(new DrawCardSourceControllerEffect(1).setText("you draw a card"), false, false);
-        ability.addEffect(new LoseLifeSourceControllerEffect(1).concatBy("and"));
+        Ability ability = new DealsCombatDamageToAPlayerTriggeredAbility(
+                new DrawCardSourceControllerEffect(1, true), false, false
+        );
+        ability.addEffect(new LoseLifeSourceControllerEffect(1).setText("and lose 1 life"));
 
         // • Destroy target enchantment.
         Mode mode = new Mode(new DestroyTargetEffect());
@@ -65,4 +69,4 @@ public final class GlissaSunslayer extends CardImpl {
     public GlissaSunslayer copy() {
         return new GlissaSunslayer(this);
     }
-}
\ No newline at end of file
+}
diff --git a/Mage.Sets/src/mage/cards/i/Impulsivity.java b/Mage.Sets/src/mage/cards/i/Impulsivity.java
index b703a77b8f5..3c3acbda049 100644
--- a/Mage.Sets/src/mage/cards/i/Impulsivity.java
+++ b/Mage.Sets/src/mage/cards/i/Impulsivity.java
@@ -11,7 +11,8 @@ import mage.cards.CardSetInfo;
 import mage.constants.CardType;
 import mage.constants.CastManaAdjustment;
 import mage.constants.SubType;
-import mage.filter.StaticFilters;
+import mage.filter.FilterCard;
+import mage.filter.common.FilterInstantOrSorceryCard;
 import mage.target.common.TargetCardInGraveyard;
 
 import java.util.UUID;
@@ -21,6 +22,8 @@ import java.util.UUID;
  */
 public final class Impulsivity extends CardImpl {
 
+    private static final FilterCard filter = new FilterInstantOrSorceryCard("instant or sorcery card from a graveyard");
+
     public Impulsivity(UUID ownerId, CardSetInfo setInfo) {
         super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{6}{R}");
 
@@ -33,7 +36,7 @@ public final class Impulsivity extends CardImpl {
         Ability ability = new EntersBattlefieldTriggeredAbility(
                 new MayCastTargetCardEffect(CastManaAdjustment.WITHOUT_PAYING_MANA_COST, true)
         );
-        ability.addTarget(new TargetCardInGraveyard(StaticFilters.FILTER_CARD_INSTANT_OR_SORCERY));
+        ability.addTarget(new TargetCardInGraveyard(filter));
         this.addAbility(ability);
 
         // Encore {7}{R}{R}
diff --git a/Mage.Sets/src/mage/cards/w/WickersmithsTools.java b/Mage.Sets/src/mage/cards/w/WickersmithsTools.java
index 9d59ca6dd24..969bea9bf3f 100644
--- a/Mage.Sets/src/mage/cards/w/WickersmithsTools.java
+++ b/Mage.Sets/src/mage/cards/w/WickersmithsTools.java
@@ -1,7 +1,5 @@
 package mage.cards.w;
 
-import java.util.UUID;
-
 import mage.abilities.Ability;
 import mage.abilities.TriggeredAbilityImpl;
 import mage.abilities.common.SimpleActivatedAbility;
@@ -22,8 +20,9 @@ import mage.game.events.GameEvent;
 import mage.game.permanent.Permanent;
 import mage.game.permanent.token.ScarecrowToken;
 
+import java.util.UUID;
+
 /**
- *
  * @author muz
  */
 public final class WickersmithsTools extends CardImpl {
@@ -38,7 +37,10 @@ public final class WickersmithsTools extends CardImpl {
         this.addAbility(new AnyColorManaAbility());
 
         // {5}, {T}, Sacrifice this artifact: Create X tapped 2/2 colorless Scarecrow artifact creature tokens, where X is the number of charge counters on this artifact.
-        Ability ability = new SimpleActivatedAbility(new CreateTokenEffect(new ScarecrowToken(), new CountersSourceCount(CounterType.CHARGE)), new ManaCostsImpl<>("{5}"));
+        Ability ability = new SimpleActivatedAbility(new CreateTokenEffect(
+                new ScarecrowToken(), new CountersSourceCount(CounterType.CHARGE)
+        ).setText("create X tapped 2/2 colorless Scarecrow artifact creature tokens, " +
+                "where X is the number of charge counters on {this}"), new ManaCostsImpl<>("{5}"));
         ability.addCost(new TapSourceCost());
         ability.addCost(new SacrificeSourceCost());
         this.addAbility(ability);
diff --git a/Mage/src/main/java/mage/abilities/dynamicvalue/common/ColorsAmongControlledPermanentsCount.java b/Mage/src/main/java/mage/abilities/dynamicvalue/common/ColorsAmongControlledPermanentsCount.java
index 1fa1bfd017e..c98359b3d17 100644
--- a/Mage/src/main/java/mage/abilities/dynamicvalue/common/ColorsAmongControlledPermanentsCount.java
+++ b/Mage/src/main/java/mage/abilities/dynamicvalue/common/ColorsAmongControlledPermanentsCount.java
@@ -45,7 +45,7 @@ public enum ColorsAmongControlledPermanentsCount implements DynamicValue {
 
     @Override
     public String getMessage() {
-        return "for each color among " + filter.getMessage();
+        return "color among " + filter.getMessage();
     }
 
     @Override