Small adjustments to fix/improve drag throwing and boundary detection