relative path handling improved