some minor refinements