Moved TODO to TODO.md, cleanups