subtasks improvements