Make path finding more robust
Update URLs