Tidy up a bit and fix typos.