Rel paths, improvements from customer, refactoring