Fix typo, other bits of polishing.