Multi teams followup

This is a follow-up to #1 (fixes #2). Also:
- adds support to remove/delete teams
- minor improvements