updates, refinements