diff --git a/src/forge/CardFactory_Planeswalkers.java b/src/forge/CardFactory_Planeswalkers.java
index 31dc856d28b..8e32210d1a3 100644
--- a/src/forge/CardFactory_Planeswalkers.java
+++ b/src/forge/CardFactory_Planeswalkers.java
@@ -2052,6 +2052,7 @@ class CardFactory_Planeswalkers {
                 
                 @Override
                 public void resolve() {
+                	turn[0] = AllZone.Phase.getTurn();
                     card2.subtractCounter(Counters.LOYALTY, 2);
                     if(getTargetCard() != null) {
                         if(AllZone.GameAction.isCardInPlay(getTargetCard())
diff --git a/src/forge/Gui_PetShop.java b/src/forge/Gui_PetShop.java
index e85c732114b..ce8f722a928 100644
--- a/src/forge/Gui_PetShop.java
+++ b/src/forge/Gui_PetShop.java
@@ -111,6 +111,10 @@ public class Gui_PetShop extends JFrame implements NewConstants{
     		sb.append("Gives Flanking to your Wolf.<br>");
     		sb.append("<u><b>Level 4</b></u>: 2/2 Flanking<br>");
     	}
+    	else
+    	{
+    		sb.append("Wolf Level Maxed out.<br>");
+    	}
     	
     	sb.append("</html>");
     	return sb.toString();
diff --git a/src/forge/Gui_PlantShop.java b/src/forge/Gui_PlantShop.java
index f2434fb0191..d74df9dc32c 100644
--- a/src/forge/Gui_PlantShop.java
+++ b/src/forge/Gui_PlantShop.java
@@ -112,6 +112,10 @@ public class Gui_PlantShop extends JFrame implements NewConstants{
     		sb.append("Grow venomous thorns on your plant.<br>");
     		sb.append("<u><b>Level 5</b></u>: Deathtouch<br>");
     	}
+    	else
+    	{
+    		sb.append("Plant Level Maxed out.");
+    	}
     	
     	sb.append("</html>");
     	return sb.toString();
diff --git a/src/forge/Gui_Quest.java b/src/forge/Gui_Quest.java
index 4c6a49ee265..2e9dafd54ce 100644
--- a/src/forge/Gui_Quest.java
+++ b/src/forge/Gui_Quest.java
@@ -259,6 +259,13 @@ public class Gui_Quest extends JFrame implements NewConstants{
         	jPanel2.add(otherShopsButton, null);
         	this.getContentPane().add(lifeLabel,null);
         	this.getContentPane().add(questsButton, null);
+        	
+        	int questsPlayed = questData.getQuestsPlayed();
+        	System.out.println("questsPlayed: " + questsPlayed);
+        	if (questData.getWin() / 5 < questsPlayed || questData.getWin() < 25)
+        		questsButton.setEnabled(false);
+        	else
+        		questsButton.setEnabled(true);
         }
         jPanel2.add(cardShopButton, null);
         jPanel2.add(deckEditorButton, null);
diff --git a/src/forge/Gui_Treasury.java b/src/forge/Gui_Treasury.java
index 1232f1fe1bd..c2bac956691 100644
--- a/src/forge/Gui_Treasury.java
+++ b/src/forge/Gui_Treasury.java
@@ -105,7 +105,7 @@ public class Gui_Treasury extends JFrame implements NewConstants{
     	else 
     	{
     		sb.append("<u>Estates Level Maxed out</u>.<br>");
-    		sb.append("Current Level:<br>");
+    		sb.append("Current Level: 3/3<br>");
     		sb.append("Gives a bonus of <b>20%</b> to match winnings.<br>");
     		sb.append("Improves sell percentage by <b>2.5%</b>.");
     	}
diff --git a/src/forge/Gui_WinLose.java b/src/forge/Gui_WinLose.java
index 02f46a3b4eb..dcb3402f8e2 100644
--- a/src/forge/Gui_WinLose.java
+++ b/src/forge/Gui_WinLose.java
@@ -360,6 +360,7 @@ public class Gui_WinLose extends JFrame implements NewConstants {
             	
             	if (AllZone.QuestAssignment!=null)
             	{
+            		AllZone.QuestData.addQuestsPlayed();
             		Quest_Assignment qa = AllZone.QuestAssignment;
             		
             		StringBuilder sb = new StringBuilder();
diff --git a/src/forge/QuestUtil.java b/src/forge/QuestUtil.java
index 56099bb01dc..91f14974cb1 100644
--- a/src/forge/QuestUtil.java
+++ b/src/forge/QuestUtil.java
@@ -176,14 +176,14 @@ public class QuestUtil {
 		 */
 		
 		QuestData_BoosterPack pack = new QuestData_BoosterPack(); 
+		qa.clearCompy();
 		
 		int id = qa.getId();
 		if (id == 1) //White Dungeon
 		{
 			for (int i=0;i<2;i++)
-			{
 				qa.addCompy("Savannah Lions");
-			}
+			
 			qa.setCardRewardList(pack.getRare(3, 6));
 		}
 		else if (id == 2) //Blue Dungeon
@@ -204,6 +204,8 @@ public class QuestUtil {
 		}
 		else if (id == 6) //Colorless Dungeon
 		{
+			for (int i=0;i<2;i++)
+				qa.addCompy("Ornithopter");
 			qa.setCardRewardList(pack.getRare(3, 1));
 		}
 		else if (id == 7) //Gold Dungeon
diff --git a/src/forge/Quest_Assignment.java b/src/forge/Quest_Assignment.java
index b2f2ea94e9c..66d497227a3 100644
--- a/src/forge/Quest_Assignment.java
+++ b/src/forge/Quest_Assignment.java
@@ -104,6 +104,12 @@ public class Quest_Assignment {
 	public void addCompy(String s) {
 		this.compy.add(s);
 	}
+	
+	public void clearCompy()
+	{
+		this.compy.clear();
+	}
+	
 
 	public ArrayList<String> getCompy() {
 		return compy;