minor comments in todo