fixed several TODOs