scoring logic
some more merges