Update of some comments and TODOs

All in the title.