Add TODO to README.md
Fix bugs