Fixups to style
Added ability to know when queue finishes