fixing up some of the comments and docs