diff --git a/src/main/java/forge/gui/match/controllers/CDev.java b/src/main/java/forge/gui/match/controllers/CDev.java
index 90874b2bae9..7860bae1775 100644
--- a/src/main/java/forge/gui/match/controllers/CDev.java
+++ b/src/main/java/forge/gui/match/controllers/CDev.java
@@ -5,6 +5,7 @@ import java.awt.event.MouseEvent;
 import java.awt.event.MouseListener;
 
 import forge.Command;
+import forge.Constant;
 import forge.Singletons;
 import forge.gui.GuiDisplayUtil;
 import forge.gui.framework.ICDoc;
@@ -24,15 +25,23 @@ public enum CDev implements ICDoc {
     //========= Start mouse listener inits
     private final MouseListener madMilling = new MouseAdapter() { @Override
         public void mousePressed(final MouseEvent e) {
-            VDev.SINGLETON_INSTANCE.getLblMilling().toggleEnabled(); } };
+            VDev.SINGLETON_INSTANCE.getLblMilling().toggleEnabled();
+            Singletons.getModel().savePrefs();
+    } };
 
     private final MouseListener madUnlimited = new MouseAdapter() { @Override
         public void mousePressed(final MouseEvent e) {
-            VDev.SINGLETON_INSTANCE.getLblUnlimitedLands().toggleEnabled(); } };
+            VDev.SINGLETON_INSTANCE.getLblUnlimitedLands().toggleEnabled();
+            System.out.println(VDev.SINGLETON_INSTANCE.getLblUnlimitedLands().getEnabled());
+            Singletons.getModel().getPreferences().setPref(FPref.DEV_UNLIMITED_LAND,
+                    String.valueOf(VDev.SINGLETON_INSTANCE.getLblUnlimitedLands().getEnabled()));
+            Singletons.getModel().getPreferences().save();
+    } };
 
     private final MouseListener madMana = new MouseAdapter() { @Override
         public void mousePressed(final MouseEvent e) {
-            GuiDisplayUtil.devModeGenerateMana(); } };
+            GuiDisplayUtil.devModeGenerateMana();
+            Singletons.getModel().getPreferences().save(); } };
 
     private final MouseListener madSetup = new MouseAdapter() { @Override
         public void mousePressed(final MouseEvent e) {
@@ -87,6 +96,8 @@ public enum CDev implements ICDoc {
         VDev.SINGLETON_INSTANCE.getLblTapPermanent().addMouseListener(madTap);
         VDev.SINGLETON_INSTANCE.getLblUntapPermanent().addMouseListener(madUntap);
         VDev.SINGLETON_INSTANCE.getLblSetLife().addMouseListener(madLife);
+
+        VDev.SINGLETON_INSTANCE.getLblMilling().setEnabled(Constant.Runtime.MILL[0]);
     }
 
     /* (non-Javadoc)
diff --git a/src/main/java/forge/model/FModel.java b/src/main/java/forge/model/FModel.java
index f3a8cc81e53..1d7e6b15a4b 100644
--- a/src/main/java/forge/model/FModel.java
+++ b/src/main/java/forge/model/FModel.java
@@ -167,14 +167,6 @@ public enum FModel {
         FModel.loadDynamicGamedata();
     }
 
-    public final IStorageView<BoosterData> getTournamentPacks() {
-        return tournaments;
-    }
-
-    public final IStorageView<BoosterData> getBoosters() {
-        return boosters;
-    }
-
     /**
      * Load dynamic gamedata.
      */
@@ -431,7 +423,6 @@ public enum FModel {
         Constant.Runtime.MILL[0] = v.getLblMilling().getEnabled();
 
         fp.setPref(FPref.DEV_MILLING_LOSS, String.valueOf(Constant.Runtime.MILL[0]));
-        //fp.setPref(FPref.UI_LAYOUT_PARAMS, String.valueOf(Singletons.getView().getViewMatch().getLayoutParams()));
         fp.setPref(FPref.DEV_UNLIMITED_LAND, String.valueOf(v.getLblUnlimitedLands().getEnabled()));
 
         fp.save();
@@ -501,13 +492,23 @@ public enum FModel {
         }
     }
 
+    /** @return {@link forge.util.IStorageView}<{@link forge.card.CardBlock}> */
     public IStorageView<CardBlock> getBlocks() {
         return blocks;
     }
 
+    /** @return {@link forge.util.IStorageView}<{@link forge.card.FatPackData}> */
     public IStorageView<FatPackData> getFatPacks() {
         return fatPacks;
     }
 
+    /** @return {@link forge.util.IStorageView}<{@link forge.card.BoosterData}> */
+    public final IStorageView<BoosterData> getTournamentPacks() {
+        return tournaments;
+    }
 
+    /** @return {@link forge.util.IStorageView}<{@link forge.card.BoosterData}> */
+    public final IStorageView<BoosterData> getBoosters() {
+        return boosters;
+    }
 }