No eternal loops kthx
Update pqueue to latest, with re-add ability