Better handbrake and fix punch bug