Some more refinements.