Resolve Relative Paths

As mentioned before this PR fixes the following.  Want to get this PR to you in the event that I can't get to the other tasks.

- [x] fix relative path resolution
- [x] fix relative path remapping