fixing pause and queue issues