Updates and debugging
More stuff runs without error tentatively
Also, the data is moving to standard naming
That way other scripts can look for consistent names