Teams updates

closes #127