some small refinements