some small changes to comments, etc