diff --git a/Mage.Sets/src/mage/sets/eventide/CennsEnlistment.java b/Mage.Sets/src/mage/sets/eventide/CennsEnlistment.java
index 3bbb84df53..051aa8e360 100644
--- a/Mage.Sets/src/mage/sets/eventide/CennsEnlistment.java
+++ b/Mage.Sets/src/mage/sets/eventide/CennsEnlistment.java
@@ -28,14 +28,11 @@
 package mage.sets.eventide;
 
 import java.util.UUID;
-
-import mage.constants.CardType;
-import mage.constants.Rarity;
-import mage.abilities.costs.mana.ManaCostsImpl;
 import mage.abilities.effects.common.CreateTokenEffect;
 import mage.abilities.keyword.RetraceAbility;
 import mage.cards.CardImpl;
-import mage.constants.TimingRule;
+import mage.constants.CardType;
+import mage.constants.Rarity;
 import mage.game.permanent.token.KithkinToken;
 
 /**
@@ -50,7 +47,7 @@ public class CennsEnlistment extends CardImpl {
 
         // Put two 1/1 white Kithkin Soldier creature tokens onto the battlefield.
         this.getSpellAbility().addEffect(new CreateTokenEffect(new KithkinToken(), 2));
-        
+
         // Retrace
         this.addAbility(new RetraceAbility(this));
     }
diff --git a/Mage.Sets/src/mage/sets/lorwyn/CloudgoatRanger.java b/Mage.Sets/src/mage/sets/lorwyn/CloudgoatRanger.java
index a33dbc35d9..ed5a7bd936 100644
--- a/Mage.Sets/src/mage/sets/lorwyn/CloudgoatRanger.java
+++ b/Mage.Sets/src/mage/sets/lorwyn/CloudgoatRanger.java
@@ -27,19 +27,21 @@
  */
 package mage.sets.lorwyn;
 
-import mage.constants.CardType;
-import mage.constants.Rarity;
+import java.util.UUID;
 import mage.MageInt;
 import mage.abilities.Ability;
 import mage.abilities.common.EntersBattlefieldTriggeredAbility;
 import mage.abilities.common.SimpleActivatedAbility;
 import mage.abilities.costs.common.TapTargetCost;
+import mage.abilities.effects.Effect;
 import mage.abilities.effects.common.CreateTokenEffect;
 import mage.abilities.effects.common.continuous.BoostSourceEffect;
 import mage.abilities.effects.common.continuous.GainAbilitySourceEffect;
 import mage.abilities.keyword.FlyingAbility;
 import mage.cards.CardImpl;
+import mage.constants.CardType;
 import mage.constants.Duration;
+import mage.constants.Rarity;
 import mage.constants.Zone;
 import mage.filter.common.FilterControlledPermanent;
 import mage.filter.predicate.Predicates;
@@ -48,8 +50,6 @@ import mage.filter.predicate.permanent.TappedPredicate;
 import mage.game.permanent.token.KithkinToken;
 import mage.target.common.TargetControlledPermanent;
 
-import java.util.UUID;
-
 /**
  *
  * @author Loki
@@ -71,9 +71,16 @@ public class CloudgoatRanger extends CardImpl {
 
         this.power = new MageInt(3);
         this.toughness = new MageInt(3);
+
+        // When Cloudgoat Ranger enters the battlefield, put three 1/1 white Kithkin Soldier creature tokens onto the battlefield.
         this.addAbility(new EntersBattlefieldTriggeredAbility(new CreateTokenEffect(new KithkinToken(), 3), false));
-        Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(2, 0, Duration.EndOfTurn), new TapTargetCost(new TargetControlledPermanent(3, 3, filter, false)));
-        ability.addEffect(new GainAbilitySourceEffect(FlyingAbility.getInstance(), Duration.EndOfTurn));
+        //Tap three untapped Kithkin you control: Cloudgoat Ranger gets +2/+0 and gains flying until end of turn.
+        Effect effect = new BoostSourceEffect(2, 0, Duration.EndOfTurn);
+        effect.setText("{this} gets +2/+0");
+        Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, effect, new TapTargetCost(new TargetControlledPermanent(3, 3, filter, false)));
+        effect = new GainAbilitySourceEffect(FlyingAbility.getInstance(), Duration.EndOfTurn);
+        effect.setText("and gains flying until end of turn");
+        ability.addEffect(effect);
         this.addAbility(ability);
     }
 
@@ -85,4 +92,4 @@ public class CloudgoatRanger extends CardImpl {
     public CloudgoatRanger copy() {
         return new CloudgoatRanger(this);
     }
-}
\ No newline at end of file
+}
diff --git a/Mage.Sets/src/mage/sets/lorwyn/EyesOfTheWisent.java b/Mage.Sets/src/mage/sets/lorwyn/EyesOfTheWisent.java
index 643ea3ea7b..d8be2507cc 100644
--- a/Mage.Sets/src/mage/sets/lorwyn/EyesOfTheWisent.java
+++ b/Mage.Sets/src/mage/sets/lorwyn/EyesOfTheWisent.java
@@ -86,6 +86,7 @@ class EyesOfTheWisentElementalToken extends Token {
         subtype.add("Elemental");
         power = new MageInt(4);
         toughness = new MageInt(4);
+        setTokenType(1);
     }
 
 }
diff --git a/Mage/src/mage/game/permanent/token/KithkinToken.java b/Mage/src/mage/game/permanent/token/KithkinToken.java
index 3f3167c6dd..ba45e43525 100644
--- a/Mage/src/mage/game/permanent/token/KithkinToken.java
+++ b/Mage/src/mage/game/permanent/token/KithkinToken.java
@@ -1,5 +1,6 @@
 package mage.game.permanent.token;
 
+import java.util.Arrays;
 import mage.MageInt;
 import mage.constants.CardType;
 
@@ -7,20 +8,16 @@ import mage.constants.CardType;
  *
  * @author Loki
  */
-public class KithkinToken extends Token{
+public class KithkinToken extends Token {
 
     public KithkinToken() {
-        this("LRW");
-    }
-
-    public KithkinToken(String expansionSetCode) {
-        super("Kithkin", "1/1 white Kithkin Soldier creature token");
-        setOriginalExpansionSetCode(expansionSetCode);
+        super("Kithkin Soldier", "1/1 white Kithkin Soldier creature token");
         cardType.add(CardType.CREATURE);
         color.setWhite(true);
         subtype.add("Kithkin");
         subtype.add("Soldier");
         power = new MageInt(1);
         toughness = new MageInt(1);
+        availableImageSetCodes.addAll(Arrays.asList("LRW", "SHM", "MMA"));
     }
 }