WS fixed
Some fixes