file names really
our final pictures
changed the order of setting paramaters... made Javads life easier
merge fix