Capture parse args correction and added new argument

Corrected two argument which were parsed wrong. Added new form for calling preview because this is frequently used option.