Use websocket instead of ws

FTR most of this patch is @lightsofapollo work