Added in timeouts and less crashes