better handling of cli options