Feature/fix faq