ws and stability fixes
merge