many task queue changes and fixes