Some tuning to rigidbody-controller and some minor tweaks