Updated FAQ and other minor edits