Added table sorter and another cleanup.