Queue ideosyncracies seem fixed. Needs more testing...