completed some TODOs