minor changes, clean up, added initial code of Queue collection