fix bugs for test version
ugh, forgot compareTo (again)