More work in The Team, and other bug fixes