further pattern refinements after some extensive testing