More cleanups.
Add glossary