Added music, removed debugging code, fix upgrades