Some link fixes
HTML encoding of some elements