Also, fix a couple of typos / style issues.