diff --git a/res/gui/display_layout.xml b/res/gui/display_layout.xml
index d837cee299c..334b56eb390 100644
--- a/res/gui/display_layout.xml
+++ b/res/gui/display_layout.xml
@@ -28,7 +28,7 @@
           <int>0</int> 
           <int>0</int> 
           <int>245</int> 
-          <int>132</int> 
+          <int>128</int> 
          </object> 
         </void> 
         <void property="name"> 
@@ -47,7 +47,7 @@
         <void property="bounds"> 
          <object class="java.awt.Rectangle"> 
           <int>0</int> 
-          <int>132</int> 
+          <int>128</int> 
           <int>245</int> 
           <int>10</int> 
          </object> 
@@ -62,9 +62,9 @@
         <void property="bounds"> 
          <object class="java.awt.Rectangle"> 
           <int>0</int> 
-          <int>142</int> 
+          <int>138</int> 
           <int>245</int> 
-          <int>196</int> 
+          <int>192</int> 
          </object> 
         </void> 
         <void property="name"> 
@@ -83,7 +83,7 @@
         <void property="bounds"> 
          <object class="java.awt.Rectangle"> 
           <int>0</int> 
-          <int>338</int> 
+          <int>330</int> 
           <int>245</int> 
           <int>10</int> 
          </object> 
@@ -98,9 +98,9 @@
         <void property="bounds"> 
          <object class="java.awt.Rectangle"> 
           <int>0</int> 
-          <int>348</int> 
+          <int>340</int> 
           <int>245</int> 
-          <int>113</int> 
+          <int>109</int> 
          </object> 
         </void> 
         <void property="name"> 
@@ -119,7 +119,7 @@
         <void property="bounds"> 
          <object class="java.awt.Rectangle"> 
           <int>0</int> 
-          <int>461</int> 
+          <int>449</int> 
           <int>245</int> 
           <int>10</int> 
          </object> 
@@ -134,9 +134,9 @@
         <void property="bounds"> 
          <object class="java.awt.Rectangle"> 
           <int>0</int> 
-          <int>471</int> 
+          <int>459</int> 
           <int>245</int> 
-          <int>107</int> 
+          <int>103</int> 
          </object> 
         </void> 
         <void property="name"> 
@@ -155,7 +155,7 @@
         <void property="bounds"> 
          <object class="java.awt.Rectangle"> 
           <int>0</int> 
-          <int>578</int> 
+          <int>562</int> 
           <int>245</int> 
           <int>10</int> 
          </object> 
@@ -170,9 +170,9 @@
         <void property="bounds"> 
          <object class="java.awt.Rectangle"> 
           <int>0</int> 
-          <int>588</int> 
+          <int>572</int> 
           <int>245</int> 
-          <int>239</int> 
+          <int>255</int> 
          </object> 
         </void> 
         <void property="name"> 
@@ -219,7 +219,7 @@
       <object class="java.awt.Rectangle"> 
        <int>255</int> 
        <int>0</int> 
-       <int>901</int> 
+       <int>899</int> 
        <int>827</int> 
       </object> 
      </void> 
@@ -230,8 +230,8 @@
          <object class="java.awt.Rectangle"> 
           <int>255</int> 
           <int>0</int> 
-          <int>901</int> 
-          <int>147</int> 
+          <int>899</int> 
+          <int>149</int> 
          </object> 
         </void> 
         <void property="name"> 
@@ -250,8 +250,8 @@
         <void property="bounds"> 
          <object class="java.awt.Rectangle"> 
           <int>255</int> 
-          <int>147</int> 
-          <int>901</int> 
+          <int>149</int> 
+          <int>899</int> 
           <int>10</int> 
          </object> 
         </void> 
@@ -265,9 +265,9 @@
         <void property="bounds"> 
          <object class="java.awt.Rectangle"> 
           <int>255</int> 
-          <int>157</int> 
-          <int>901</int> 
-          <int>169</int> 
+          <int>159</int> 
+          <int>899</int> 
+          <int>159</int> 
          </object> 
         </void> 
         <void property="name"> 
@@ -286,8 +286,8 @@
         <void property="bounds"> 
          <object class="java.awt.Rectangle"> 
           <int>255</int> 
-          <int>326</int> 
-          <int>901</int> 
+          <int>318</int> 
+          <int>899</int> 
           <int>10</int> 
          </object> 
         </void> 
@@ -301,9 +301,9 @@
         <void property="bounds"> 
          <object class="java.awt.Rectangle"> 
           <int>255</int> 
