Cleaned up urls and fixed broken ones