fix websocket
add stubs
improve client