Improvements to controls.