i've inserted a DynamicTasks.waitForLast() -- have already cleaned this up some in updated pull-request, but have done a bit more