ws fixes mostly