Fix url better, add more