More recoil adjustments

We should either tweak the values or backport the recoil return system.