Team System Addition trys. Some fixes.