music fixes + label cleanup