update bundles & some defaults changes