Update report

*   Fix some wording

*   Add more terms to Glossary and fix terms in report

*   Reorder terms in Glossary