deleted some TODO's and made some spelling edits