Added more TODOs to file
Added more TODO
Added todo which is prob. in the README and should be taken out
Fixed word wrapping to intentionally absorb a space character over the wrap
Merge branch 'CN3' into CN8