Fixe documentation and variable names
Add Glossary