Cleaned up how timeouts were detected, still not amazing