fixed a few TODOs