Misc updates to bring the faq up-to-date