Updated some of the comments