General fixes on the new music stuff and more