beefed up URI class, removed reference markers