bug fixes and comment revisions