Minor tweaks, fix typos.