Improved progress and file counting