Tweaking file output handling after testing.