Switched to websocket/driver and improved websocket handling