Added retries to web sockets, other updates