Fix some typos

Also does a little bit of wording improvement (whether instead of if).