Disabled more bundles and added a few.