Fix up inconsistencies, add TODO for FAQ