some fixes
new bundles