Fixed some of the comments