yl/Polo - add more CLI options