Whitespace and typo fixes... grumble grumble.