more updates, fixed issue with task chaining