more faq cleanups