Add minor fixes and TODO list