Fixed file naming and saving to correct location