Some minor refinements and more controls.