Change command line options and implement error messages