clean-up; fix some typos