Tweaks to single queue mode, new single user mode