A bunch of format and typo fixes