fixed command-line parser