Make file number in logs match actual file name.
Extend split tool, fix encoding issues with special characters.