minor fixes, plus increased the default timeout
Just easier to merge
Initialize all the clients in the init
Mostly portings from integration