better queuing and fixes