Command line flag parsing fixed.