There are a few places where path isn't being treated properly, fix that.
I went through and fixed this up as best as I could.