clean up comments/fix typos