Fixed Comments And Spelling

Fixes some comment conflict and a few spelling errors.