Updated docs and glossary