Make the Guide and FAQs more up-to-date and comprehensive