Tweaks to the controller