Massive updates, integration, preparation for season 3