some potentially final mostly stylistic edits from paul