more cleanup and typo fixes