Some changes to the taskmanager