Fixed some bugs and moved TODO.md to issues.
Fixed some bugs and moved TODO.md to issues