some comment update (todos)