Locator fixes for better accuracy

take in to account distance traveled.