This PR fixes some typos and polishes trivial stuff.

Comment From: snicoll

Gah, 😫

Thanks again @izeye!