Fixed some spellings

Please review these changes carefully, as I had to do a manual merge of my edits, in a visual differencing tool... I don't think I've lost any of your recent edits - was very careful.