final round of linkfixes