add bundles and syntax fixes