More comments, more refinement.