changes to output format and command line params