fixes to path handling; working