path handling improvements plus experimental fix