Small updats to Task