use_bundle
added some extra debugging; cleanup