clean up and typo fixes