Added an option to support password files.
Fixed formatting of the user selected values before execution.