Small fix and add TODO section in README.md