-          <int>336</int> 
-          <int>901</int> 
-          <int>187</int> 
+          <int>328</int> 
+          <int>899</int> 
+          <int>135</int> 
          </object> 
         </void> 
         <void property="name"> 
@@ -322,8 +322,8 @@
         <void property="bounds"> 
          <object class="java.awt.Rectangle"> 
           <int>255</int> 
-          <int>523</int> 
-          <int>901</int> 
+          <int>463</int> 
+          <int>899</int> 
           <int>10</int> 
          </object> 
         </void> 
@@ -337,9 +337,9 @@
         <void property="bounds"> 
          <object class="java.awt.Rectangle"> 
           <int>255</int> 
-          <int>533</int> 
-          <int>901</int> 
-          <int>146</int> 
+          <int>473</int> 
+          <int>899</int> 
+          <int>172</int> 
          </object> 
         </void> 
         <void property="name"> 
@@ -358,8 +358,8 @@
         <void property="bounds"> 
          <object class="java.awt.Rectangle"> 
           <int>255</int> 
-          <int>679</int> 
-          <int>901</int> 
+          <int>645</int> 
+          <int>899</int> 
           <int>10</int> 
          </object> 
         </void> 
@@ -373,9 +373,9 @@
         <void property="bounds"> 
          <object class="java.awt.Rectangle"> 
           <int>255</int> 
-          <int>689</int> 
-          <int>901</int> 
-          <int>138</int> 
+          <int>655</int> 
+          <int>899</int> 
+          <int>172</int> 
          </object> 
         </void> 
         <void property="name"> 
@@ -408,7 +408,7 @@
     <object class="org.jdesktop.swingx.MultiSplitLayout$Divider"> 
      <void property="bounds"> 
       <object class="java.awt.Rectangle"> 
-       <int>1156</int> 
+       <int>1154</int> 
        <int>0</int> 
        <int>10</int> 
        <int>827</int> 
@@ -423,9 +423,9 @@
     <object id="MultiSplitLayout$Split3" class="org.jdesktop.swingx.MultiSplitLayout$Split"> 
      <void property="bounds"> 
       <object class="java.awt.Rectangle"> 
-       <int>1166</int> 
+       <int>1164</int> 
        <int>0</int> 
-       <int>274</int> 
+       <int>276</int> 
        <int>827</int> 
       </object> 
      </void> 
@@ -434,10 +434,10 @@
        <object class="org.jdesktop.swingx.MultiSplitLayout$Leaf"> 
         <void property="bounds"> 
          <object class="java.awt.Rectangle"> 
-          <int>1166</int> 
+          <int>1164</int> 
           <int>0</int> 
-          <int>274</int> 
-          <int>409</int> 
+          <int>276</int> 
+          <int>408</int> 
          </object> 
         </void> 
         <void property="name"> 
@@ -455,9 +455,9 @@
        <object class="org.jdesktop.swingx.MultiSplitLayout$Divider"> 
         <void property="bounds"> 
          <object class="java.awt.Rectangle"> 
-          <int>1166</int> 
-          <int>409</int> 
-          <int>274</int> 
+          <int>1164</int> 
+          <int>408</int> 
+          <int>276</int> 
           <int>10</int> 
          </object> 
         </void> 
@@ -470,10 +470,10 @@
        <object class="org.jdesktop.swingx.MultiSplitLayout$Leaf"> 
         <void property="bounds"> 
          <object class="java.awt.Rectangle"> 
-          <int>1166</int> 
-          <int>419</int> 
-          <int>274</int> 
-          <int>408</int> 
+          <int>1164</int> 
+          <int>418</int> 
+          <int>276</int> 
+          <int>409</int> 
          </object> 
         </void> 
         <void property="name"> 
diff --git a/src/forge/CardFactory.java b/src/forge/CardFactory.java
index 36b8b6a0cb6..98e40d4fc75 100644
--- a/src/forge/CardFactory.java
+++ b/src/forge/CardFactory.java
@@ -8908,7 +8908,6 @@ public class CardFactory implements NewConstants {
             }
           }
             
-
           //"Destroy target nonbasic land",
           if(userChoice.contains(cardChoice[2]))
             AllZone.GameAction.destroy(m_land[0]);
diff --git a/src/forge/CardFactory_Creatures.java b/src/forge/CardFactory_Creatures.java
index d4005e604e6..1515c8f6321 100644
--- a/src/forge/CardFactory_Creatures.java
+++ b/src/forge/CardFactory_Creatures.java
@@ -3072,6 +3072,17 @@ public class CardFactory_Creatures {
 	        }
 	      };
 	      card.addComesIntoPlayCommand(intoPlay);
