Typos

Looks like I managed to screw up my merge conflict. Here's the fix.

As an apology, it also contains the typo fixes from #729 and some whitespace fix for clarity