Added timeout to Geolocator and added basic comments