SurfaceDragger Improvements