Add user WS. Other minor changes.