lots of formatting and typo fixes