No real work today, only added timeouts to the Current Location finder.