websocket support and small fixes
Fixed websockets