Fixed music code, and removed redundant stuff