Minor touchups, more glossary entries and much more use of glossary terms