Fix some comments and TODO list