change sort order
fix all the things