fixing file names and solving more