touch up cli arg handling