fixing timeouts
finishing off, still to finish failure simualation