fixed sorting, added some touches