Fix several glitches/missing links

Glitch report received via email.