more refinements, mostly sections 4,5,6,7