cli: enhance cli options
persist stuff