Various typo fix and tweaks pointed out by @astrofrog