fix typos, general clean up