Fix several of the comments made in class