fix ordering for command options