A few minor changes.

May finish editing later, but looks good.