Updates framework and hopefully fixes everything