further refinements, done for now