Minor updates
Reformat FAQ