Some bundle cleanup, and new bundles for js