A lot of comments, some basic new features, and more tests.