tweaked to make sure we call func in do-audio-file even when we have null stream
fixing typos, etc