Update high-level TODOs