improve websocket incoming msgs handling
update todo