merge after Johan fixed glossary