added clientBundle and some general improvements