further command line changes, file consolidation