Fixed Bugs and Queue