Updates to TeamModules and other stuff