added new output and commandline switches for analysis