Fixed some problems with queuing and added status