resolving glossary terms g-o

...and other small changes