some more adjustments
tested with some other repositories