improve background player, add toggle control
merge conflicts