resolved some TODOs etc