Updates comments and fixes syntax inconsistencies.