Improved relative path handling
Reworked relative path handling
Minor fix