fix typos

Like a true grammar nazi
more whitespace changes

Someone didn't configure their editor to remove trailing whitespace I
guess.