fixed up all the comments