Extend comments and fix typos.