fix up option parsing in cli