FAQ-en updated

Verify the FAQ and the merge