minor changes to comments and TODOs