Fixed timedelta calculations and increased the default authentication token time