Tuned timeouts.
Some refactoring.