Glossaries added, many changes