Tidy up and fix typos.