Optimize match algorithm

wasn't as reliable as I expected, much better now.   previously had
problem with getting remix of the specify song.