Additional debug, clean up equals comparisons