better ws naming
more fixes