further refinements and simplifactions