Huge updates to WS executable.