Fix 'pu'. Add 'pxw' and fix some 'pc' subcommands