Merged in queueing code and fixed spelling mistakes