Fixed some bugs, Sort datapoints by score