fixed todos, added glossary