some spellchecking
some more edits
merge and some more editing