fixing filenames
cleaning up