Minor changes and more comments.