cleanup and typo fixes.