WebSocket addition, minor changes.