Update configurations, add glossary terms, fix references