updates to absolute URL creation
fixed merge conflicts