Update TODO quite a lot.