Data files: improve script; fix for failed content.