some TODOs completed