Delete from queue, and some other minor fixes.