More glossaries added and annotated