Fix bug of argument parsing

Previously when non-option args are found all rest args are treated as
patches.
Add help