fix typos, minor clean up