update TASK and tiny cleanup