fixed playback issue after song selection, plus rebuild code loses