more improvements (files list, count)...