improved support for commands that use multiple options/flags