cleanup and typo corrections