Support for multiple bundle configurations. Better logging. General cleanup.