glossary edits

Ready for merge.