fixed up comments and style guide items