Fixed references stuff without {}. Added the glossary.
Resolved merge conflict with fixed {}'s.