revise command-line argument treatment