fixed a bunch of sorts to work nicely