fix some filenames and output formats