Cleaned up location services, Fixed duration getting,