First attempt at fixing the URLs.