fixed file names and vars