I spent a bit of time over the past couple of months ripping some of my CDs that were missing, getting rid of mostly overlapping redundant libraries, and deleting missing music. There was various breakage that I suspect may have been partially related to Apple Match. But it seems to be in reasonable shape now as far as I can tell.