fixed minor typos in the comments, rearranged some methods and still did *not* update the tests...shame on me