Update TODO
Update README
Fix bug in integrating new hint stuff