General Update

Update to all files.
Change of definitions in glossary.