remove next and last in TaskPlan; improve builder