miscellaneous text fixes

Mage.Sets/src/mage/cards/a/AetherFigment.java

@@ -1,7 +1,5 @@
-
 package mage.cards.a;
 
-import java.util.UUID;
 import mage.MageInt;
 import mage.abilities.Ability;
 import mage.abilities.common.EntersBattlefieldAbility;
@@ -15,21 +13,20 @@ import mage.constants.CardType;
 import mage.constants.SubType;
 import mage.counters.CounterType;
 
+import java.util.UUID;
+
 /**
  * @author nantuko, BetaSteward_at_googlemail.com
  */
 public final class AetherFigment extends CardImpl {
 
     public AetherFigment(UUID ownerId, CardSetInfo setInfo) {
-        super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{1}{U}");
+        super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{1}{U}");
         this.subtype.add(SubType.ILLUSION);
 
         this.power = new MageInt(1);
         this.toughness = new MageInt(1);
 
-        // Aether Figment can't be blocked.
-        this.addAbility(new CantBeBlockedSourceAbility());
-
         // Kicker {3}
         this.addAbility(new KickerAbility("{3}"));
 
@@ -40,6 +37,9 @@ public final class AetherFigment extends CardImpl {
                 "If {this} was kicked, it enters with two +1/+1 counters on it.",
                 "");
         this.addAbility(ability);
+
+        // Aether Figment can't be blocked.
+        this.addAbility(new CantBeBlockedSourceAbility());
     }
 
     private AetherFigment(final AetherFigment card) {

Mage.Sets/src/mage/cards/g/GuidelightPathmaker.java

@@ -59,7 +59,7 @@ class GuidelightPathmakerEffect extends OneShotEffect {
         super(Outcome.Benefit);
         staticText = "search your library for an artifact card and reveal it. " +
                 "Put it onto the battlefield if its mana value is 2 or less. " +
-                "Otherwise, put it into your hand. Then shuffle";
+                "Otherwise, put it into your hand. If you search your library this way, shuffle";
     }
 
     private GuidelightPathmakerEffect(final GuidelightPathmakerEffect effect) {

Mage.Sets/src/mage/cards/m/Melee.java

@@ -45,7 +45,7 @@ public final class Melee extends CardImpl {
         // Cast Melee only during your turn and only during combat before blockers are declared.
         this.addAbility(new CastOnlyDuringPhaseStepSourceAbility(
                 null, null, condition,
-                "Cast this spell only during your turn and only during combat before blockers are declared"
+                "Cast this spell only during combat on your turn before blockers are declared"
         ).addHint(hint));
 
         // You choose which creatures block this combat and how those creatures block.

Mage.Sets/src/mage/cards/s/SavageBeating.java

@@ -28,7 +28,7 @@ public final class SavageBeating extends CardImpl {
 
         // Cast Savage Beating only during your turn and only during combat.
         this.addAbility(new CastOnlyDuringPhaseStepSourceAbility(TurnPhase.COMBAT, null, MyTurnCondition.instance,
-                "Cast this spell only during your turn and only during combat"));
+                "Cast this spell only during combat on your turn"));
 
         // Choose one - Creatures you control gain double strike until end of turn;
         this.getSpellAbility().addEffect(new GainAbilityControlledEffect(DoubleStrikeAbility.getInstance(), Duration.EndOfTurn, StaticFilters.FILTER_PERMANENT_CREATURES, false));

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

@@ -142,7 +142,7 @@ public class DevourEffect extends ReplacementEffectImpl {
             text += devourFactor;
         }
 
-        text += " <i>(As this enters, you may sacrifice any number of "
+        text += " <i>(As this creature enters, you may sacrifice any number of "
                 + filterMessage + "s. "
                 + "This creature enters with ";