Mostly style and spelling changes.