added a few more TODOs