PlayQueue and player controls are now more robust