diff --git a/Mage/src/mage/abilities/common/EntersBattlefieldAbility.java b/Mage/src/mage/abilities/common/EntersBattlefieldAbility.java
index db8b7e6c31b..a92a6b126ea 100644
--- a/Mage/src/mage/abilities/common/EntersBattlefieldAbility.java
+++ b/Mage/src/mage/abilities/common/EntersBattlefieldAbility.java
@@ -58,6 +58,7 @@ public class EntersBattlefieldAbility extends StaticAbility<EntersBattlefieldAbi
 
     public EntersBattlefieldAbility(EntersBattlefieldAbility ability) {
         super(ability);
+        this.generateRule = ability.generateRule;
     }
 
     @Override
diff --git a/Mage/src/mage/abilities/effects/common/CreateTokenEffect.java b/Mage/src/mage/abilities/effects/common/CreateTokenEffect.java
index b5a3c4b461d..ee79ef82a7b 100644
--- a/Mage/src/mage/abilities/effects/common/CreateTokenEffect.java
+++ b/Mage/src/mage/abilities/effects/common/CreateTokenEffect.java
@@ -81,14 +81,21 @@ public class CreateTokenEffect extends OneShotEffect<CreateTokenEffect> {
     private void setText() {
         StringBuilder sb = new StringBuilder("put ");
         if (amount.toString().equals("1")) {
-            sb.append("a");
+            sb.append("a ").append(token.getDescription());
         } else {
-            sb.append(amount.toString());
+            sb.append(amount.toString()).append(" ").append(token.getDescription());
+            if (token.getDescription().endsWith("token")) {
+                sb.append("s ");
+            }
         }
-        sb.append(" ").append(token.getDescription()).append(" onto the battlefield");
+        sb.append(" onto the battlefield");
         String message = amount.getMessage();
         if (message.length() > 0) {
-            sb.append(" for each ");
+            if (message.startsWith("the ") || message.contains("number ")) {
+                sb.append(", where X is ");
+            } else {
+                sb.append(" for each ");
+            }
         }
         sb.append(message);
         staticText = sb.toString();