more tests, comments, and cleanup