Multi client support, ws fixes