increased logging and timeouts