Improved command options, added standards