add a second output file (not currently activated), some cleanup