restructered the faq and merged the glossary into it