adding a proper TODO
updating TODOs
fixing duplicated paragraph
Merge branch 'master' into gh-pages