moved options to command list

now these options are parsed correctly; before, they were passed as if
they were single arguments instead of multiple