diff --git a/src/resources/common/Stf.java b/src/resources/common/Stf.java
index 1ebfc72a..468960f6 100644
--- a/src/resources/common/Stf.java
+++ b/src/resources/common/Stf.java
@@ -80,6 +80,20 @@ public class Stf extends Delta {
 		}
 	}
 	
+	public String getString() {
+		synchronized(objectMutex) {
+			return ("@" + stfFilename + ":" + stfName);
+		}
+	}
+	
+	public void setString(String stf) {
+		synchronized(objectMutex) {
+			stf = stf.replace("@", "");
+			stfFilename.set(stf.split(":")[0]);
+			stfName.set(stf.split(":")[1]);
+		}
+	}
+	
 	public byte[] getBytes() {
 		synchronized(objectMutex) {
 			int size = stfFilename.getBytes().length + 4 + stfName.getBytes().length;
diff --git a/src/services/collections/CollectionService.java b/src/services/collections/CollectionService.java
index 15567a6b..c74e3993 100644
--- a/src/services/collections/CollectionService.java
+++ b/src/services/collections/CollectionService.java
@@ -222,11 +222,8 @@ public class CollectionService implements INetworkDispatch {
 									BitSet bitValue = new BitSet(64);
 									bitValue.set(64-bits, 64);
 									
-									BitSet maxValue = new BitSet(64);
-									maxValue.set(64-maxSlotValue, 64);
-									
-									if (bitValue.toLongArray()[0] < maxValue.toLongArray()[0]) {
-										System.out.println(slotName + ", row " + c + ": counter-type slot uses " + bits + " bits, which can only hold a max value of " + bitValue.toLongArray()[0] + ", which is less than the specified max value of " + maxValue.toLongArray()[0]);
+									if (bitValue.toLongArray()[0] < maxSlotValue) {
+										System.out.println(slotName + ", row " + c + ": counter-type slot uses " + bits + " bits, which can only hold a max value of " + bitValue.toLongArray()[0] + ", which is less than the specified max value of " + maxSlotValue);
 										throw new Exception();
 									}
 								}
@@ -293,14 +290,20 @@ public class CollectionService implements INetworkDispatch {
 								}
 							}
 							
-							if (bits > 1) {
+							if (maxSlotValue > -1) {
+								BitSet value = BitSet.valueOf(new long[] { collections.get(beginSlotId, (endSlotId + 1)).toLongArray()[0]++ });
+								
+								for (int i = beginSlotId; i <= endSlotId; i++) {
+									collections.set(i, value.get((i - beginSlotId)));
+								}
+							} else if (bits > 1) {
 								int nextBit = collections.get(beginSlotId, (endSlotId + 1)).previousClearBit(endSlotId);
 								
 								if (nextBit == -1) {
 									return false;
 								}
 								
-								collections.set((beginSlotId + nextBit));
+								collections.set(nextBit);
 							} else {
 								collections.set(beginSlotId);
 							}
@@ -439,7 +442,6 @@ public class CollectionService implements INetworkDispatch {
 			String bookName = "";
 			String pageName = "";
 			String collectionName = "";
-			boolean collectionComplete = false;
 			
 			collections = BitSet.valueOf(player.getCollections());
 			
@@ -595,14 +597,15 @@ public class CollectionService implements INetworkDispatch {
 									BitSet bitValue = new BitSet(64);
 									bitValue.set(64-bits, 64);
 									
-									BitSet maxValue = new BitSet(64);
-									maxValue.set(64-maxSlotValue, 64);
-									
-									if (bitValue.toLongArray()[0] < maxValue.toLongArray()[0]) {
-										System.out.println(slotName + ", row " + c + ": counter-type slot uses " + bits + " bits, which can only hold a max value of " + bitValue.toLongArray()[0] + ", which is less than the specified max value of " + maxValue.toLongArray()[0]);
+									if (bitValue.toLongArray()[0] < maxSlotValue) {
+										System.out.println(slotName + ", row " + c + ": counter-type slot uses " + bits + " bits, which can only hold a max value of " + bitValue.toLongArray()[0] + ", which is less than the specified max value of " + maxSlotValue);
 										throw new Exception();
 									}
-									
+								}
+								
+								if (maxSlotValue > 0) {
+									return (int) collections.get(beginSlotId, (endSlotId + 1)).toLongArray()[0];
+								} else {
 									return collections.get(beginSlotId, (endSlotId + 1)).cardinality();
 								}
 							} else {