more TODOs added