primarily just sync'ing with latest

Some FAQ edits