Update some code and comments.