Music toggle, minor fixes