Improved a bunch of default sort order stuff