Remove a few TODOs and write a few more