some more minor changes to comments and unit tests