a few more refinements