added several TODOs