updated bundle, minor fixes