updates and refinements