typo fixes
minor cleanup and typo fixes