Some clean-up and new comments.