Sort, speed, few GUI improvements