Queues calculations,validations bugfix, u/i bugfix