Various changes and improvements including Glossary import.