Improved tooling for CWS: better runner, fixedgraph generation