Bug fixes, added TODO.md