further minor refinements