A few bugfixes, optimizations, handle failure cases, timeouts