most todos fixed