some TODOs resolved