diff --git a/Mage.Sets/src/mage/cards/m/MangarasBlessing.java b/Mage.Sets/src/mage/cards/m/MangarasBlessing.java
index 0ff126446a5..9fc0f218eaf 100644
--- a/Mage.Sets/src/mage/cards/m/MangarasBlessing.java
+++ b/Mage.Sets/src/mage/cards/m/MangarasBlessing.java
@@ -30,8 +30,7 @@ public final class MangarasBlessing extends CardImpl {
 
         Effect graveyardReturnNextEndEffect = new CreateDelayedTriggeredAbilityEffect(
                 new AtTheBeginOfNextEndStepDelayedTriggeredAbility(new ReturnSourceFromGraveyardToHandEffect()));
-        graveyardReturnNextEndEffect.concatBy(", and");
-        graveyardReturnNextEndEffect.setText(" you return {this} from your graveyard to your hand at the beginning of the next end step");
+        graveyardReturnNextEndEffect.setText(", and you return {this} from your graveyard to your hand at the beginning of the next end step");
 
         ability.addEffect(graveyardReturnNextEndEffect);
         this.addAbility(ability);
diff --git a/Mage.Sets/src/mage/cards/s/ScionOfCalamity.java b/Mage.Sets/src/mage/cards/s/ScionOfCalamity.java
index 7001a883edc..b3a5f6319bf 100644
--- a/Mage.Sets/src/mage/cards/s/ScionOfCalamity.java
+++ b/Mage.Sets/src/mage/cards/s/ScionOfCalamity.java
@@ -20,7 +20,7 @@ import mage.players.Player;
 import mage.target.TargetPermanent;
 
 /**
- * @author
+ * @author arcox
  */
 public final class ScionOfCalamity extends CardImpl {
 
diff --git a/Mage.Sets/src/mage/cards/s/SingerOfSwiftRivers.java b/Mage.Sets/src/mage/cards/s/SingerOfSwiftRivers.java
index 6179952fb56..77eae659653 100644
--- a/Mage.Sets/src/mage/cards/s/SingerOfSwiftRivers.java
+++ b/Mage.Sets/src/mage/cards/s/SingerOfSwiftRivers.java
@@ -20,7 +20,7 @@ import mage.filter.StaticFilters;
 import mage.target.TargetPermanent;
 
 /**
- * @author
+ * @author arcox
  */
 public final class SingerOfSwiftRivers extends CardImpl {
 
diff --git a/Mage.Sets/src/mage/cards/s/SkeletonCrew.java b/Mage.Sets/src/mage/cards/s/SkeletonCrew.java
index fe1d8697f75..2363f891e35 100644
--- a/Mage.Sets/src/mage/cards/s/SkeletonCrew.java
+++ b/Mage.Sets/src/mage/cards/s/SkeletonCrew.java
@@ -21,11 +21,11 @@ import mage.filter.predicate.Predicates;
 import mage.game.permanent.token.SkeletonPirateToken;
 
 /**
- * @author
+ * @author arcox
  */
 public final class SkeletonCrew extends CardImpl {
 
-    private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("Skeleton or Pirate creatures");
+    private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("each other creature you control that's a Skeleton or Pirate");
 
     static {
         filter.add(Predicates.or(SubType.SKELETON.getPredicate(), SubType.PIRATE.getPredicate()));
diff --git a/Mage.Sets/src/mage/cards/s/StormFleetNegotiator.java b/Mage.Sets/src/mage/cards/s/StormFleetNegotiator.java
index aaf6a8b9fdc..f38cb5d4acd 100644
--- a/Mage.Sets/src/mage/cards/s/StormFleetNegotiator.java
+++ b/Mage.Sets/src/mage/cards/s/StormFleetNegotiator.java
@@ -16,7 +16,7 @@ import mage.constants.SubType;
 import mage.game.permanent.token.MapToken;
 
 /**
- * @author
+ * @author arcox
  */
 public final class StormFleetNegotiator extends CardImpl {
 
@@ -33,7 +33,7 @@ public final class StormFleetNegotiator extends CardImpl {
 
         // Parley — Whenever Storm Fleet Negotiator attacks, each player reveals the top card of their library. For each nonland card revealed this way, you create a Map token. Then each player draws a card.
         Ability ability = new AttacksTriggeredAbility(new CreateTokenEffect(
-                new MapToken(), ParleyCount.getInstance(), true, false
+                new MapToken(), ParleyCount.getInstance()
         ).setText("each player reveals the top card of their library. " +
                 "For each nonland card revealed this way, you create a Map token"));
         ability.addEffect(new DrawCardAllEffect(1).concatBy("Then"));
diff --git a/Mage.Sets/src/mage/cards/w/WrathfulRaptors.java b/Mage.Sets/src/mage/cards/w/WrathfulRaptors.java
index 9a6c014ba00..6a4386bf545 100644
--- a/Mage.Sets/src/mage/cards/w/WrathfulRaptors.java
+++ b/Mage.Sets/src/mage/cards/w/WrathfulRaptors.java
@@ -22,7 +22,7 @@ import mage.players.Player;
 import mage.target.common.TargetPermanentOrPlayer;
 
 /**
- * @author
+ * @author arcox
  */
 public final class WrathfulRaptors extends CardImpl {
 
diff --git a/Mage.Sets/src/mage/sets/LostCavernsOfIxalanCommander.java b/Mage.Sets/src/mage/sets/LostCavernsOfIxalanCommander.java
index 09147f15d78..133a454c5fb 100644
--- a/Mage.Sets/src/mage/sets/LostCavernsOfIxalanCommander.java
+++ b/Mage.Sets/src/mage/sets/LostCavernsOfIxalanCommander.java
@@ -2,7 +2,6 @@
 package mage.sets;
 
 import mage.cards.ExpansionSet;
-import mage.cards.s.StormFleetNegotiator;
 import mage.constants.Rarity;
 import mage.constants.SetType;
 
@@ -242,7 +241,7 @@ public final class LostCavernsOfIxalanCommander extends ExpansionSet {
         cards.add(new SetCardInfo("Sorin, Lord of Innistrad", 289, Rarity.MYTHIC, mage.cards.s.SorinLordOfInnistrad.class));
         cards.add(new SetCardInfo("Spectral Sailor", 172, Rarity.UNCOMMON, mage.cards.s.SpectralSailor.class));
         cards.add(new SetCardInfo("Stonybrook Banneret", 173, Rarity.COMMON, mage.cards.s.StonybrookBanneret.class));
-        cards.add(new SetCardInfo("Storm Fleet Negotiator", 78, Rarity.RARE, StormFleetNegotiator.class));
+        cards.add(new SetCardInfo("Storm Fleet Negotiator", 78, Rarity.RARE, mage.cards.s.StormFleetNegotiator.class));
         cards.add(new SetCardInfo("Strionic Resonator", 116, Rarity.RARE, mage.cards.s.StrionicResonator.class));
         cards.add(new SetCardInfo("Sulfur Falls", 354, Rarity.RARE, mage.cards.s.SulfurFalls.class));
         cards.add(new SetCardInfo("Sunken Hollow", 355, Rarity.RARE, mage.cards.s.SunkenHollow.class));
diff --git a/Mage/src/main/java/mage/abilities/effects/common/continuous/BoostControlledEffect.java b/Mage/src/main/java/mage/abilities/effects/common/continuous/BoostControlledEffect.java
index 597b95991e7..d93c1ca7cef 100644
--- a/Mage/src/main/java/mage/abilities/effects/common/continuous/BoostControlledEffect.java
+++ b/Mage/src/main/java/mage/abilities/effects/common/continuous/BoostControlledEffect.java
@@ -120,7 +120,7 @@ public class BoostControlledEffect extends ContinuousEffectImpl {
             sb.append("other ");
         }
         sb.append(filter.getMessage());
-        if (!filter.getMessage().endsWith("you control")) {
+        if (!filter.getMessage().endsWith("you control") && !filter.getMessage().contains("you control that's")) {
             sb.append(" you control");
         }
         sb.append(each ? " gets " : " get ");