various minor refinements