add a few TODOs