Misc. clean up
Add support for bundling via browser field