Fixed several minor bugs, and made teams work somewhat more intuitively...