Updates and refinements.