Command-line options now override config file. Added --dry-run option