improved calculations for cloned tasks, added teams