Improve print output of tables

And a minor edit.