Various improvements, most in controller