Made the timeouts bit saner - now big topologies have built-in loong delay, and smaller ones just 60 seconds.