Minor changes to code and comments.