Some changes in command line options