Update TODO a bit more