added some of sepek's suggestions to gnome-music