Make things better!
Add queue thingy
Minor changes