Improved the controls