Added some spelling
Merged spelling conflicts