Small update

Added EXTRAPARAMS option
Moved options to align with the launch script