Changed command line parameters, some usefull changes