Simpler tables and a few corrections.
Merge pull request #5 from clearhaus/simpler-tables-and-small-corrections

Simpler tables and a few corrections.