More comments and TODOs