New FAQ
Merge changes and clean up some loose ends