improve cli options