Update some of the comments