guaranteed filename persistence
Merge branch 'sound'