code changes for improved component work and bundling