Updated link, added title
fixed the conflict
changed the glossary pages