Added outputdir option, qcd shapes from data, scale factor for MC
Comments and formatting