fix typos, clean up