song selector, more improvements