taken Christian's comments into account and implemented glossary linka