more bundles, various changes