Text description of the schema
Fix comment edge cases

Pluralize header appropriately and catch invalid org ids.