More TODOs and some marked as done