cleanup and typo fixes