Fixed url issues and other bugs