Better debug.
Tweak timeouts.
Improve error handling.