added some bundles / fixed some issues