Fixed Sorting Twice, Changed Basically Everything.