Improvements to ws-client

Not 100% accurate on rps, but close enough for now.