further fixes to do with issue #50: trying to correctly use URIs all over the place instead of strings or files