- Updated list of TODO
- Minor update