Added save to file and command line parameter capabilities.