more options and better cli design