fix few details, queues