Debugging statements, better comparator, smarter wf