Editing for consistency

And fixed a few typos.