Fixed rotation and more strict jumping