Additional documentation and some improved logging and timeouts.