W is optional cl arg, added more psis
Rough patched path bug