Added some TODOs
Fix a few TODOs