Fixed path logging bugs, misc refactor