fix bugs
change filenames