improvements and bug-fixes to tasks