resolving some TODOs