General Update

Update to all files, changes to glossary definitions.