Improve the command line options