Create proper index #19
Update glossary #18