Some Spelling Fixes
Some more spelling fixes
resolved conflicts
merging changes