Sorted table, a few other things.
Some changes from the new export