Various improvements to FAQ