minor refinements.