Bug fix + url fix