Undo some changes
Enhancements for music playback