fixes to the order tasks are running