correct typos and clean up