Fixed some of the comments, but not all.