simplified comparer closure & improved image sorting; simplified folder name generation; other small code fixes;