modify glossary and fix