fixing duplicate queues and some small tweaks