added more bundles and some cleanup