Edit comments and fix typo