More cmus updates