please accept this small patches for improved output and handling of spaces in filename