Little fixes
Adding a TODO