Some improvements
small fixes
Check workflow/activity options.