Fix Data issues.

Macrons missing fixed and other data issues
Fix Team Data JSON and tested