fixed filenames
finishing changes for now