websocket server improvements