added fixes to DataStructures/Universe.hs from timer branch