Correct Mac_x and Mac_y, better support for filenames