location a little smarter now