diff --git a/src/com/massivecraft/mcore/store/Entity.java b/src/com/massivecraft/mcore/store/Entity.java
index 9de5bdfa..2d435612 100644
--- a/src/com/massivecraft/mcore/store/Entity.java
+++ b/src/com/massivecraft/mcore/store/Entity.java
@@ -46,7 +46,7 @@ public abstract class Entity<E extends Entity<E, L>, L extends Comparable<? supe
 	
 	public boolean attached()
 	{
-		return this.getColl() != null;
+		return this.getColl() != null && this.getId() != null;
 	}
 	
 	public boolean detached()
diff --git a/src/com/massivecraft/mcore/util/MUtil.java b/src/com/massivecraft/mcore/util/MUtil.java
index d4cc57b1..42fa7d2e 100644
--- a/src/com/massivecraft/mcore/util/MUtil.java
+++ b/src/com/massivecraft/mcore/util/MUtil.java
@@ -381,6 +381,14 @@ public class MUtil
 		return herp.equals(derp);
 	}
 	
+	public static <T> int compare(Comparable<T> herp, T derp)
+	{
+		if (herp == null && derp == null) return 0;
+		if (herp == null) return -1;
+		if (derp == null) return +1;
+		return herp.compareTo(derp);
+	}
+	
 	// -------------------------------------------- //
 	// SORTING
 	// -------------------------------------------- //
diff --git a/src/com/massivecraft/mcore/util/TimeUnit.java b/src/com/massivecraft/mcore/util/TimeUnit.java
index 76540c1b..b008654f 100644
--- a/src/com/massivecraft/mcore/util/TimeUnit.java
+++ b/src/com/massivecraft/mcore/util/TimeUnit.java
@@ -36,6 +36,19 @@ public class TimeUnit implements Comparable<TimeUnit>
 		
 	private static final TreeSet<TimeUnit> all = new TreeSet<TimeUnit>();
 	public static TreeSet<TimeUnit> getAll() { return new TreeSet<TimeUnit>(all); }
+	public static TreeSet<TimeUnit> getAllButMillis()
+	{
+		TreeSet<TimeUnit> ret = new TreeSet<TimeUnit>(all);
+		ret.remove(MILLISECOND);
+		return ret;
+	}
+	public static TreeSet<TimeUnit> getAllButMillisAndSeconds()
+	{
+		TreeSet<TimeUnit> ret = new TreeSet<TimeUnit>(all);
+		ret.remove(MILLISECOND);
+		ret.remove(SECOND);
+		return ret;
+	}
 	
 	public static TimeUnit get(String timeUnitString)
 	{