Major bug fixes. Bundle localization support