Fixed some formatting problems
Spell check
merge