re-organize TODO items & minor changes