Code cosmetics
Speed improvements
Fix recent seasons