tons of queue improvements