assorted formatting and typo fixes