Change the TODOs a bit