+	      
+	      card.clearSpellAbility();
+	      card.addSpellAbility(new Spell_Permanent(card)
+	      {
+	    	    private static final long serialVersionUID = 7053381164164384390L;
+
+				public boolean canPlayAI()
+		        {
+		          return 8 <= AllZone.Computer_Life.getLife();
+		        }
+	      });
 	    }//*************** END ************ END **************************
 
 
@@ -10050,7 +10061,6 @@ public class CardFactory_Creatures {
 	      else if(cardName.equals("Sparkspitter"))
 	      {
 	    	
-	    	  
 	        final Ability_Tap ability = new Ability_Tap(card, "R")
 	        {
 	  		private static final long serialVersionUID = -6381252527344512333L;
@@ -12025,7 +12035,7 @@ public class CardFactory_Creatures {
     			landInLib  = landInLib.getType("Land");
     			landInPlay = landInPlay.getType("Land");
     			
-    			if (landInLib.size() > 0 && landInPlay.size() > 0)
+    			if (landInLib.size() > 0 && landInPlay.size() > 0 && (AllZone.Phase.getPhase().equals("Main2") || card.getNetAttack() < 5) )
     				return true;
     			else
     				return false;
@@ -16822,16 +16832,18 @@ public class CardFactory_Creatures {
   	        {
 			  private static final long serialVersionUID = -4663016921034366082L;
 
-			  public boolean canPlayAI() {return getMerfolk().size() != 0;}
-
-  	          public void chooseTargetAI()
-  	          {
-  	            AllZone.GameAction.sacrifice(card);
-
-  	            CardList merfolk = getMerfolk();
-  	            merfolk.shuffle();
-  	            setTargetCard(merfolk.get(0));
-  	          }
+			  public boolean canPlayAI() 
+			  {
+				  //return getMerfolk().size() != 0; 
+				  if (getMerfolk().size() > 0)
+				  {
+					  CardList merfolk = getMerfolk();
+					  merfolk.shuffle();
+					  setTargetCard(merfolk.get(0));
+					  return true;
+				  }
+				  return false;
+			  }
 
   	          CardList getMerfolk()
   	          {
diff --git a/src/forge/CardFactory_Planeswalkers.java b/src/forge/CardFactory_Planeswalkers.java
index 436ea9a7490..c274cfe796b 100644
--- a/src/forge/CardFactory_Planeswalkers.java
+++ b/src/forge/CardFactory_Planeswalkers.java
@@ -2717,6 +2717,7 @@ class CardFactory_Planeswalkers {
 	          if(AllZone.GameAction.isCardInPlay(getTargetCard()) && CardFactoryUtil.canTarget(card2, getTargetCard()) )
 	          {
 	        	card2.subtractCounter(Counters.LOYALTY, 2);
+	        	turn[0] = AllZone.Phase.getTurn();
 	        	  
 	            orig[0]       = AllZone.getZone(getTargetCard());
 	            controllerEOT[0] = getTargetCard().getController();
@@ -2817,7 +2818,7 @@ class CardFactory_Planeswalkers {
 	      ability3.setStackDescription(card2.getName() +" - Put five 4/4 red Dragon creature tokens with flying onto the battlefield.");
 	      ability3.setDescription("-6: Put five 4/4 red Dragon creature tokens with flying onto the battlefield.");
 	      card2.addSpellAbility(ability3);
-	      //end ability 2
+	      //end ability 3
 	      
 	      return card2;
 	    }//*************** END ************ END **************************
diff --git a/src/forge/Gui_NewGame.java b/src/forge/Gui_NewGame.java
index e62d89e04e9..06adcf13746 100644
--- a/src/forge/Gui_NewGame.java
+++ b/src/forge/Gui_NewGame.java
@@ -39,14 +39,6 @@ import javax.swing.UIManager;
 import javax.swing.UIManager.LookAndFeelInfo;
 import javax.swing.border.Border;
 import javax.swing.border.TitledBorder;
-
-//import com.nilo.plaf.nimrod.NimRODLookAndFeel;
-
-//import net.sourceforge.napkinlaf.NapkinLookAndFeel;
-//import net.sourceforge.napkinlaf.NapkinTheme;
-
-//import org.jvnet.substance.SubstanceLookAndFeel;
-
 import forge.error.ErrorViewer;
 import forge.error.ExceptionHandler;
 import forge.gui.ListChooser;