Rarely needed bundles are lazily added for startup/usage speed.
Some little configurations and cosmetic changes.