Fix and add FAQ questions