Made the queue work, fixed some broken helpers