Revise/tweak pop.bat CLI script