Better timeouts and functions.
Merge branch 'test' into dev