Added websocket config to xml and other minor changes