Revise/tweak the pop.bat CLI script