ws
a few fixes