make argv handling more flexible