url and link fixes