added a few TODOs