Optional headings in table, fix headings.

Fixes #34.