Added glossary and some cleanup