adding bundle configuration, fix bugs