Fixed some problem in queuing and added colors