tweak timeouts and timeouts messages