Cleanup and added some bundles