Link syntax and a couple of language fixes