websocket client will reconnect properly
startup timeouts for test and fast clients
merge