Small improvements
Sorting actually works now.