more fixes, blah, might have been easier to just change everything to
only use path?