fixed sorting bugs
DRYed up listenTo calls