cleaner wheel function; haversine tweak