More refactoring in progress
More improvements / fixes, testing on a large photo collectiong.
More fixes