fixed some queue stuff