Small updates + important fix in Queue ...