subtask addition and bug fixes