changed file mathching to more generic
updated plots
updated plots