Further refinements and additions.