some cleanup and typo fixes.