Changes to command options and main