Fixed velocity and box-wrapping bugs