Made some URL improvements