improvements to song selection