Improvements on the comments.
Other changes.