a few small refinements