new source, new bundleizer, misc fixes