Minor changes to code, comments.