faqs + elaboration refactorings