Further development of file saving, including better filenames.