Bundling fix and more. Ready to turn in