Many important small refinements