Fix handling of command line args.
Handle multiple skips. + fix for no upgrades.