Update TODO, code comment fix