Changed sorting
 and other minor changes
: