Minor changes and comments.