finished remaining TODOs