updates to handle finished tasks better