Add FAQ, fix some column headers

This fixes #299 and #235