added better checking for ws object names, minor datalist update