more cleanup to the queue watcher and tweaks to workflow