Update comments.  Fix formatting issues.