Fixed glossary and some formatting issues