Further testing and refinements.