Fix typos whitespace

A branch for typo fixes and whitespace fixes.