todo updated with review comment summary