Improved grapple unwrapping, but still not perfect