Made location tracking more sane