more TODOs

added more TODOs to code