queue improvements