fixed an issue with EndState.stopWith and closing the window.
Issue #9: bundle now uses customizeable map