Added tagbar, cleaned bundles