Fixed bundles, added some options