support for bundles and fixes
updated variations mechanism and some cleanup