Update TODO after latest commits