inclusive
restore old behavior
improve file/histo names