Song artwork and album merges

Hi! I have two minor issues that are kinda bothering me ahaha

1) I would love to be able to select which artwork is displayed when looking at tracks, ever since music videos were added a lot of my songs are displaying a random still from the video instead of the album or single art

2) I have several albums that have two almost identical versions, but their streams are not merged. I would love to be able to merge albums with the same artist name and similar titles.

Thank you!!!