Fix a simple wording and a math bug

Apologies for the huge diff. My editor is set up to remove trailing whitespace.