reorganized TODO items