diff --git a/CHANGELOG.md b/CHANGELOG.md
index d8ff664b..e90dd246 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,8 @@
 
 ## X.X.X (comming soon)
 
+## 4.3.0 (30 October 2021)
+
 Features:
   - Added `LeaderElector.hasLeader`
   - Added `LeaderElector.broadcastChannel`
diff --git a/dist/es5node/broadcast-channel.js b/dist/es5node/broadcast-channel.js
index 0e7cbfc1..5e2822a4 100644
--- a/dist/es5node/broadcast-channel.js
+++ b/dist/es5node/broadcast-channel.js
@@ -3,9 +3,9 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
+exports.BroadcastChannel = void 0;
 exports.clearNodeFolder = clearNodeFolder;
 exports.enforceOptions = enforceOptions;
-exports.BroadcastChannel = void 0;
 
 var _util = require("./util.js");
 
@@ -85,7 +85,7 @@ function clearNodeFolder(options) {
       return true;
     });
   } else {
-    return Promise.resolve(false);
+    return _util.PROMISE_RESOLVED_FALSE;
   }
 }
 /**
@@ -155,7 +155,7 @@ BroadcastChannel.prototype = {
     }
 
     this.closed = true;
-    var awaitPrepare = this._prepP ? this._prepP : Promise.resolve();
+    var awaitPrepare = this._prepP ? this._prepP : _util.PROMISE_RESOLVED_VOID;
     this._onML = null;
     this._addEL.message = [];
     return awaitPrepare // wait until all current sending are processed
@@ -193,7 +193,7 @@ function _post(broadcastChannel, type, msg) {
     type: type,
     data: msg
   };
-  var awaitPrepare = broadcastChannel._prepP ? broadcastChannel._prepP : Promise.resolve();
+  var awaitPrepare = broadcastChannel._prepP ? broadcastChannel._prepP : _util.PROMISE_RESOLVED_VOID;
   return awaitPrepare.then(function () {
     var sendPromise = broadcastChannel.method.postMessage(broadcastChannel._state, msgObj); // add/remove to unsend messages list
 
diff --git a/dist/es5node/index.js b/dist/es5node/index.js
index cbfd05e1..8bc266af 100644
--- a/dist/es5node/index.js
+++ b/dist/es5node/index.js
@@ -9,16 +9,16 @@ Object.defineProperty(exports, "BroadcastChannel", {
     return _broadcastChannel.BroadcastChannel;
   }
 });
-Object.defineProperty(exports, "clearNodeFolder", {
+Object.defineProperty(exports, "beLeader", {
   enumerable: true,
   get: function get() {
-    return _broadcastChannel.clearNodeFolder;
+    return _leaderElection.beLeader;
   }
 });
-Object.defineProperty(exports, "enforceOptions", {
+Object.defineProperty(exports, "clearNodeFolder", {
   enumerable: true,
   get: function get() {
-    return _broadcastChannel.enforceOptions;
+    return _broadcastChannel.clearNodeFolder;
   }
 });
 Object.defineProperty(exports, "createLeaderElection", {
@@ -27,10 +27,10 @@ Object.defineProperty(exports, "createLeaderElection", {
     return _leaderElection.createLeaderElection;
   }
 });
-Object.defineProperty(exports, "beLeader", {
+Object.defineProperty(exports, "enforceOptions", {
   enumerable: true,
   get: function get() {
-    return _leaderElection.beLeader;
+    return _broadcastChannel.enforceOptions;
   }
 });
 
diff --git a/dist/es5node/leader-election.js b/dist/es5node/leader-election.js
index 3b2a9105..131febfe 100644
--- a/dist/es5node/leader-election.js
+++ b/dist/es5node/leader-election.js
@@ -12,10 +12,11 @@ var _util = require("./util.js");
 
 var _unload = _interopRequireDefault(require("unload"));
 
-var LeaderElection = function LeaderElection(channel, options) {
-  this._channel = channel;
+var LeaderElection = function LeaderElection(broadcastChannel, options) {
+  this.broadcastChannel = broadcastChannel;
   this._options = options;
   this.isLeader = false;
+  this.hasLeader = false;
   this.isDead = false;
   this.token = (0, _util.randomToken)();
   this._isApl = false; // _isApplying
@@ -38,12 +39,18 @@ LeaderElection.prototype = {
   applyOnce: function applyOnce() {
     var _this = this;
 
-    if (this.isLeader) return Promise.resolve(false);
-    if (this.isDead) return Promise.resolve(false); // do nothing if already running
+    if (this.isLeader) {
+      return _util.PROMISE_RESOLVED_FALSE;
+    }
+
+    if (this.isDead) {
+      return _util.PROMISE_RESOLVED_FALSE;
+    } // do nothing if already running
+
 
     if (this._isApl) {
       this._reApply = true;
-      return Promise.resolve(false);
+      return _util.PROMISE_RESOLVED_FALSE;
     }
 
     this._isApl = true;
@@ -65,23 +72,32 @@ LeaderElection.prototype = {
         if (msg.action === 'tell') {
           // other is already leader
           stopCriteria = true;
+          _this.hasLeader = true;
         }
       }
     };
 
-    this._channel.addEventListener('internal', handleMessage);
+    this.broadcastChannel.addEventListener('internal', handleMessage);
 
     var ret = _sendMessage(this, 'apply') // send out that this one is applying
     .then(function () {
       return (0, _util.sleep)(_this._options.responseTime);
     }) // let others time to respond
     .then(function () {
-      if (stopCriteria) return Promise.reject(new Error());else return _sendMessage(_this, 'apply');
+      if (stopCriteria) {
+        return _util.PROMISE_REJECTED;
+      } else {
+        return _sendMessage(_this, 'apply');
+      }
     }).then(function () {
       return (0, _util.sleep)(_this._options.responseTime);
     }) // let others time to respond
     .then(function () {
-      if (stopCriteria) return Promise.reject(new Error());else return _sendMessage(_this);
+      if (stopCriteria) {
+        return _util.PROMISE_REJECTED;
+      } else {
+        return _sendMessage(_this);
+      }
     }).then(function () {
       return beLeader(_this);
     }) // no one disagreed -> this one is now leader
@@ -91,7 +107,7 @@ LeaderElection.prototype = {
       return false;
     }) // apply not successfull
     .then(function (success) {
-      _this._channel.removeEventListener('internal', handleMessage);
+      _this.broadcastChannel.removeEventListener('internal', handleMessage);
 
       _this._isApl = false;
 
@@ -120,11 +136,15 @@ LeaderElection.prototype = {
   die: function die() {
     var _this2 = this;
 
-    if (this.isDead) return;
+    if (this.isDead || !this.isLeader) {
+      return;
+    }
+
+    this.hasLeader = false;
     this.isDead = true;
 
     this._lstns.forEach(function (listener) {
-      return _this2._channel.removeEventListener('internal', listener);
+      return _this2.broadcastChannel.removeEventListener('internal', listener);
     });
 
     this._invs.forEach(function (interval) {
@@ -138,9 +158,15 @@ LeaderElection.prototype = {
     return _sendMessage(this, 'death');
   }
 };
+/**
+ * @param leaderElector {LeaderElector}
+ */
 
 function _awaitLeadershipOnce(leaderElector) {
-  if (leaderElector.isLeader) return Promise.resolve();
+  if (leaderElector.isLeader) {
+    return _util.PROMISE_RESOLVED_VOID;
+  }
+
   return new Promise(function (res) {
     var resolved = false;
 
@@ -151,9 +177,7 @@ function _awaitLeadershipOnce(leaderElector) {
 
       resolved = true;
       clearInterval(interval);
-
-      leaderElector._channel.removeEventListener('internal', whenDeathListener);
-
+      leaderElector.broadcastChannel.removeEventListener('internal', whenDeathListener);
       res(true);
     } // try once now
 
@@ -177,13 +201,16 @@ function _awaitLeadershipOnce(leaderElector) {
 
     var whenDeathListener = function whenDeathListener(msg) {
       if (msg.context === 'leader' && msg.action === 'death') {
+        leaderElector.hasLeader = false;
         leaderElector.applyOnce().then(function () {
-          if (leaderElector.isLeader) finish();
+          if (leaderElector.isLeader) {
+            finish();
+          }
         });
       }
     };
 
-    leaderElector._channel.addEventListener('internal', whenDeathListener);
+    leaderElector.broadcastChannel.addEventListener('internal', whenDeathListener);
 
     leaderElector._lstns.push(whenDeathListener);
   });
@@ -199,11 +226,12 @@ function _sendMessage(leaderElector, action) {
     action: action,
     token: leaderElector.token
   };
-  return leaderElector._channel.postInternal(msgJson);
+  return leaderElector.broadcastChannel.postInternal(msgJson);
 }
 
 function beLeader(leaderElector) {
   leaderElector.isLeader = true;
+  leaderElector.hasLeader = true;
 
   var unloadFn = _unload["default"].add(function () {
     return leaderElector.die();
@@ -235,7 +263,7 @@ function beLeader(leaderElector) {
     }
   };
 
-  leaderElector._channel.addEventListener('internal', isLeaderListener);
+  leaderElector.broadcastChannel.addEventListener('internal', isLeaderListener);
 
   leaderElector._lstns.push(isLeaderListener);
 
diff --git a/dist/es5node/methods/indexed-db.js b/dist/es5node/methods/indexed-db.js
index 25ab2fa8..0621cc11 100644
--- a/dist/es5node/methods/indexed-db.js
+++ b/dist/es5node/methods/indexed-db.js
@@ -3,21 +3,23 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.getIdb = getIdb;
+exports.averageResponseTime = averageResponseTime;
+exports.canBeUsed = canBeUsed;
+exports.cleanOldMessages = cleanOldMessages;
+exports.close = close;
+exports.create = create;
 exports.createDatabase = createDatabase;
-exports.writeMessage = writeMessage;
+exports["default"] = void 0;
 exports.getAllMessages = getAllMessages;
+exports.getIdb = getIdb;
 exports.getMessagesHigherThan = getMessagesHigherThan;
-exports.removeMessageById = removeMessageById;
 exports.getOldMessages = getOldMessages;
-exports.cleanOldMessages = cleanOldMessages;
-exports.create = create;
-exports.close = close;
-exports.postMessage = postMessage;
+exports.microSeconds = void 0;
 exports.onMessage = onMessage;
-exports.canBeUsed = canBeUsed;
-exports.averageResponseTime = averageResponseTime;
-exports["default"] = exports.type = exports.microSeconds = void 0;
+exports.postMessage = postMessage;
+exports.removeMessageById = removeMessageById;
+exports.type = void 0;
+exports.writeMessage = writeMessage;
 
 var _util = require("../util.js");
 
@@ -215,7 +217,7 @@ function create(channelName, options) {
        */
       eMIs: new _obliviousSet.ObliviousSet(options.idb.ttl * 2),
       // ensures we do not read messages in parrallel
-      writeBlockPromise: Promise.resolve(),
+      writeBlockPromise: _util.PROMISE_RESOLVED_VOID,
       messagesCallback: null,
       readQueuePromises: [],
       db: db
@@ -269,9 +271,9 @@ function _filterMessage(msgObj, state) {
 
 function readNewMessages(state) {
   // channel already closed
-  if (state.closed) return Promise.resolve(); // if no one is listening, we do not need to scan for new messages
+  if (state.closed) return _util.PROMISE_RESOLVED_VOID; // if no one is listening, we do not need to scan for new messages
 
-  if (!state.messagesCallback) return Promise.resolve();
+  if (!state.messagesCallback) return _util.PROMISE_RESOLVED_VOID;
   return getMessagesHigherThan(state.db, state.lastCursorId).then(function (newerMessages) {
     var useMessages = newerMessages
     /**
@@ -299,7 +301,7 @@ function readNewMessages(state) {
         state.messagesCallback(msgObj.data);
       }
     });
-    return Promise.resolve();
+    return _util.PROMISE_RESOLVED_VOID;
   });
 }
 
diff --git a/dist/es5node/methods/localstorage.js b/dist/es5node/methods/localstorage.js
index f9261883..31921f6a 100644
--- a/dist/es5node/methods/localstorage.js
+++ b/dist/es5node/methods/localstorage.js
@@ -3,17 +3,19 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.getLocalStorage = getLocalStorage;
-exports.storageKey = storageKey;
-exports.postMessage = postMessage;
 exports.addStorageEventListener = addStorageEventListener;
-exports.removeStorageEventListener = removeStorageEventListener;
-exports.create = create;
+exports.averageResponseTime = averageResponseTime;
+exports.canBeUsed = canBeUsed;
 exports.close = close;
+exports.create = create;
+exports["default"] = void 0;
+exports.getLocalStorage = getLocalStorage;
+exports.microSeconds = void 0;
 exports.onMessage = onMessage;
-exports.canBeUsed = canBeUsed;
-exports.averageResponseTime = averageResponseTime;
-exports["default"] = exports.type = exports.microSeconds = void 0;
+exports.postMessage = postMessage;
+exports.removeStorageEventListener = removeStorageEventListener;
+exports.storageKey = storageKey;
+exports.type = void 0;
 
 var _obliviousSet = require("oblivious-set");
 
diff --git a/dist/es5node/methods/native.js b/dist/es5node/methods/native.js
index 504ac8e8..3b1ec366 100644
--- a/dist/es5node/methods/native.js
+++ b/dist/es5node/methods/native.js
@@ -3,13 +3,14 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.create = create;
+exports.averageResponseTime = averageResponseTime;
+exports.canBeUsed = canBeUsed;
 exports.close = close;
-exports.postMessage = postMessage;
+exports.create = create;
+exports.microSeconds = exports["default"] = void 0;
 exports.onMessage = onMessage;
-exports.canBeUsed = canBeUsed;
-exports.averageResponseTime = averageResponseTime;
-exports["default"] = exports.type = exports.microSeconds = void 0;
+exports.postMessage = postMessage;
+exports.type = void 0;
 
 var _util = require("../util");
 
@@ -43,7 +44,7 @@ function close(channelState) {
 function postMessage(channelState, messageJson) {
   try {
     channelState.bc.postMessage(messageJson, false);
-    return Promise.resolve();
+    return _util.PROMISE_RESOLVED_VOID;
   } catch (err) {
     return Promise.reject(err);
   }
diff --git a/dist/es5node/methods/node.js b/dist/es5node/methods/node.js
index 2439f173..0dfb23b7 100644
--- a/dist/es5node/methods/node.js
+++ b/dist/es5node/methods/node.js
@@ -5,35 +5,36 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
+exports.TMP_FOLDER_BASE = void 0;
+exports._filterMessage = _filterMessage;
+exports.averageResponseTime = averageResponseTime;
+exports.canBeUsed = canBeUsed;
+exports.cleanOldMessages = cleanOldMessages;
 exports.cleanPipeName = cleanPipeName;
-exports.getPaths = getPaths;
-exports.ensureFoldersExist = ensureFoldersExist;
 exports.clearNodeFolder = clearNodeFolder;
-exports.socketPath = socketPath;
-exports.socketInfoPath = socketInfoPath;
-exports.createSocketInfoFile = createSocketInfoFile;
+exports.close = close;
 exports.countChannelFolders = countChannelFolders;
+exports.create = create;
 exports.createSocketEventEmitter = createSocketEventEmitter;
-exports.openClientConnection = openClientConnection;
-exports.writeMessage = writeMessage;
-exports.getReadersUuids = getReadersUuids;
-exports.messagePath = messagePath;
+exports.createSocketInfoFile = createSocketInfoFile;
+exports.emitOverFastPath = emitOverFastPath;
+exports.ensureFoldersExist = ensureFoldersExist;
 exports.getAllMessages = getAllMessages;
+exports.getPaths = getPaths;
+exports.getReadersUuids = getReadersUuids;
 exports.getSingleMessage = getSingleMessage;
-exports.readMessage = readMessage;
-exports.cleanOldMessages = cleanOldMessages;
-exports.create = create;
-exports._filterMessage = _filterMessage;
 exports.handleMessagePing = handleMessagePing;
-exports.refreshReaderClients = refreshReaderClients;
-exports.postMessage = postMessage;
-exports.emitOverFastPath = emitOverFastPath;
-exports.onMessage = onMessage;
-exports.close = close;
-exports.canBeUsed = canBeUsed;
-exports.averageResponseTime = averageResponseTime;
+exports.messagePath = messagePath;
 exports.microSeconds = microSeconds;
-exports.type = exports.TMP_FOLDER_BASE = void 0;
+exports.onMessage = onMessage;
+exports.openClientConnection = openClientConnection;
+exports.postMessage = postMessage;
+exports.readMessage = readMessage;
+exports.refreshReaderClients = refreshReaderClients;
+exports.socketInfoPath = socketInfoPath;
+exports.socketPath = socketPath;
+exports.type = void 0;
+exports.writeMessage = writeMessage;
 
 var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
 
@@ -736,7 +737,7 @@ function _create() {
               messagesCallbackTime: null,
               messagesCallback: null,
               // ensures we do not read messages in parrallel
-              writeBlockPromise: Promise.resolve(),
+              writeBlockPromise: _util2.PROMISE_RESOLVED_VOID,
               otherReaderClients: {},
               // ensure if process crashes, everything is cleaned up
               removeUnload: _unload["default"].add(function () {
diff --git a/dist/es5node/methods/simulate.js b/dist/es5node/methods/simulate.js
index 09b12b89..cb4ef3b2 100644
--- a/dist/es5node/methods/simulate.js
+++ b/dist/es5node/methods/simulate.js
@@ -3,13 +3,14 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.create = create;
+exports.averageResponseTime = averageResponseTime;
+exports.canBeUsed = canBeUsed;
 exports.close = close;
-exports.postMessage = postMessage;
+exports.create = create;
+exports.microSeconds = exports["default"] = void 0;
 exports.onMessage = onMessage;
-exports.canBeUsed = canBeUsed;
-exports.averageResponseTime = averageResponseTime;
-exports["default"] = exports.type = exports.microSeconds = void 0;
+exports.postMessage = postMessage;
+exports.type = void 0;
 
 var _util = require("../util");
 
diff --git a/dist/es5node/util.js b/dist/es5node/util.js
index 8fba57af..c8e8bd85 100644
--- a/dist/es5node/util.js
+++ b/dist/es5node/util.js
@@ -3,12 +3,12 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
+exports.isNode = exports.PROMISE_RESOLVED_VOID = exports.PROMISE_RESOLVED_FALSE = exports.PROMISE_REJECTED = void 0;
 exports.isPromise = isPromise;
-exports.sleep = sleep;
+exports.microSeconds = microSeconds;
 exports.randomInt = randomInt;
 exports.randomToken = randomToken;
-exports.microSeconds = microSeconds;
-exports.isNode = void 0;
+exports.sleep = sleep;
 
 /**
  * returns true if the given object is a promise
@@ -21,6 +21,13 @@ function isPromise(obj) {
   }
 }
 
+var PROMISE_RESOLVED_FALSE = Promise.resolve(false);
+exports.PROMISE_RESOLVED_FALSE = PROMISE_RESOLVED_FALSE;
+var PROMISE_RESOLVED_VOID = Promise.resolve();
+exports.PROMISE_RESOLVED_VOID = PROMISE_RESOLVED_VOID;
+var PROMISE_REJECTED = Promise.reject(new Error());
+exports.PROMISE_REJECTED = PROMISE_REJECTED;
+
 function sleep(time) {
   if (!time) time = 0;
   return new Promise(function (res) {
diff --git a/dist/esbrowser/broadcast-channel.js b/dist/esbrowser/broadcast-channel.js
index d57d6050..bdccd05e 100644
--- a/dist/esbrowser/broadcast-channel.js
+++ b/dist/esbrowser/broadcast-channel.js
@@ -1,4 +1,4 @@
-import { isPromise } from './util.js';
+import { isPromise, PROMISE_RESOLVED_FALSE, PROMISE_RESOLVED_VOID } from './util.js';
 import { chooseMethod } from './method-chooser.js';
 import { fillOptionsWithDefaults } from './options.js';
 export var BroadcastChannel = function BroadcastChannel(name, options) {
@@ -71,7 +71,7 @@ export function clearNodeFolder(options) {
       return true;
     });
   } else {
-    return Promise.resolve(false);
+    return PROMISE_RESOLVED_FALSE;
   }
 }
 /**
@@ -138,7 +138,7 @@ BroadcastChannel.prototype = {
     }
 
     this.closed = true;
-    var awaitPrepare = this._prepP ? this._prepP : Promise.resolve();
+    var awaitPrepare = this._prepP ? this._prepP : PROMISE_RESOLVED_VOID;
     this._onML = null;
     this._addEL.message = [];
     return awaitPrepare // wait until all current sending are processed
@@ -176,7 +176,7 @@ function _post(broadcastChannel, type, msg) {
     type: type,
     data: msg
   };
-  var awaitPrepare = broadcastChannel._prepP ? broadcastChannel._prepP : Promise.resolve();
+  var awaitPrepare = broadcastChannel._prepP ? broadcastChannel._prepP : PROMISE_RESOLVED_VOID;
   return awaitPrepare.then(function () {
     var sendPromise = broadcastChannel.method.postMessage(broadcastChannel._state, msgObj); // add/remove to unsend messages list
 
diff --git a/dist/esbrowser/leader-election.js b/dist/esbrowser/leader-election.js
index e201934b..3fed5ea1 100644
--- a/dist/esbrowser/leader-election.js
+++ b/dist/esbrowser/leader-election.js
@@ -1,10 +1,11 @@
-import { sleep, randomToken } from './util.js';
+import { sleep, randomToken, PROMISE_RESOLVED_FALSE, PROMISE_RESOLVED_VOID, PROMISE_REJECTED } from './util.js';
 import unload from 'unload';
 
-var LeaderElection = function LeaderElection(channel, options) {
-  this._channel = channel;
+var LeaderElection = function LeaderElection(broadcastChannel, options) {
+  this.broadcastChannel = broadcastChannel;
   this._options = options;
   this.isLeader = false;
+  this.hasLeader = false;
   this.isDead = false;
   this.token = randomToken();
   this._isApl = false; // _isApplying
@@ -27,12 +28,18 @@ LeaderElection.prototype = {
   applyOnce: function applyOnce() {
     var _this = this;
 
-    if (this.isLeader) return Promise.resolve(false);
-    if (this.isDead) return Promise.resolve(false); // do nothing if already running
+    if (this.isLeader) {
+      return PROMISE_RESOLVED_FALSE;
+    }
+
+    if (this.isDead) {
+      return PROMISE_RESOLVED_FALSE;
+    } // do nothing if already running
+
 
     if (this._isApl) {
       this._reApply = true;
-      return Promise.resolve(false);
+      return PROMISE_RESOLVED_FALSE;
     }
 
     this._isApl = true;
@@ -54,23 +61,32 @@ LeaderElection.prototype = {
         if (msg.action === 'tell') {
           // other is already leader
           stopCriteria = true;
+          _this.hasLeader = true;
         }
       }
     };
 
-    this._channel.addEventListener('internal', handleMessage);
+    this.broadcastChannel.addEventListener('internal', handleMessage);
 
     var ret = _sendMessage(this, 'apply') // send out that this one is applying
     .then(function () {
       return sleep(_this._options.responseTime);
     }) // let others time to respond
     .then(function () {
-      if (stopCriteria) return Promise.reject(new Error());else return _sendMessage(_this, 'apply');
+      if (stopCriteria) {
+        return PROMISE_REJECTED;
+      } else {
+        return _sendMessage(_this, 'apply');
+      }
     }).then(function () {
       return sleep(_this._options.responseTime);
     }) // let others time to respond
     .then(function () {
-      if (stopCriteria) return Promise.reject(new Error());else return _sendMessage(_this);
+      if (stopCriteria) {
+        return PROMISE_REJECTED;
+      } else {
+        return _sendMessage(_this);
+      }
     }).then(function () {
       return beLeader(_this);
     }) // no one disagreed -> this one is now leader
@@ -80,7 +96,7 @@ LeaderElection.prototype = {
       return false;
     }) // apply not successfull
     .then(function (success) {
-      _this._channel.removeEventListener('internal', handleMessage);
+      _this.broadcastChannel.removeEventListener('internal', handleMessage);
 
       _this._isApl = false;
 
@@ -109,11 +125,15 @@ LeaderElection.prototype = {
   die: function die() {
     var _this2 = this;
 
-    if (this.isDead) return;
+    if (this.isDead || !this.isLeader) {
+      return;
+    }
+
+    this.hasLeader = false;
     this.isDead = true;
 
     this._lstns.forEach(function (listener) {
-      return _this2._channel.removeEventListener('internal', listener);
+      return _this2.broadcastChannel.removeEventListener('internal', listener);
     });
 
     this._invs.forEach(function (interval) {
@@ -127,9 +147,15 @@ LeaderElection.prototype = {
     return _sendMessage(this, 'death');
   }
 };
+/**
+ * @param leaderElector {LeaderElector}
+ */
 
 function _awaitLeadershipOnce(leaderElector) {
-  if (leaderElector.isLeader) return Promise.resolve();
+  if (leaderElector.isLeader) {
+    return PROMISE_RESOLVED_VOID;
+  }
+
   return new Promise(function (res) {
     var resolved = false;
 
@@ -140,9 +166,7 @@ function _awaitLeadershipOnce(leaderElector) {
 
       resolved = true;
       clearInterval(interval);
-
-      leaderElector._channel.removeEventListener('internal', whenDeathListener);
-
+      leaderElector.broadcastChannel.removeEventListener('internal', whenDeathListener);
       res(true);
     } // try once now
 
@@ -166,13 +190,16 @@ function _awaitLeadershipOnce(leaderElector) {
 
     var whenDeathListener = function whenDeathListener(msg) {
       if (msg.context === 'leader' && msg.action === 'death') {
+        leaderElector.hasLeader = false;
         leaderElector.applyOnce().then(function () {
-          if (leaderElector.isLeader) finish();
+          if (leaderElector.isLeader) {
+            finish();
+          }
         });
       }
     };
 
-    leaderElector._channel.addEventListener('internal', whenDeathListener);
+    leaderElector.broadcastChannel.addEventListener('internal', whenDeathListener);
 
     leaderElector._lstns.push(whenDeathListener);
   });
@@ -188,11 +215,12 @@ function _sendMessage(leaderElector, action) {
     action: action,
     token: leaderElector.token
   };
-  return leaderElector._channel.postInternal(msgJson);
+  return leaderElector.broadcastChannel.postInternal(msgJson);
 }
 
 export function beLeader(leaderElector) {
   leaderElector.isLeader = true;
+  leaderElector.hasLeader = true;
   var unloadFn = unload.add(function () {
     return leaderElector.die();
   });
@@ -223,7 +251,7 @@ export function beLeader(leaderElector) {
     }
   };
 
-  leaderElector._channel.addEventListener('internal', isLeaderListener);
+  leaderElector.broadcastChannel.addEventListener('internal', isLeaderListener);
 
   leaderElector._lstns.push(isLeaderListener);
 
diff --git a/dist/esbrowser/methods/indexed-db.js b/dist/esbrowser/methods/indexed-db.js
index e47568ca..957b8e05 100644
--- a/dist/esbrowser/methods/indexed-db.js
+++ b/dist/esbrowser/methods/indexed-db.js
@@ -3,7 +3,7 @@
  * There is currently no observerAPI for idb
  * @link https://github.com/w3c/IndexedDB/issues/51
  */
-import { sleep, randomInt, randomToken, microSeconds as micro, isNode } from '../util.js';
+import { sleep, randomInt, randomToken, microSeconds as micro, isNode, PROMISE_RESOLVED_VOID } from '../util.js';
 export var microSeconds = micro;
 import { ObliviousSet } from 'oblivious-set';
 import { fillOptionsWithDefaults } from '../options';
@@ -180,7 +180,7 @@ export function create(channelName, options) {
        */
       eMIs: new ObliviousSet(options.idb.ttl * 2),
       // ensures we do not read messages in parrallel
-      writeBlockPromise: Promise.resolve(),
+      writeBlockPromise: PROMISE_RESOLVED_VOID,
       messagesCallback: null,
       readQueuePromises: [],
       db: db
@@ -234,9 +234,9 @@ function _filterMessage(msgObj, state) {
 
 function readNewMessages(state) {
   // channel already closed
-  if (state.closed) return Promise.resolve(); // if no one is listening, we do not need to scan for new messages
+  if (state.closed) return PROMISE_RESOLVED_VOID; // if no one is listening, we do not need to scan for new messages
 
-  if (!state.messagesCallback) return Promise.resolve();
+  if (!state.messagesCallback) return PROMISE_RESOLVED_VOID;
   return getMessagesHigherThan(state.db, state.lastCursorId).then(function (newerMessages) {
     var useMessages = newerMessages
     /**
@@ -264,7 +264,7 @@ function readNewMessages(state) {
         state.messagesCallback(msgObj.data);
       }
     });
-    return Promise.resolve();
+    return PROMISE_RESOLVED_VOID;
   });
 }
 
diff --git a/dist/esbrowser/methods/native.js b/dist/esbrowser/methods/native.js
index cd8bf407..cef714d2 100644
--- a/dist/esbrowser/methods/native.js
+++ b/dist/esbrowser/methods/native.js
@@ -1,4 +1,4 @@
-import { microSeconds as micro, isNode } from '../util';
+import { microSeconds as micro, isNode, PROMISE_RESOLVED_VOID } from '../util';
 export var microSeconds = micro;
 export var type = 'native';
 export function create(channelName) {
@@ -24,7 +24,7 @@ export function close(channelState) {
 export function postMessage(channelState, messageJson) {
   try {
     channelState.bc.postMessage(messageJson, false);
-    return Promise.resolve();
+    return PROMISE_RESOLVED_VOID;
   } catch (err) {
     return Promise.reject(err);
   }
diff --git a/dist/esbrowser/methods/node.js b/dist/esbrowser/methods/node.js
index 4993741d..c92395cf 100644
--- a/dist/esbrowser/methods/node.js
+++ b/dist/esbrowser/methods/node.js
@@ -17,7 +17,7 @@ import { sha3_224 } from 'js-sha3';
 import isNode from 'detect-node';
 import unload from 'unload';
 import { fillOptionsWithDefaults } from '../options.js';
-import { randomInt, randomToken } from '../util.js';
+import { randomInt, randomToken, PROMISE_RESOLVED_VOID } from '../util.js';
 import { ObliviousSet } from 'oblivious-set';
 /**
  * windows sucks, so we have handle windows-type of socket-paths
@@ -651,7 +651,7 @@ function _create() {
               messagesCallbackTime: null,
               messagesCallback: null,
               // ensures we do not read messages in parrallel
-              writeBlockPromise: Promise.resolve(),
+              writeBlockPromise: PROMISE_RESOLVED_VOID,
               otherReaderClients: {},
               // ensure if process crashes, everything is cleaned up
               removeUnload: unload.add(function () {
diff --git a/dist/esbrowser/util.js b/dist/esbrowser/util.js
index f8fc8363..b03f8162 100644
--- a/dist/esbrowser/util.js
+++ b/dist/esbrowser/util.js
@@ -8,6 +8,9 @@ export function isPromise(obj) {
     return false;
   }
 }
+export var PROMISE_RESOLVED_FALSE = Promise.resolve(false);
+export var PROMISE_RESOLVED_VOID = Promise.resolve();
+export var PROMISE_REJECTED = Promise.reject(new Error());
 export function sleep(time) {
   if (!time) time = 0;
   return new Promise(function (res) {
diff --git a/dist/esnode/broadcast-channel.js b/dist/esnode/broadcast-channel.js
index d57d6050..bdccd05e 100644
--- a/dist/esnode/broadcast-channel.js
+++ b/dist/esnode/broadcast-channel.js
@@ -1,4 +1,4 @@
-import { isPromise } from './util.js';
+import { isPromise, PROMISE_RESOLVED_FALSE, PROMISE_RESOLVED_VOID } from './util.js';
 import { chooseMethod } from './method-chooser.js';
 import { fillOptionsWithDefaults } from './options.js';
 export var BroadcastChannel = function BroadcastChannel(name, options) {
@@ -71,7 +71,7 @@ export function clearNodeFolder(options) {
       return true;
     });
   } else {
-    return Promise.resolve(false);
+    return PROMISE_RESOLVED_FALSE;
   }
 }
 /**
@@ -138,7 +138,7 @@ BroadcastChannel.prototype = {
     }
 
     this.closed = true;
-    var awaitPrepare = this._prepP ? this._prepP : Promise.resolve();
+    var awaitPrepare = this._prepP ? this._prepP : PROMISE_RESOLVED_VOID;
     this._onML = null;
     this._addEL.message = [];
     return awaitPrepare // wait until all current sending are processed
@@ -176,7 +176,7 @@ function _post(broadcastChannel, type, msg) {
     type: type,
     data: msg
   };
-  var awaitPrepare = broadcastChannel._prepP ? broadcastChannel._prepP : Promise.resolve();
+  var awaitPrepare = broadcastChannel._prepP ? broadcastChannel._prepP : PROMISE_RESOLVED_VOID;
   return awaitPrepare.then(function () {
     var sendPromise = broadcastChannel.method.postMessage(broadcastChannel._state, msgObj); // add/remove to unsend messages list
 
diff --git a/dist/esnode/leader-election.js b/dist/esnode/leader-election.js
index e201934b..3fed5ea1 100644
--- a/dist/esnode/leader-election.js
+++ b/dist/esnode/leader-election.js
@@ -1,10 +1,11 @@
-import { sleep, randomToken } from './util.js';
+import { sleep, randomToken, PROMISE_RESOLVED_FALSE, PROMISE_RESOLVED_VOID, PROMISE_REJECTED } from './util.js';
 import unload from 'unload';
 
-var LeaderElection = function LeaderElection(channel, options) {
-  this._channel = channel;
+var LeaderElection = function LeaderElection(broadcastChannel, options) {
+  this.broadcastChannel = broadcastChannel;
   this._options = options;
   this.isLeader = false;
+  this.hasLeader = false;
   this.isDead = false;
   this.token = randomToken();
   this._isApl = false; // _isApplying
@@ -27,12 +28,18 @@ LeaderElection.prototype = {
   applyOnce: function applyOnce() {
     var _this = this;
 
-    if (this.isLeader) return Promise.resolve(false);
-    if (this.isDead) return Promise.resolve(false); // do nothing if already running
+    if (this.isLeader) {
+      return PROMISE_RESOLVED_FALSE;
+    }
+
+    if (this.isDead) {
+      return PROMISE_RESOLVED_FALSE;
+    } // do nothing if already running
+
 
     if (this._isApl) {
       this._reApply = true;
-      return Promise.resolve(false);
+      return PROMISE_RESOLVED_FALSE;
     }
 
     this._isApl = true;
@@ -54,23 +61,32 @@ LeaderElection.prototype = {
         if (msg.action === 'tell') {
           // other is already leader
           stopCriteria = true;
+          _this.hasLeader = true;
         }
       }
     };
 
-    this._channel.addEventListener('internal', handleMessage);
+    this.broadcastChannel.addEventListener('internal', handleMessage);
 
     var ret = _sendMessage(this, 'apply') // send out that this one is applying
     .then(function () {
       return sleep(_this._options.responseTime);
     }) // let others time to respond
     .then(function () {
-      if (stopCriteria) return Promise.reject(new Error());else return _sendMessage(_this, 'apply');
+      if (stopCriteria) {
+        return PROMISE_REJECTED;
+      } else {
+        return _sendMessage(_this, 'apply');
+      }
     }).then(function () {
       return sleep(_this._options.responseTime);
     }) // let others time to respond
     .then(function () {
-      if (stopCriteria) return Promise.reject(new Error());else return _sendMessage(_this);
+      if (stopCriteria) {
+        return PROMISE_REJECTED;
+      } else {
+        return _sendMessage(_this);
+      }
     }).then(function () {
       return beLeader(_this);
     }) // no one disagreed -> this one is now leader
@@ -80,7 +96,7 @@ LeaderElection.prototype = {
       return false;
     }) // apply not successfull
     .then(function (success) {
-      _this._channel.removeEventListener('internal', handleMessage);
+      _this.broadcastChannel.removeEventListener('internal', handleMessage);
 
       _this._isApl = false;
 
@@ -109,11 +125,15 @@ LeaderElection.prototype = {
   die: function die() {
     var _this2 = this;
 
-    if (this.isDead) return;
+    if (this.isDead || !this.isLeader) {
+      return;
+    }
+
+    this.hasLeader = false;
     this.isDead = true;
 
     this._lstns.forEach(function (listener) {
-      return _this2._channel.removeEventListener('internal', listener);
+      return _this2.broadcastChannel.removeEventListener('internal', listener);
     });
 
     this._invs.forEach(function (interval) {
@@ -127,9 +147,15 @@ LeaderElection.prototype = {
     return _sendMessage(this, 'death');
   }
 };
+/**
+ * @param leaderElector {LeaderElector}
+ */
 
 function _awaitLeadershipOnce(leaderElector) {
-  if (leaderElector.isLeader) return Promise.resolve();
+  if (leaderElector.isLeader) {
+    return PROMISE_RESOLVED_VOID;
+  }
+
   return new Promise(function (res) {
     var resolved = false;
 
@@ -140,9 +166,7 @@ function _awaitLeadershipOnce(leaderElector) {
 
       resolved = true;
       clearInterval(interval);
-
-      leaderElector._channel.removeEventListener('internal', whenDeathListener);
-
+      leaderElector.broadcastChannel.removeEventListener('internal', whenDeathListener);
       res(true);
     } // try once now
 
@@ -166,13 +190,16 @@ function _awaitLeadershipOnce(leaderElector) {
 
     var whenDeathListener = function whenDeathListener(msg) {
       if (msg.context === 'leader' && msg.action === 'death') {
+        leaderElector.hasLeader = false;
         leaderElector.applyOnce().then(function () {
-          if (leaderElector.isLeader) finish();
+          if (leaderElector.isLeader) {
+            finish();
+          }
         });
       }
     };
 
-    leaderElector._channel.addEventListener('internal', whenDeathListener);
+    leaderElector.broadcastChannel.addEventListener('internal', whenDeathListener);
 
     leaderElector._lstns.push(whenDeathListener);
   });
@@ -188,11 +215,12 @@ function _sendMessage(leaderElector, action) {
     action: action,
     token: leaderElector.token
   };
-  return leaderElector._channel.postInternal(msgJson);
+  return leaderElector.broadcastChannel.postInternal(msgJson);
 }
 
 export function beLeader(leaderElector) {
   leaderElector.isLeader = true;
+  leaderElector.hasLeader = true;
   var unloadFn = unload.add(function () {
     return leaderElector.die();
   });
@@ -223,7 +251,7 @@ export function beLeader(leaderElector) {
     }
   };
 
-  leaderElector._channel.addEventListener('internal', isLeaderListener);
+  leaderElector.broadcastChannel.addEventListener('internal', isLeaderListener);
 
   leaderElector._lstns.push(isLeaderListener);
 
diff --git a/dist/esnode/methods/indexed-db.js b/dist/esnode/methods/indexed-db.js
index e47568ca..957b8e05 100644
--- a/dist/esnode/methods/indexed-db.js
+++ b/dist/esnode/methods/indexed-db.js
@@ -3,7 +3,7 @@
  * There is currently no observerAPI for idb
  * @link https://github.com/w3c/IndexedDB/issues/51
  */
-import { sleep, randomInt, randomToken, microSeconds as micro, isNode } from '../util.js';
+import { sleep, randomInt, randomToken, microSeconds as micro, isNode, PROMISE_RESOLVED_VOID } from '../util.js';
 export var microSeconds = micro;
 import { ObliviousSet } from 'oblivious-set';
 import { fillOptionsWithDefaults } from '../options';
@@ -180,7 +180,7 @@ export function create(channelName, options) {
        */
       eMIs: new ObliviousSet(options.idb.ttl * 2),
       // ensures we do not read messages in parrallel
-      writeBlockPromise: Promise.resolve(),
+      writeBlockPromise: PROMISE_RESOLVED_VOID,
       messagesCallback: null,
       readQueuePromises: [],
       db: db
@@ -234,9 +234,9 @@ function _filterMessage(msgObj, state) {
 
 function readNewMessages(state) {
   // channel already closed
-  if (state.closed) return Promise.resolve(); // if no one is listening, we do not need to scan for new messages
+  if (state.closed) return PROMISE_RESOLVED_VOID; // if no one is listening, we do not need to scan for new messages
 
-  if (!state.messagesCallback) return Promise.resolve();
+  if (!state.messagesCallback) return PROMISE_RESOLVED_VOID;
   return getMessagesHigherThan(state.db, state.lastCursorId).then(function (newerMessages) {
     var useMessages = newerMessages
     /**
@@ -264,7 +264,7 @@ function readNewMessages(state) {
         state.messagesCallback(msgObj.data);
       }
     });
-    return Promise.resolve();
+    return PROMISE_RESOLVED_VOID;
   });
 }
 
diff --git a/dist/esnode/methods/native.js b/dist/esnode/methods/native.js
index cd8bf407..cef714d2 100644
--- a/dist/esnode/methods/native.js
+++ b/dist/esnode/methods/native.js
@@ -1,4 +1,4 @@
-import { microSeconds as micro, isNode } from '../util';
+import { microSeconds as micro, isNode, PROMISE_RESOLVED_VOID } from '../util';
 export var microSeconds = micro;
 export var type = 'native';
 export function create(channelName) {
@@ -24,7 +24,7 @@ export function close(channelState) {
 export function postMessage(channelState, messageJson) {
   try {
     channelState.bc.postMessage(messageJson, false);
-    return Promise.resolve();
+    return PROMISE_RESOLVED_VOID;
   } catch (err) {
     return Promise.reject(err);
   }
diff --git a/dist/esnode/methods/node.js b/dist/esnode/methods/node.js
index 4993741d..c92395cf 100644
--- a/dist/esnode/methods/node.js
+++ b/dist/esnode/methods/node.js
@@ -17,7 +17,7 @@ import { sha3_224 } from 'js-sha3';
 import isNode from 'detect-node';
 import unload from 'unload';
 import { fillOptionsWithDefaults } from '../options.js';
-import { randomInt, randomToken } from '../util.js';
+import { randomInt, randomToken, PROMISE_RESOLVED_VOID } from '../util.js';
 import { ObliviousSet } from 'oblivious-set';
 /**
  * windows sucks, so we have handle windows-type of socket-paths
@@ -651,7 +651,7 @@ function _create() {
               messagesCallbackTime: null,
               messagesCallback: null,
               // ensures we do not read messages in parrallel
-              writeBlockPromise: Promise.resolve(),
+              writeBlockPromise: PROMISE_RESOLVED_VOID,
               otherReaderClients: {},
               // ensure if process crashes, everything is cleaned up
               removeUnload: unload.add(function () {
diff --git a/dist/esnode/util.js b/dist/esnode/util.js
index f8fc8363..b03f8162 100644
--- a/dist/esnode/util.js
+++ b/dist/esnode/util.js
@@ -8,6 +8,9 @@ export function isPromise(obj) {
     return false;
   }
 }
+export var PROMISE_RESOLVED_FALSE = Promise.resolve(false);
+export var PROMISE_RESOLVED_VOID = Promise.resolve();
+export var PROMISE_REJECTED = Promise.reject(new Error());
 export function sleep(time) {
   if (!time) time = 0;
   return new Promise(function (res) {
diff --git a/dist/lib/broadcast-channel.js b/dist/lib/broadcast-channel.js
index 0e7cbfc1..5e2822a4 100644
--- a/dist/lib/broadcast-channel.js
+++ b/dist/lib/broadcast-channel.js
@@ -3,9 +3,9 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
+exports.BroadcastChannel = void 0;
 exports.clearNodeFolder = clearNodeFolder;
 exports.enforceOptions = enforceOptions;
-exports.BroadcastChannel = void 0;
 
 var _util = require("./util.js");
 
@@ -85,7 +85,7 @@ function clearNodeFolder(options) {
       return true;
     });
   } else {
-    return Promise.resolve(false);
+    return _util.PROMISE_RESOLVED_FALSE;
   }
 }
 /**
@@ -155,7 +155,7 @@ BroadcastChannel.prototype = {
     }
 
     this.closed = true;
-    var awaitPrepare = this._prepP ? this._prepP : Promise.resolve();
+    var awaitPrepare = this._prepP ? this._prepP : _util.PROMISE_RESOLVED_VOID;
     this._onML = null;
     this._addEL.message = [];
     return awaitPrepare // wait until all current sending are processed
@@ -193,7 +193,7 @@ function _post(broadcastChannel, type, msg) {
     type: type,
     data: msg
   };
-  var awaitPrepare = broadcastChannel._prepP ? broadcastChannel._prepP : Promise.resolve();
+  var awaitPrepare = broadcastChannel._prepP ? broadcastChannel._prepP : _util.PROMISE_RESOLVED_VOID;
   return awaitPrepare.then(function () {
     var sendPromise = broadcastChannel.method.postMessage(broadcastChannel._state, msgObj); // add/remove to unsend messages list
 
diff --git a/dist/lib/browser.js b/dist/lib/browser.js
index 46e18b70..28b785b7 100644
--- a/dist/lib/browser.js
+++ b/dist/lib/browser.js
@@ -4,9 +4,9 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
+exports.BroadcastChannel = void 0;
 exports.clearNodeFolder = clearNodeFolder;
 exports.enforceOptions = enforceOptions;
-exports.BroadcastChannel = void 0;
 
 var _util = require("./util.js");
 
@@ -86,7 +86,7 @@ function clearNodeFolder(options) {
       return true;
     });
   } else {
-    return Promise.resolve(false);
+    return _util.PROMISE_RESOLVED_FALSE;
   }
 }
 /**
@@ -156,7 +156,7 @@ BroadcastChannel.prototype = {
     }
 
     this.closed = true;
-    var awaitPrepare = this._prepP ? this._prepP : Promise.resolve();
+    var awaitPrepare = this._prepP ? this._prepP : _util.PROMISE_RESOLVED_VOID;
     this._onML = null;
     this._addEL.message = [];
     return awaitPrepare // wait until all current sending are processed
@@ -194,7 +194,7 @@ function _post(broadcastChannel, type, msg) {
     type: type,
     data: msg
   };
-  var awaitPrepare = broadcastChannel._prepP ? broadcastChannel._prepP : Promise.resolve();
+  var awaitPrepare = broadcastChannel._prepP ? broadcastChannel._prepP : _util.PROMISE_RESOLVED_VOID;
   return awaitPrepare.then(function () {
     var sendPromise = broadcastChannel.method.postMessage(broadcastChannel._state, msgObj); // add/remove to unsend messages list
 
@@ -319,16 +319,16 @@ Object.defineProperty(exports, "BroadcastChannel", {
     return _broadcastChannel.BroadcastChannel;
   }
 });
-Object.defineProperty(exports, "clearNodeFolder", {
+Object.defineProperty(exports, "beLeader", {
   enumerable: true,
   get: function get() {
-    return _broadcastChannel.clearNodeFolder;
+    return _leaderElection.beLeader;
   }
 });
-Object.defineProperty(exports, "enforceOptions", {
+Object.defineProperty(exports, "clearNodeFolder", {
   enumerable: true,
   get: function get() {
-    return _broadcastChannel.enforceOptions;
+    return _broadcastChannel.clearNodeFolder;
   }
 });
 Object.defineProperty(exports, "createLeaderElection", {
@@ -337,10 +337,10 @@ Object.defineProperty(exports, "createLeaderElection", {
     return _leaderElection.createLeaderElection;
   }
 });
-Object.defineProperty(exports, "beLeader", {
+Object.defineProperty(exports, "enforceOptions", {
   enumerable: true,
   get: function get() {
-    return _leaderElection.beLeader;
+    return _broadcastChannel.enforceOptions;
   }
 });
 
@@ -362,10 +362,11 @@ var _util = require("./util.js");
 
 var _unload = _interopRequireDefault(require("unload"));
 
-var LeaderElection = function LeaderElection(channel, options) {
-  this._channel = channel;
+var LeaderElection = function LeaderElection(broadcastChannel, options) {
+  this.broadcastChannel = broadcastChannel;
   this._options = options;
   this.isLeader = false;
+  this.hasLeader = false;
   this.isDead = false;
   this.token = (0, _util.randomToken)();
   this._isApl = false; // _isApplying
@@ -388,12 +389,18 @@ LeaderElection.prototype = {
   applyOnce: function applyOnce() {
     var _this = this;
 
-    if (this.isLeader) return Promise.resolve(false);
-    if (this.isDead) return Promise.resolve(false); // do nothing if already running
+    if (this.isLeader) {
+      return _util.PROMISE_RESOLVED_FALSE;
+    }
+
+    if (this.isDead) {
+      return _util.PROMISE_RESOLVED_FALSE;
+    } // do nothing if already running
+
 
     if (this._isApl) {
       this._reApply = true;
-      return Promise.resolve(false);
+      return _util.PROMISE_RESOLVED_FALSE;
     }
 
     this._isApl = true;
@@ -415,23 +422,32 @@ LeaderElection.prototype = {
         if (msg.action === 'tell') {
           // other is already leader
           stopCriteria = true;
+          _this.hasLeader = true;
         }
       }
     };
 
-    this._channel.addEventListener('internal', handleMessage);
+    this.broadcastChannel.addEventListener('internal', handleMessage);
 
     var ret = _sendMessage(this, 'apply') // send out that this one is applying
     .then(function () {
       return (0, _util.sleep)(_this._options.responseTime);
     }) // let others time to respond
     .then(function () {
-      if (stopCriteria) return Promise.reject(new Error());else return _sendMessage(_this, 'apply');
+      if (stopCriteria) {
+        return _util.PROMISE_REJECTED;
+      } else {
+        return _sendMessage(_this, 'apply');
+      }
     }).then(function () {
       return (0, _util.sleep)(_this._options.responseTime);
     }) // let others time to respond
     .then(function () {
-      if (stopCriteria) return Promise.reject(new Error());else return _sendMessage(_this);
+      if (stopCriteria) {
+        return _util.PROMISE_REJECTED;
+      } else {
+        return _sendMessage(_this);
+      }
     }).then(function () {
       return beLeader(_this);
     }) // no one disagreed -> this one is now leader
@@ -441,7 +457,7 @@ LeaderElection.prototype = {
       return false;
     }) // apply not successfull
     .then(function (success) {
-      _this._channel.removeEventListener('internal', handleMessage);
+      _this.broadcastChannel.removeEventListener('internal', handleMessage);
 
       _this._isApl = false;
 
@@ -470,11 +486,15 @@ LeaderElection.prototype = {
   die: function die() {
     var _this2 = this;
 
-    if (this.isDead) return;
+    if (this.isDead || !this.isLeader) {
+      return;
+    }
+
+    this.hasLeader = false;
     this.isDead = true;
 
     this._lstns.forEach(function (listener) {
-      return _this2._channel.removeEventListener('internal', listener);
+      return _this2.broadcastChannel.removeEventListener('internal', listener);
     });
 
     this._invs.forEach(function (interval) {
@@ -488,9 +508,15 @@ LeaderElection.prototype = {
     return _sendMessage(this, 'death');
   }
 };
+/**
+ * @param leaderElector {LeaderElector}
+ */
 
 function _awaitLeadershipOnce(leaderElector) {
-  if (leaderElector.isLeader) return Promise.resolve();
+  if (leaderElector.isLeader) {
+    return _util.PROMISE_RESOLVED_VOID;
+  }
+
   return new Promise(function (res) {
     var resolved = false;
 
@@ -501,9 +527,7 @@ function _awaitLeadershipOnce(leaderElector) {
 
       resolved = true;
       clearInterval(interval);
-
-      leaderElector._channel.removeEventListener('internal', whenDeathListener);
-
+      leaderElector.broadcastChannel.removeEventListener('internal', whenDeathListener);
       res(true);
     } // try once now
 
@@ -527,13 +551,16 @@ function _awaitLeadershipOnce(leaderElector) {
 
     var whenDeathListener = function whenDeathListener(msg) {
       if (msg.context === 'leader' && msg.action === 'death') {
+        leaderElector.hasLeader = false;
         leaderElector.applyOnce().then(function () {
-          if (leaderElector.isLeader) finish();
+          if (leaderElector.isLeader) {
+            finish();
+          }
         });
       }
     };
 
-    leaderElector._channel.addEventListener('internal', whenDeathListener);
+    leaderElector.broadcastChannel.addEventListener('internal', whenDeathListener);
 
     leaderElector._lstns.push(whenDeathListener);
   });
@@ -549,11 +576,12 @@ function _sendMessage(leaderElector, action) {
     action: action,
     token: leaderElector.token
   };
-  return leaderElector._channel.postInternal(msgJson);
+  return leaderElector.broadcastChannel.postInternal(msgJson);
 }
 
 function beLeader(leaderElector) {
   leaderElector.isLeader = true;
+  leaderElector.hasLeader = true;
 
   var unloadFn = _unload["default"].add(function () {
     return leaderElector.die();
@@ -585,7 +613,7 @@ function beLeader(leaderElector) {
     }
   };
 
-  leaderElector._channel.addEventListener('internal', isLeaderListener);
+  leaderElector.broadcastChannel.addEventListener('internal', isLeaderListener);
 
   leaderElector._lstns.push(isLeaderListener);
 
@@ -696,21 +724,23 @@ function chooseMethod(options) {
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.getIdb = getIdb;
+exports.averageResponseTime = averageResponseTime;
+exports.canBeUsed = canBeUsed;
+exports.cleanOldMessages = cleanOldMessages;
+exports.close = close;
+exports.create = create;
 exports.createDatabase = createDatabase;
-exports.writeMessage = writeMessage;
+exports["default"] = void 0;
 exports.getAllMessages = getAllMessages;
+exports.getIdb = getIdb;
 exports.getMessagesHigherThan = getMessagesHigherThan;
-exports.removeMessageById = removeMessageById;
 exports.getOldMessages = getOldMessages;
-exports.cleanOldMessages = cleanOldMessages;
-exports.create = create;
-exports.close = close;
-exports.postMessage = postMessage;
+exports.microSeconds = void 0;
 exports.onMessage = onMessage;
-exports.canBeUsed = canBeUsed;
-exports.averageResponseTime = averageResponseTime;
-exports["default"] = exports.type = exports.microSeconds = void 0;
+exports.postMessage = postMessage;
+exports.removeMessageById = removeMessageById;
+exports.type = void 0;
+exports.writeMessage = writeMessage;
 
 var _util = require("../util.js");
 
@@ -908,7 +938,7 @@ function create(channelName, options) {
        */
       eMIs: new _obliviousSet.ObliviousSet(options.idb.ttl * 2),
       // ensures we do not read messages in parrallel
-      writeBlockPromise: Promise.resolve(),
+      writeBlockPromise: _util.PROMISE_RESOLVED_VOID,
       messagesCallback: null,
       readQueuePromises: [],
       db: db
@@ -962,9 +992,9 @@ function _filterMessage(msgObj, state) {
 
 function readNewMessages(state) {
   // channel already closed
-  if (state.closed) return Promise.resolve(); // if no one is listening, we do not need to scan for new messages
+  if (state.closed) return _util.PROMISE_RESOLVED_VOID; // if no one is listening, we do not need to scan for new messages
 
-  if (!state.messagesCallback) return Promise.resolve();
+  if (!state.messagesCallback) return _util.PROMISE_RESOLVED_VOID;
   return getMessagesHigherThan(state.db, state.lastCursorId).then(function (newerMessages) {
     var useMessages = newerMessages
     /**
@@ -992,7 +1022,7 @@ function readNewMessages(state) {
         state.messagesCallback(msgObj.data);
       }
     });
-    return Promise.resolve();
+    return _util.PROMISE_RESOLVED_VOID;
   });
 }
 
@@ -1047,17 +1077,19 @@ exports["default"] = _default;
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.getLocalStorage = getLocalStorage;
-exports.storageKey = storageKey;
-exports.postMessage = postMessage;
 exports.addStorageEventListener = addStorageEventListener;
-exports.removeStorageEventListener = removeStorageEventListener;
-exports.create = create;
+exports.averageResponseTime = averageResponseTime;
+exports.canBeUsed = canBeUsed;
 exports.close = close;
+exports.create = create;
+exports["default"] = void 0;
+exports.getLocalStorage = getLocalStorage;
+exports.microSeconds = void 0;
 exports.onMessage = onMessage;
-exports.canBeUsed = canBeUsed;
-exports.averageResponseTime = averageResponseTime;
-exports["default"] = exports.type = exports.microSeconds = void 0;
+exports.postMessage = postMessage;
+exports.removeStorageEventListener = removeStorageEventListener;
+exports.storageKey = storageKey;
+exports.type = void 0;
 
 var _obliviousSet = require("oblivious-set");
 
@@ -1245,13 +1277,14 @@ exports["default"] = _default;
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.create = create;
+exports.averageResponseTime = averageResponseTime;
+exports.canBeUsed = canBeUsed;
 exports.close = close;
-exports.postMessage = postMessage;
+exports.create = create;
+exports.microSeconds = exports["default"] = void 0;
 exports.onMessage = onMessage;
-exports.canBeUsed = canBeUsed;
-exports.averageResponseTime = averageResponseTime;
-exports["default"] = exports.type = exports.microSeconds = void 0;
+exports.postMessage = postMessage;
+exports.type = void 0;
 
 var _util = require("../util");
 
@@ -1285,7 +1318,7 @@ function close(channelState) {
 function postMessage(channelState, messageJson) {
   try {
     channelState.bc.postMessage(messageJson, false);
-    return Promise.resolve();
+    return _util.PROMISE_RESOLVED_VOID;
   } catch (err) {
     return Promise.reject(err);
   }
@@ -1332,13 +1365,14 @@ exports["default"] = _default;
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.create = create;
+exports.averageResponseTime = averageResponseTime;
+exports.canBeUsed = canBeUsed;
 exports.close = close;
-exports.postMessage = postMessage;
+exports.create = create;
+exports.microSeconds = exports["default"] = void 0;
 exports.onMessage = onMessage;
-exports.canBeUsed = canBeUsed;
-exports.averageResponseTime = averageResponseTime;
-exports["default"] = exports.type = exports.microSeconds = void 0;
+exports.postMessage = postMessage;
+exports.type = void 0;
 
 var _util = require("../util");
 
@@ -1441,12 +1475,12 @@ function fillOptionsWithDefaults() {
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
+exports.isNode = exports.PROMISE_RESOLVED_VOID = exports.PROMISE_RESOLVED_FALSE = exports.PROMISE_REJECTED = void 0;
 exports.isPromise = isPromise;
-exports.sleep = sleep;
+exports.microSeconds = microSeconds;
 exports.randomInt = randomInt;
 exports.randomToken = randomToken;
-exports.microSeconds = microSeconds;
-exports.isNode = void 0;
+exports.sleep = sleep;
 
 /**
  * returns true if the given object is a promise
@@ -1459,6 +1493,13 @@ function isPromise(obj) {
   }
 }
 
+var PROMISE_RESOLVED_FALSE = Promise.resolve(false);
+exports.PROMISE_RESOLVED_FALSE = PROMISE_RESOLVED_FALSE;
+var PROMISE_RESOLVED_VOID = Promise.resolve();
+exports.PROMISE_RESOLVED_VOID = PROMISE_RESOLVED_VOID;
+var PROMISE_REJECTED = Promise.reject(new Error());
+exports.PROMISE_REJECTED = PROMISE_REJECTED;
+
 function sleep(time) {
   if (!time) time = 0;
   return new Promise(function (res) {
diff --git a/dist/lib/browser.min.js b/dist/lib/browser.min.js
index b5068d1b..cccfdb7f 100644
--- a/dist/lib/browser.min.js
+++ b/dist/lib/browser.min.js
@@ -1 +1 @@
-!function r(o,i,s){function a(t,e){if(!i[t]){if(!o[t]){var n="function"==typeof require&&require;if(!e&&n)return n(t,!0);if(u)return u(t,!0);throw(n=new Error("Cannot find module '"+t+"'")).code="MODULE_NOT_FOUND",n}n=i[t]={exports:{}},o[t][0].call(n.exports,function(e){return a(o[t][1][e]||e)},n,n.exports,r,o,i,s)}return i[t].exports}for(var u="function"==typeof require&&require,e=0;e<s.length;e++)a(s[e]);return a}({1:[function(e,t,n){"use strict";Object.defineProperty(n,"__esModule",{value:!0}),n.clearNodeFolder=function(e){e=(0,s.fillOptionsWithDefaults)(e);e=(0,i.chooseMethod)(e);return"node"===e.type?e.clearNodeFolder().then(function(){return!0}):Promise.resolve(!1)},n.enforceOptions=function(e){r=e},n.BroadcastChannel=void 0;var r,o=e("./util.js"),i=e("./method-chooser.js"),s=e("./options.js"),e=function(e,t){var n;this.name=e,r&&(t=r),this.options=(0,s.fillOptionsWithDefaults)(t),this.method=(0,i.chooseMethod)(this.options),this._iL=!1,this._onML=null,this._addEL={message:[],internal:[]},this._uMP=new Set,this._befC=[],this._prepP=null,t=(n=this).method.create(n.name,n.options),(0,o.isPromise)(t)?(n._prepP=t).then(function(e){n._state=e}):n._state=t};function a(t,e,n){var r={time:t.method.microSeconds(),type:e,data:n};return(t._prepP||Promise.resolve()).then(function(){var e=t.method.postMessage(t._state,r);return t._uMP.add(e),e.catch().then(function(){return t._uMP.delete(e)}),e})}function u(e){return 0<e._addEL.message.length||0<e._addEL.internal.length}function c(e,t,n){e._addEL[t].push(n),function(e){{var t,n;!e._iL&&u(e)&&(t=function(t){e._addEL[t.type].forEach(function(e){t.time>=e.time&&e.fn(t.data)})},n=e.method.microSeconds(),e._prepP?e._prepP.then(function(){e._iL=!0,e.method.onMessage(e._state,t,n)}):(e._iL=!0,e.method.onMessage(e._state,t,n)))}}(e)}function l(e,t,n){e._addEL[t]=e._addEL[t].filter(function(e){return e!==n}),function(e){{var t;e._iL&&!u(e)&&(e._iL=!1,t=e.method.microSeconds(),e.method.onMessage(e._state,null,t))}}(e)}(n.BroadcastChannel=e)._pubkey=!0,e.prototype={postMessage:function(e){if(this.closed)throw new Error("BroadcastChannel.postMessage(): Cannot post message after channel has closed");return a(this,"message",e)},postInternal:function(e){return a(this,"internal",e)},set onmessage(e){var t={time:this.method.microSeconds(),fn:e};l(this,"message",this._onML),e&&"function"==typeof e?(this._onML=t,c(this,"message",t)):this._onML=null},addEventListener:function(e,t){var n=this.method.microSeconds();c(this,e,{time:n,fn:t})},removeEventListener:function(e,t){var n=this._addEL[e].find(function(e){return e.fn===t});l(this,e,n)},close:function(){var e=this;if(!this.closed){this.closed=!0;var t=this._prepP||Promise.resolve();return this._onML=null,this._addEL.message=[],t.then(function(){return Promise.all(Array.from(e._uMP))}).then(function(){return Promise.all(e._befC.map(function(e){return e()}))}).then(function(){return e.method.close(e._state)})}},get type(){return this.method.type},get isClosed(){return this.closed}}},{"./method-chooser.js":6,"./options.js":11,"./util.js":12}],2:[function(e,t,n){"use strict";var r=e("./index.es5.js"),e=r.BroadcastChannel,r=r.createLeaderElection;window.BroadcastChannel2=e,window.createLeaderElection=r},{"./index.es5.js":3}],3:[function(e,t,n){"use strict";e=e("./index.js");t.exports={BroadcastChannel:e.BroadcastChannel,createLeaderElection:e.createLeaderElection,clearNodeFolder:e.clearNodeFolder,enforceOptions:e.enforceOptions,beLeader:e.beLeader}},{"./index.js":4}],4:[function(e,t,n){"use strict";Object.defineProperty(n,"__esModule",{value:!0}),Object.defineProperty(n,"BroadcastChannel",{enumerable:!0,get:function(){return r.BroadcastChannel}}),Object.defineProperty(n,"clearNodeFolder",{enumerable:!0,get:function(){return r.clearNodeFolder}}),Object.defineProperty(n,"enforceOptions",{enumerable:!0,get:function(){return r.enforceOptions}}),Object.defineProperty(n,"createLeaderElection",{enumerable:!0,get:function(){return o.createLeaderElection}}),Object.defineProperty(n,"beLeader",{enumerable:!0,get:function(){return o.beLeader}});var r=e("./broadcast-channel"),o=e("./leader-election")},{"./broadcast-channel":1,"./leader-election":5}],5:[function(e,t,n){"use strict";var r=e("@babel/runtime/helpers/interopRequireDefault");Object.defineProperty(n,"__esModule",{value:!0}),n.beLeader=u,n.createLeaderElection=function(e,t){if(e._leaderElector)throw new Error("BroadcastChannel already has a leader-elector");t=function(e,t){e=e||{};(e=JSON.parse(JSON.stringify(e))).fallbackInterval||(e.fallbackInterval=3e3);e.responseTime||(e.responseTime=t.method.averageResponseTime(t.options));return e}(t,e);var n=new s(e,t);return e._befC.push(function(){return n.die()}),e._leaderElector=n};var i=e("./util.js"),o=r(e("unload")),s=function(e,t){this._channel=e,this._options=t,this.isLeader=!1,this.isDead=!1,this.token=(0,i.randomToken)(),this._isApl=!1,this._reApply=!1,this._unl=[],this._lstns=[],this._invs=[],this._dpL=function(){},this._dpLC=!1};function a(e,t){t={context:"leader",action:t,token:e.token};return e._channel.postInternal(t)}function u(t){t.isLeader=!0;var e=o.default.add(function(){return t.die()});t._unl.push(e);e=function(e){"leader"===e.context&&"apply"===e.action&&a(t,"tell"),"leader"!==e.context||"tell"!==e.action||t._dpLC||(t._dpLC=!0,t._dpL(),a(t,"tell"))};return t._channel.addEventListener("internal",e),t._lstns.push(e),a(t,"tell")}s.prototype={applyOnce:function(){var t=this;if(this.isLeader)return Promise.resolve(!1);if(this.isDead)return Promise.resolve(!1);if(this._isApl)return this._reApply=!0,Promise.resolve(!1);function n(e){"leader"===e.context&&e.token!=t.token&&(o.push(e),"apply"===e.action&&e.token>t.token&&(r=!0),"tell"===e.action&&(r=!0))}var r=!(this._isApl=!0),o=[];return this._channel.addEventListener("internal",n),a(this,"apply").then(function(){return(0,i.sleep)(t._options.responseTime)}).then(function(){return r?Promise.reject(new Error):a(t,"apply")}).then(function(){return(0,i.sleep)(t._options.responseTime)}).then(function(){return r?Promise.reject(new Error):a(t)}).then(function(){return u(t)}).then(function(){return!0}).catch(function(){return!1}).then(function(e){return t._channel.removeEventListener("internal",n),t._isApl=!1,!e&&t._reApply?(t._reApply=!1,t.applyOnce()):e})},awaitLeadership:function(){var i;return this._aLP||(this._aLP=(i=this).isLeader?Promise.resolve():new Promise(function(e){var t=!1;function n(){t||(t=!0,clearInterval(r),i._channel.removeEventListener("internal",o),e(!0))}i.applyOnce().then(function(){i.isLeader&&n()});var r=setInterval(function(){i.applyOnce().then(function(){i.isLeader&&n()})},i._options.fallbackInterval);i._invs.push(r);var o=function(e){"leader"===e.context&&"death"===e.action&&i.applyOnce().then(function(){i.isLeader&&n()})};i._channel.addEventListener("internal",o),i._lstns.push(o)})),this._aLP},set onduplicate(e){this._dpL=e},die:function(){var t=this;if(!this.isDead)return this.isDead=!0,this._lstns.forEach(function(e){return t._channel.removeEventListener("internal",e)}),this._invs.forEach(function(e){return clearInterval(e)}),this._unl.forEach(function(e){e.remove()}),a(this,"death")}}},{"./util.js":12,"@babel/runtime/helpers/interopRequireDefault":13,unload:20}],6:[function(e,t,n){"use strict";var r=e("@babel/runtime/helpers/interopRequireDefault");e("@babel/runtime/helpers/typeof");Object.defineProperty(n,"__esModule",{value:!0}),n.chooseMethod=function(t){var e=[].concat(t.methods,u).filter(Boolean);if(t.type){if("simulate"===t.type)return s.default;var n=e.find(function(e){return e.type===t.type});if(n)return n;throw new Error("method-type "+t.type+" not found")}t.webWorkerSupport||a.isNode||(e=e.filter(function(e){return"idb"!==e.type}));e=e.find(function(e){return e.canBeUsed()});{if(e)return e;throw new Error("No useable method found in "+JSON.stringify(u.map(function(e){return e.type})))}};var o=r(e("./methods/native.js")),i=r(e("./methods/indexed-db.js")),n=r(e("./methods/localstorage.js")),s=r(e("./methods/simulate.js")),a=e("./util");var u=[o.default,i.default,n.default]},{"./methods/indexed-db.js":7,"./methods/localstorage.js":8,"./methods/native.js":9,"./methods/simulate.js":10,"./util":12,"@babel/runtime/helpers/interopRequireDefault":13,"@babel/runtime/helpers/typeof":14}],7:[function(e,t,n){"use strict";Object.defineProperty(n,"__esModule",{value:!0}),n.getIdb=u,n.createDatabase=c,n.writeMessage=l,n.getAllMessages=function(e){var n=e.transaction(a).objectStore(a),r=[];return new Promise(function(t){n.openCursor().onsuccess=function(e){e=e.target.result;e?(r.push(e.value),e.continue()):t(r)}})},n.getMessagesHigherThan=d,n.removeMessageById=f,n.getOldMessages=p,n.cleanOldMessages=h,n.create=m,n.close=b,n.postMessage=g,n.onMessage=y,n.canBeUsed=_,n.averageResponseTime=w,n.default=n.type=n.microSeconds=void 0;var o=e("../util.js"),i=e("oblivious-set"),s=e("../options"),e=o.microSeconds;n.microSeconds=e;var r="pubkey.broadcast-channel-0-",a="messages";function u(){if("undefined"!=typeof indexedDB)return indexedDB;if("undefined"!=typeof window){if(void 0!==window.mozIndexedDB)return window.mozIndexedDB;if(void 0!==window.webkitIndexedDB)return window.webkitIndexedDB;if(void 0!==window.msIndexedDB)return window.msIndexedDB}return!1}function c(e){var n=u().open(r+e,1);return n.onupgradeneeded=function(e){e.target.result.createObjectStore(a,{keyPath:"id",autoIncrement:!0})},new Promise(function(e,t){n.onerror=function(e){return t(e)},n.onsuccess=function(){e(n.result)}})}function l(e,t,n){var r={uuid:t,time:(new Date).getTime(),data:n},o=e.transaction([a],"readwrite");return new Promise(function(e,t){o.oncomplete=function(){return e()},o.onerror=function(e){return t(e)},o.objectStore(a).add(r)})}function d(e,n){var r=e.transaction(a).objectStore(a),o=[];return new Promise(function(t){(function(){try{var e=IDBKeyRange.bound(n+1,1/0);return r.openCursor(e)}catch(e){return r.openCursor()}})().onsuccess=function(e){e=e.target.result;e?e.value.id<n+1?e.continue(n+1):(o.push(e.value),e.continue()):t(o)}})}function f(e,t){var n=e.transaction([a],"readwrite").objectStore(a).delete(t);return new Promise(function(e){n.onsuccess=function(){return e()}})}function p(e,t){var r=(new Date).getTime()-t,o=e.transaction(a).objectStore(a),i=[];return new Promise(function(n){o.openCursor().onsuccess=function(e){var t,e=e.target.result;e&&(t=e.value).time<r?(i.push(t),e.continue()):n(i)}})}function h(t,e){return p(t,e).then(function(e){return Promise.all(e.map(function(e){return f(t,e.id)}))})}function m(n,r){return r=(0,s.fillOptionsWithDefaults)(r),c(n).then(function(e){var t={closed:!1,lastCursorId:0,channelName:n,options:r,uuid:(0,o.randomToken)(),eMIs:new i.ObliviousSet(2*r.idb.ttl),writeBlockPromise:Promise.resolve(),messagesCallback:null,readQueuePromises:[],db:e};return e.onclose=function(){t.closed=!0,r.idb.onclose&&r.idb.onclose()},function e(t){if(t.closed)return;v(t).then(function(){return(0,o.sleep)(t.options.idb.fallbackInterval)}).then(function(){return e(t)})}(t),t})}function v(n){return!n.closed&&n.messagesCallback?d(n.db,n.lastCursorId).then(function(e){return e.filter(function(e){return!!e}).map(function(e){return e.id>n.lastCursorId&&(n.lastCursorId=e.id),e}).filter(function(e){return t=n,(e=e).uuid!==t.uuid&&(!t.eMIs.has(e.id)&&!(e.data.time<t.messagesCallbackTime));var t}).sort(function(e,t){return e.time-t.time}).forEach(function(e){n.messagesCallback&&(n.eMIs.add(e.id),n.messagesCallback(e.data))}),Promise.resolve()}):Promise.resolve()}function b(e){e.closed=!0,e.db.close()}function g(e,t){return e.writeBlockPromise=e.writeBlockPromise.then(function(){return l(e.db,e.uuid,t)}).then(function(){0===(0,o.randomInt)(0,10)&&h(e.db,e.options.idb.ttl)}),e.writeBlockPromise}function y(e,t,n){e.messagesCallbackTime=n,e.messagesCallback=t,v(e)}function _(){return!o.isNode&&!!u()}function w(e){return 2*e.idb.fallbackInterval}n.type="idb",n.default={create:m,close:b,onMessage:y,postMessage:g,canBeUsed:_,type:"idb",averageResponseTime:w,microSeconds:e}},{"../options":11,"../util.js":12,"oblivious-set":17}],8:[function(e,t,n){"use strict";Object.defineProperty(n,"__esModule",{value:!0}),n.getLocalStorage=u,n.storageKey=c,n.postMessage=l,n.addStorageEventListener=d,n.removeStorageEventListener=f,n.create=p,n.close=h,n.onMessage=m,n.canBeUsed=v,n.averageResponseTime=b,n.default=n.type=n.microSeconds=void 0;var i=e("oblivious-set"),s=e("../options"),a=e("../util"),r=a.microSeconds;n.microSeconds=r;var o="pubkey.broadcastChannel-",e="localstorage";function u(){var e;if("undefined"==typeof window)return null;try{e=window.localStorage,e=window["ie8-eventlistener/storage"]||window.localStorage}catch(e){}return e}function c(e){return o+e}function l(o,i){return new Promise(function(r){(0,a.sleep)().then(function(){var e=c(o.channelName),t={token:(0,a.randomToken)(),time:(new Date).getTime(),data:i,uuid:o.uuid},n=JSON.stringify(t);u().setItem(e,n);t=document.createEvent("Event");t.initEvent("storage",!0,!0),t.key=e,t.newValue=n,window.dispatchEvent(t),r()})})}function d(e,t){var n=o+e,e=function(e){e.key===n&&t(JSON.parse(e.newValue))};return window.addEventListener("storage",e),e}function f(e){window.removeEventListener("storage",e)}function p(e,t){if(t=(0,s.fillOptionsWithDefaults)(t),!v())throw new Error("BroadcastChannel: localstorage cannot be used");var n=(0,a.randomToken)(),r=new i.ObliviousSet(t.localstorage.removeTimeout),o={channelName:e,uuid:n,eMIs:r};return o.listener=d(e,function(e){o.messagesCallback&&e.uuid!==n&&e.token&&!r.has(e.token)&&(e.data.time&&e.data.time<o.messagesCallbackTime||(r.add(e.token),o.messagesCallback(e.data)))}),o}function h(e){f(e.listener)}function m(e,t,n){e.messagesCallbackTime=n,e.messagesCallback=t}function v(){if(a.isNode)return!1;var e=u();if(!e)return!1;try{var t="__broadcastchannel_check";e.setItem(t,"works"),e.removeItem(t)}catch(e){return!1}return!0}function b(){var e=navigator.userAgent.toLowerCase();return e.includes("safari")&&!e.includes("chrome")?240:120}n.type=e,n.default={create:p,close:h,onMessage:m,postMessage:l,canBeUsed:v,type:e,averageResponseTime:b,microSeconds:r}},{"../options":11,"../util":12,"oblivious-set":17}],9:[function(e,t,n){"use strict";Object.defineProperty(n,"__esModule",{value:!0}),n.create=o,n.close=i,n.postMessage=s,n.onMessage=a,n.canBeUsed=u,n.averageResponseTime=c,n.default=n.type=n.microSeconds=void 0;var r=e("../util"),e=r.microSeconds;n.microSeconds=e;function o(e){var t={messagesCallback:null,bc:new BroadcastChannel(e),subFns:[]};return t.bc.onmessage=function(e){t.messagesCallback&&t.messagesCallback(e.data)},t}function i(e){e.bc.close(),e.subFns=[]}function s(e,t){try{return e.bc.postMessage(t,!1),Promise.resolve()}catch(e){return Promise.reject(e)}}function a(e,t){e.messagesCallback=t}function u(){if(r.isNode&&"undefined"==typeof window)return!1;if("function"!=typeof BroadcastChannel)return!1;if(BroadcastChannel._pubkey)throw new Error("BroadcastChannel: Do not overwrite window.BroadcastChannel with this module, this is not a polyfill");return!0}function c(){return 150}n.type="native",n.default={create:o,close:i,onMessage:a,postMessage:s,canBeUsed:u,type:"native",averageResponseTime:c,microSeconds:e}},{"../util":12}],10:[function(e,t,n){"use strict";Object.defineProperty(n,"__esModule",{value:!0}),n.create=i,n.close=s,n.postMessage=a,n.onMessage=u,n.canBeUsed=c,n.averageResponseTime=l,n.default=n.type=n.microSeconds=void 0;var r=e("../util").microSeconds;n.microSeconds=r;e="simulate";n.type=e;var o=new Set;function i(e){e={name:e,messagesCallback:null};return o.add(e),e}function s(e){o.delete(e)}function a(t,n){return new Promise(function(e){return setTimeout(function(){Array.from(o).filter(function(e){return e.name===t.name}).filter(function(e){return e!==t}).filter(function(e){return!!e.messagesCallback}).forEach(function(e){return e.messagesCallback(n)}),e()},5)})}function u(e,t){e.messagesCallback=t}function c(){return!0}function l(){return 5}n.default={create:i,close:s,onMessage:u,postMessage:a,canBeUsed:c,type:e,averageResponseTime:l,microSeconds:r}},{"../util":12}],11:[function(e,t,n){"use strict";Object.defineProperty(n,"__esModule",{value:!0}),n.fillOptionsWithDefaults=function(){var e=0<arguments.length&&void 0!==arguments[0]?arguments[0]:{},t=JSON.parse(JSON.stringify(e));void 0===t.webWorkerSupport&&(t.webWorkerSupport=!0);t.idb||(t.idb={});t.idb.ttl||(t.idb.ttl=45e3);t.idb.fallbackInterval||(t.idb.fallbackInterval=150);e.idb&&"function"==typeof e.idb.onclose&&(t.idb.onclose=e.idb.onclose);t.localstorage||(t.localstorage={});t.localstorage.removeTimeout||(t.localstorage.removeTimeout=6e4);e.methods&&(t.methods=e.methods);t.node||(t.node={});t.node.ttl||(t.node.ttl=12e4);void 0===t.node.useFastPath&&(t.node.useFastPath=!0);return t}},{}],12:[function(e,t,o){!function(r){!function(){"use strict";Object.defineProperty(o,"__esModule",{value:!0}),o.isPromise=function(e){return!(!e||"function"!=typeof e.then)},o.sleep=function(t){t=t||0;return new Promise(function(e){return setTimeout(e,t)})},o.randomInt=function(e,t){return Math.floor(Math.random()*(t-e+1)+e)},o.randomToken=function(){return Math.random().toString(36).substring(2)},o.microSeconds=function(){var e=(new Date).getTime();return e===t?1e3*e+ ++n:(n=0,1e3*(t=e))},o.isNode=void 0;var t=0,n=0;var e="[object process]"===Object.prototype.toString.call(void 0!==r?r:0);o.isNode=e}.call(this)}.call(this,e("_process"))},{_process:18}],13:[function(e,t,n){t.exports=function(e){return e&&e.__esModule?e:{default:e}},t.exports.default=t.exports,t.exports.__esModule=!0},{}],14:[function(e,t,n){function r(e){return"function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?t.exports=r=function(e){return typeof e}:t.exports=r=function(e){return e&&"function"==typeof Symbol&&e.constructor===Symbol&&e!==Symbol.prototype?"symbol":typeof e},t.exports.default=t.exports,t.exports.__esModule=!0,r(e)}t.exports=r,t.exports.default=t.exports,t.exports.__esModule=!0},{}],15:[function(e,t,n){},{}],16:[function(e,t,n){t.exports=!1},{}],17:[function(e,t,n){"use strict";Object.defineProperty(n,"__esModule",{value:!0}),n.now=n.removeTooOldValues=n.ObliviousSet=void 0;var r=(o.prototype.has=function(e){return this.set.has(e)},o.prototype.add=function(e){var t=this;this.timeMap.set(e,s()),this.set.add(e),setTimeout(function(){i(t)},0)},o.prototype.clear=function(){this.set.clear(),this.timeMap.clear()},o);function o(e){this.ttl=e,this.set=new Set,this.timeMap=new Map}function i(e){for(var t=s()-e.ttl,n=e.set[Symbol.iterator]();;){var r=n.next().value;if(!r)return;if(!(e.timeMap.get(r)<t))return;e.timeMap.delete(r),e.set.delete(r)}}function s(){return(new Date).getTime()}n.ObliviousSet=r,n.removeTooOldValues=i,n.now=s},{}],18:[function(e,t,n){var r,o,t=t.exports={};function i(){throw new Error("setTimeout has not been defined")}function s(){throw new Error("clearTimeout has not been defined")}function a(t){if(r===setTimeout)return setTimeout(t,0);if((r===i||!r)&&setTimeout)return r=setTimeout,setTimeout(t,0);try{return r(t,0)}catch(e){try{return r.call(null,t,0)}catch(e){return r.call(this,t,0)}}}!function(){try{r="function"==typeof setTimeout?setTimeout:i}catch(e){r=i}try{o="function"==typeof clearTimeout?clearTimeout:s}catch(e){o=s}}();var u,c=[],l=!1,d=-1;function f(){l&&u&&(l=!1,u.length?c=u.concat(c):d=-1,c.length&&p())}function p(){if(!l){var e=a(f);l=!0;for(var t=c.length;t;){for(u=c,c=[];++d<t;)u&&u[d].run();d=-1,t=c.length}u=null,l=!1,function(t){if(o===clearTimeout)return clearTimeout(t);if((o===s||!o)&&clearTimeout)return o=clearTimeout,clearTimeout(t);try{o(t)}catch(e){try{return o.call(null,t)}catch(e){return o.call(this,t)}}}(e)}}function h(e,t){this.fun=e,this.array=t}function m(){}t.nextTick=function(e){var t=new Array(arguments.length-1);if(1<arguments.length)for(var n=1;n<arguments.length;n++)t[n-1]=arguments[n];c.push(new h(e,t)),1!==c.length||l||a(p)},h.prototype.run=function(){this.fun.apply(null,this.array)},t.title="browser",t.browser=!0,t.env={},t.argv=[],t.version="",t.versions={},t.on=m,t.addListener=m,t.once=m,t.off=m,t.removeListener=m,t.removeAllListeners=m,t.emit=m,t.prependListener=m,t.prependOnceListener=m,t.listeners=function(e){return[]},t.binding=function(e){throw new Error("process.binding is not supported")},t.cwd=function(){return"/"},t.chdir=function(e){throw new Error("process.chdir is not supported")},t.umask=function(){return 0}},{}],19:[function(e,t,n){"use strict";Object.defineProperty(n,"__esModule",{value:!0}),n.default=void 0,n.default={add:function(e){"function"==typeof WorkerGlobalScope&&self instanceof WorkerGlobalScope||"function"==typeof window.addEventListener&&(window.addEventListener("beforeunload",function(){e()},!0),window.addEventListener("unload",function(){e()},!0))}}},{}],20:[function(e,t,n){"use strict";var r=e("@babel/runtime/helpers/interopRequireDefault");Object.defineProperty(n,"__esModule",{value:!0}),n.add=c,n.runAll=l,n.removeAll=d,n.getSize=f,n.default=void 0;var o=r(e("detect-node")),i=r(e("./browser.js")),e=r(e("./node.js")),s=(o.default?e:i).default,a=new Set,u=!1;function c(e){if(u||(u=!0,s.add(l)),"function"!=typeof e)throw new Error("Listener is no function");return a.add(e),{remove:function(){return a.delete(e)},run:function(){return a.delete(e),e()}}}function l(){var t=[];return a.forEach(function(e){t.push(e()),a.delete(e)}),Promise.all(t)}function d(){a.clear()}function f(){return a.size}n.default={add:c,runAll:l,removeAll:d,getSize:f}},{"./browser.js":19,"./node.js":15,"@babel/runtime/helpers/interopRequireDefault":13,"detect-node":16}]},{},[2]);
\ No newline at end of file
+!function r(o,i,s){function a(t,e){if(!i[t]){if(!o[t]){var n="function"==typeof require&&require;if(!e&&n)return n(t,!0);if(u)return u(t,!0);throw(n=new Error("Cannot find module '"+t+"'")).code="MODULE_NOT_FOUND",n}n=i[t]={exports:{}},o[t][0].call(n.exports,function(e){return a(o[t][1][e]||e)},n,n.exports,r,o,i,s)}return i[t].exports}for(var u="function"==typeof require&&require,e=0;e<s.length;e++)a(s[e]);return a}({1:[function(e,t,n){"use strict";Object.defineProperty(n,"__esModule",{value:!0}),n.BroadcastChannel=void 0,n.clearNodeFolder=function(e){e=(0,s.fillOptionsWithDefaults)(e);e=(0,i.chooseMethod)(e);return"node"===e.type?e.clearNodeFolder().then(function(){return!0}):o.PROMISE_RESOLVED_FALSE},n.enforceOptions=function(e){r=e};var r,o=e("./util.js"),i=e("./method-chooser.js"),s=e("./options.js"),e=function(e,t){var n;this.name=e,r&&(t=r),this.options=(0,s.fillOptionsWithDefaults)(t),this.method=(0,i.chooseMethod)(this.options),this._iL=!1,this._onML=null,this._addEL={message:[],internal:[]},this._uMP=new Set,this._befC=[],this._prepP=null,t=(n=this).method.create(n.name,n.options),(0,o.isPromise)(t)?(n._prepP=t).then(function(e){n._state=e}):n._state=t};function a(t,e,n){var r={time:t.method.microSeconds(),type:e,data:n};return(t._prepP||o.PROMISE_RESOLVED_VOID).then(function(){var e=t.method.postMessage(t._state,r);return t._uMP.add(e),e.catch().then(function(){return t._uMP.delete(e)}),e})}function u(e){return 0<e._addEL.message.length||0<e._addEL.internal.length}function c(e,t,n){e._addEL[t].push(n),function(e){{var t,n;!e._iL&&u(e)&&(t=function(t){e._addEL[t.type].forEach(function(e){t.time>=e.time&&e.fn(t.data)})},n=e.method.microSeconds(),e._prepP?e._prepP.then(function(){e._iL=!0,e.method.onMessage(e._state,t,n)}):(e._iL=!0,e.method.onMessage(e._state,t,n)))}}(e)}function l(e,t,n){e._addEL[t]=e._addEL[t].filter(function(e){return e!==n}),function(e){{var t;e._iL&&!u(e)&&(e._iL=!1,t=e.method.microSeconds(),e.method.onMessage(e._state,null,t))}}(e)}(n.BroadcastChannel=e)._pubkey=!0,e.prototype={postMessage:function(e){if(this.closed)throw new Error("BroadcastChannel.postMessage(): Cannot post message after channel has closed");return a(this,"message",e)},postInternal:function(e){return a(this,"internal",e)},set onmessage(e){var t={time:this.method.microSeconds(),fn:e};l(this,"message",this._onML),e&&"function"==typeof e?(this._onML=t,c(this,"message",t)):this._onML=null},addEventListener:function(e,t){var n=this.method.microSeconds();c(this,e,{time:n,fn:t})},removeEventListener:function(e,t){var n=this._addEL[e].find(function(e){return e.fn===t});l(this,e,n)},close:function(){var e=this;if(!this.closed){this.closed=!0;var t=this._prepP||o.PROMISE_RESOLVED_VOID;return this._onML=null,this._addEL.message=[],t.then(function(){return Promise.all(Array.from(e._uMP))}).then(function(){return Promise.all(e._befC.map(function(e){return e()}))}).then(function(){return e.method.close(e._state)})}},get type(){return this.method.type},get isClosed(){return this.closed}}},{"./method-chooser.js":6,"./options.js":11,"./util.js":12}],2:[function(e,t,n){"use strict";var r=e("./index.es5.js"),e=r.BroadcastChannel,r=r.createLeaderElection;window.BroadcastChannel2=e,window.createLeaderElection=r},{"./index.es5.js":3}],3:[function(e,t,n){"use strict";e=e("./index.js");t.exports={BroadcastChannel:e.BroadcastChannel,createLeaderElection:e.createLeaderElection,clearNodeFolder:e.clearNodeFolder,enforceOptions:e.enforceOptions,beLeader:e.beLeader}},{"./index.js":4}],4:[function(e,t,n){"use strict";Object.defineProperty(n,"__esModule",{value:!0}),Object.defineProperty(n,"BroadcastChannel",{enumerable:!0,get:function(){return r.BroadcastChannel}}),Object.defineProperty(n,"beLeader",{enumerable:!0,get:function(){return o.beLeader}}),Object.defineProperty(n,"clearNodeFolder",{enumerable:!0,get:function(){return r.clearNodeFolder}}),Object.defineProperty(n,"createLeaderElection",{enumerable:!0,get:function(){return o.createLeaderElection}}),Object.defineProperty(n,"enforceOptions",{enumerable:!0,get:function(){return r.enforceOptions}});var r=e("./broadcast-channel"),o=e("./leader-election")},{"./broadcast-channel":1,"./leader-election":5}],5:[function(e,t,n){"use strict";var r=e("@babel/runtime/helpers/interopRequireDefault");Object.defineProperty(n,"__esModule",{value:!0}),n.beLeader=u,n.createLeaderElection=function(e,t){if(e._leaderElector)throw new Error("BroadcastChannel already has a leader-elector");t=function(e,t){e=e||{};(e=JSON.parse(JSON.stringify(e))).fallbackInterval||(e.fallbackInterval=3e3);e.responseTime||(e.responseTime=t.method.averageResponseTime(t.options));return e}(t,e);var n=new i(e,t);return e._befC.push(function(){return n.die()}),e._leaderElector=n};var s=e("./util.js"),o=r(e("unload")),i=function(e,t){this.broadcastChannel=e,this._options=t,this.isLeader=!1,this.hasLeader=!1,this.isDead=!1,this.token=(0,s.randomToken)(),this._isApl=!1,this._reApply=!1,this._unl=[],this._lstns=[],this._invs=[],this._dpL=function(){},this._dpLC=!1};function a(e,t){t={context:"leader",action:t,token:e.token};return e.broadcastChannel.postInternal(t)}function u(t){t.isLeader=!0,t.hasLeader=!0;var e=o.default.add(function(){return t.die()});t._unl.push(e);e=function(e){"leader"===e.context&&"apply"===e.action&&a(t,"tell"),"leader"!==e.context||"tell"!==e.action||t._dpLC||(t._dpLC=!0,t._dpL(),a(t,"tell"))};return t.broadcastChannel.addEventListener("internal",e),t._lstns.push(e),a(t,"tell")}i.prototype={applyOnce:function(){var t=this;if(this.isLeader)return s.PROMISE_RESOLVED_FALSE;if(this.isDead)return s.PROMISE_RESOLVED_FALSE;if(this._isApl)return this._reApply=!0,s.PROMISE_RESOLVED_FALSE;function n(e){"leader"===e.context&&e.token!=t.token&&(o.push(e),"apply"===e.action&&e.token>t.token&&(r=!0),"tell"===e.action&&(r=!0,t.hasLeader=!0))}var r=!(this._isApl=!0),o=[];return this.broadcastChannel.addEventListener("internal",n),a(this,"apply").then(function(){return(0,s.sleep)(t._options.responseTime)}).then(function(){return r?s.PROMISE_REJECTED:a(t,"apply")}).then(function(){return(0,s.sleep)(t._options.responseTime)}).then(function(){return r?s.PROMISE_REJECTED:a(t)}).then(function(){return u(t)}).then(function(){return!0}).catch(function(){return!1}).then(function(e){return t.broadcastChannel.removeEventListener("internal",n),t._isApl=!1,!e&&t._reApply?(t._reApply=!1,t.applyOnce()):e})},awaitLeadership:function(){return this._aLP||(this._aLP=function(i){if(i.isLeader)return s.PROMISE_RESOLVED_VOID;return new Promise(function(e){var t=!1;function n(){t||(t=!0,clearInterval(r),i.broadcastChannel.removeEventListener("internal",o),e(!0))}i.applyOnce().then(function(){i.isLeader&&n()});var r=setInterval(function(){i.applyOnce().then(function(){i.isLeader&&n()})},i._options.fallbackInterval);i._invs.push(r);var o=function(e){"leader"===e.context&&"death"===e.action&&(i.hasLeader=!1,i.applyOnce().then(function(){i.isLeader&&n()}))};i.broadcastChannel.addEventListener("internal",o),i._lstns.push(o)})}(this)),this._aLP},set onduplicate(e){this._dpL=e},die:function(){var t=this;if(!this.isDead&&this.isLeader)return this.hasLeader=!1,this.isDead=!0,this._lstns.forEach(function(e){return t.broadcastChannel.removeEventListener("internal",e)}),this._invs.forEach(function(e){return clearInterval(e)}),this._unl.forEach(function(e){e.remove()}),a(this,"death")}}},{"./util.js":12,"@babel/runtime/helpers/interopRequireDefault":13,unload:20}],6:[function(e,t,n){"use strict";var r=e("@babel/runtime/helpers/interopRequireDefault");e("@babel/runtime/helpers/typeof");Object.defineProperty(n,"__esModule",{value:!0}),n.chooseMethod=function(t){var e=[].concat(t.methods,u).filter(Boolean);if(t.type){if("simulate"===t.type)return s.default;var n=e.find(function(e){return e.type===t.type});if(n)return n;throw new Error("method-type "+t.type+" not found")}t.webWorkerSupport||a.isNode||(e=e.filter(function(e){return"idb"!==e.type}));e=e.find(function(e){return e.canBeUsed()});{if(e)return e;throw new Error("No useable method found in "+JSON.stringify(u.map(function(e){return e.type})))}};var o=r(e("./methods/native.js")),i=r(e("./methods/indexed-db.js")),n=r(e("./methods/localstorage.js")),s=r(e("./methods/simulate.js")),a=e("./util");var u=[o.default,i.default,n.default]},{"./methods/indexed-db.js":7,"./methods/localstorage.js":8,"./methods/native.js":9,"./methods/simulate.js":10,"./util":12,"@babel/runtime/helpers/interopRequireDefault":13,"@babel/runtime/helpers/typeof":14}],7:[function(e,t,n){"use strict";Object.defineProperty(n,"__esModule",{value:!0}),n.averageResponseTime=E,n.canBeUsed=y,n.cleanOldMessages=h,n.close=b,n.create=m,n.createDatabase=c,n.default=void 0,n.getAllMessages=function(e){var n=e.transaction(a).objectStore(a),r=[];return new Promise(function(t){n.openCursor().onsuccess=function(e){e=e.target.result;e?(r.push(e.value),e.continue()):t(r)}})},n.getIdb=u,n.getMessagesHigherThan=d,n.getOldMessages=p,n.microSeconds=void 0,n.onMessage=g,n.postMessage=_,n.removeMessageById=f,n.type=void 0,n.writeMessage=l;var o=e("../util.js"),i=e("oblivious-set"),s=e("../options"),e=o.microSeconds;n.microSeconds=e;var r="pubkey.broadcast-channel-0-",a="messages";function u(){if("undefined"!=typeof indexedDB)return indexedDB;if("undefined"!=typeof window){if(void 0!==window.mozIndexedDB)return window.mozIndexedDB;if(void 0!==window.webkitIndexedDB)return window.webkitIndexedDB;if(void 0!==window.msIndexedDB)return window.msIndexedDB}return!1}function c(e){var n=u().open(r+e,1);return n.onupgradeneeded=function(e){e.target.result.createObjectStore(a,{keyPath:"id",autoIncrement:!0})},new Promise(function(e,t){n.onerror=function(e){return t(e)},n.onsuccess=function(){e(n.result)}})}function l(e,t,n){var r={uuid:t,time:(new Date).getTime(),data:n},o=e.transaction([a],"readwrite");return new Promise(function(e,t){o.oncomplete=function(){return e()},o.onerror=function(e){return t(e)},o.objectStore(a).add(r)})}function d(e,n){var r=e.transaction(a).objectStore(a),o=[];return new Promise(function(t){(function(){try{var e=IDBKeyRange.bound(n+1,1/0);return r.openCursor(e)}catch(e){return r.openCursor()}})().onsuccess=function(e){e=e.target.result;e?e.value.id<n+1?e.continue(n+1):(o.push(e.value),e.continue()):t(o)}})}function f(e,t){var n=e.transaction([a],"readwrite").objectStore(a).delete(t);return new Promise(function(e){n.onsuccess=function(){return e()}})}function p(e,t){var r=(new Date).getTime()-t,o=e.transaction(a).objectStore(a),i=[];return new Promise(function(n){o.openCursor().onsuccess=function(e){var t,e=e.target.result;e&&(t=e.value).time<r?(i.push(t),e.continue()):n(i)}})}function h(t,e){return p(t,e).then(function(e){return Promise.all(e.map(function(e){return f(t,e.id)}))})}function m(n,r){return r=(0,s.fillOptionsWithDefaults)(r),c(n).then(function(e){var t={closed:!1,lastCursorId:0,channelName:n,options:r,uuid:(0,o.randomToken)(),eMIs:new i.ObliviousSet(2*r.idb.ttl),writeBlockPromise:o.PROMISE_RESOLVED_VOID,messagesCallback:null,readQueuePromises:[],db:e};return e.onclose=function(){t.closed=!0,r.idb.onclose&&r.idb.onclose()},function e(t){if(t.closed)return;v(t).then(function(){return(0,o.sleep)(t.options.idb.fallbackInterval)}).then(function(){return e(t)})}(t),t})}function v(n){return!n.closed&&n.messagesCallback?d(n.db,n.lastCursorId).then(function(e){return e.filter(function(e){return!!e}).map(function(e){return e.id>n.lastCursorId&&(n.lastCursorId=e.id),e}).filter(function(e){return t=n,(e=e).uuid!==t.uuid&&(!t.eMIs.has(e.id)&&!(e.data.time<t.messagesCallbackTime));var t}).sort(function(e,t){return e.time-t.time}).forEach(function(e){n.messagesCallback&&(n.eMIs.add(e.id),n.messagesCallback(e.data))}),o.PROMISE_RESOLVED_VOID}):o.PROMISE_RESOLVED_VOID}function b(e){e.closed=!0,e.db.close()}function _(e,t){return e.writeBlockPromise=e.writeBlockPromise.then(function(){return l(e.db,e.uuid,t)}).then(function(){0===(0,o.randomInt)(0,10)&&h(e.db,e.options.idb.ttl)}),e.writeBlockPromise}function g(e,t,n){e.messagesCallbackTime=n,e.messagesCallback=t,v(e)}function y(){return!o.isNode&&!!u()}function E(e){return 2*e.idb.fallbackInterval}n.type="idb",n.default={create:m,close:b,onMessage:g,postMessage:_,canBeUsed:y,type:"idb",averageResponseTime:E,microSeconds:e}},{"../options":11,"../util.js":12,"oblivious-set":17}],8:[function(e,t,n){"use strict";Object.defineProperty(n,"__esModule",{value:!0}),n.addStorageEventListener=d,n.averageResponseTime=b,n.canBeUsed=v,n.close=h,n.create=p,n.default=void 0,n.getLocalStorage=u,n.microSeconds=void 0,n.onMessage=m,n.postMessage=l,n.removeStorageEventListener=f,n.storageKey=c,n.type=void 0;var i=e("oblivious-set"),s=e("../options"),a=e("../util"),r=a.microSeconds;n.microSeconds=r;var o="pubkey.broadcastChannel-",e="localstorage";function u(){var e;if("undefined"==typeof window)return null;try{e=window.localStorage,e=window["ie8-eventlistener/storage"]||window.localStorage}catch(e){}return e}function c(e){return o+e}function l(o,i){return new Promise(function(r){(0,a.sleep)().then(function(){var e=c(o.channelName),t={token:(0,a.randomToken)(),time:(new Date).getTime(),data:i,uuid:o.uuid},n=JSON.stringify(t);u().setItem(e,n);t=document.createEvent("Event");t.initEvent("storage",!0,!0),t.key=e,t.newValue=n,window.dispatchEvent(t),r()})})}function d(e,t){var n=o+e,e=function(e){e.key===n&&t(JSON.parse(e.newValue))};return window.addEventListener("storage",e),e}function f(e){window.removeEventListener("storage",e)}function p(e,t){if(t=(0,s.fillOptionsWithDefaults)(t),!v())throw new Error("BroadcastChannel: localstorage cannot be used");var n=(0,a.randomToken)(),r=new i.ObliviousSet(t.localstorage.removeTimeout),o={channelName:e,uuid:n,eMIs:r};return o.listener=d(e,function(e){o.messagesCallback&&e.uuid!==n&&e.token&&!r.has(e.token)&&(e.data.time&&e.data.time<o.messagesCallbackTime||(r.add(e.token),o.messagesCallback(e.data)))}),o}function h(e){f(e.listener)}function m(e,t,n){e.messagesCallbackTime=n,e.messagesCallback=t}function v(){if(a.isNode)return!1;var e=u();if(!e)return!1;try{var t="__broadcastchannel_check";e.setItem(t,"works"),e.removeItem(t)}catch(e){return!1}return!0}function b(){var e=navigator.userAgent.toLowerCase();return e.includes("safari")&&!e.includes("chrome")?240:120}n.type=e,n.default={create:p,close:h,onMessage:m,postMessage:l,canBeUsed:v,type:e,averageResponseTime:b,microSeconds:r}},{"../options":11,"../util":12,"oblivious-set":17}],9:[function(e,t,n){"use strict";Object.defineProperty(n,"__esModule",{value:!0}),n.averageResponseTime=c,n.canBeUsed=u,n.close=i,n.create=o,n.microSeconds=n.default=void 0,n.onMessage=a,n.postMessage=s,n.type=void 0;var r=e("../util"),e=r.microSeconds;n.microSeconds=e;function o(e){var t={messagesCallback:null,bc:new BroadcastChannel(e),subFns:[]};return t.bc.onmessage=function(e){t.messagesCallback&&t.messagesCallback(e.data)},t}function i(e){e.bc.close(),e.subFns=[]}function s(e,t){try{return e.bc.postMessage(t,!1),r.PROMISE_RESOLVED_VOID}catch(e){return Promise.reject(e)}}function a(e,t){e.messagesCallback=t}function u(){if(r.isNode&&"undefined"==typeof window)return!1;if("function"!=typeof BroadcastChannel)return!1;if(BroadcastChannel._pubkey)throw new Error("BroadcastChannel: Do not overwrite window.BroadcastChannel with this module, this is not a polyfill");return!0}function c(){return 150}n.type="native",n.default={create:o,close:i,onMessage:a,postMessage:s,canBeUsed:u,type:"native",averageResponseTime:c,microSeconds:e}},{"../util":12}],10:[function(e,t,n){"use strict";Object.defineProperty(n,"__esModule",{value:!0}),n.averageResponseTime=l,n.canBeUsed=c,n.close=s,n.create=i,n.microSeconds=n.default=void 0,n.onMessage=u,n.postMessage=a,n.type=void 0;var r=e("../util").microSeconds;n.microSeconds=r;e="simulate";n.type=e;var o=new Set;function i(e){e={name:e,messagesCallback:null};return o.add(e),e}function s(e){o.delete(e)}function a(t,n){return new Promise(function(e){return setTimeout(function(){Array.from(o).filter(function(e){return e.name===t.name}).filter(function(e){return e!==t}).filter(function(e){return!!e.messagesCallback}).forEach(function(e){return e.messagesCallback(n)}),e()},5)})}function u(e,t){e.messagesCallback=t}function c(){return!0}function l(){return 5}n.default={create:i,close:s,onMessage:u,postMessage:a,canBeUsed:c,type:e,averageResponseTime:l,microSeconds:r}},{"../util":12}],11:[function(e,t,n){"use strict";Object.defineProperty(n,"__esModule",{value:!0}),n.fillOptionsWithDefaults=function(){var e=0<arguments.length&&void 0!==arguments[0]?arguments[0]:{},t=JSON.parse(JSON.stringify(e));void 0===t.webWorkerSupport&&(t.webWorkerSupport=!0);t.idb||(t.idb={});t.idb.ttl||(t.idb.ttl=45e3);t.idb.fallbackInterval||(t.idb.fallbackInterval=150);e.idb&&"function"==typeof e.idb.onclose&&(t.idb.onclose=e.idb.onclose);t.localstorage||(t.localstorage={});t.localstorage.removeTimeout||(t.localstorage.removeTimeout=6e4);e.methods&&(t.methods=e.methods);t.node||(t.node={});t.node.ttl||(t.node.ttl=12e4);void 0===t.node.useFastPath&&(t.node.useFastPath=!0);return t}},{}],12:[function(e,t,o){!function(r){!function(){"use strict";Object.defineProperty(o,"__esModule",{value:!0}),o.isNode=o.PROMISE_RESOLVED_VOID=o.PROMISE_RESOLVED_FALSE=o.PROMISE_REJECTED=void 0,o.isPromise=function(e){return!(!e||"function"!=typeof e.then)},o.microSeconds=function(){var e=(new Date).getTime();return e===t?1e3*e+ ++n:(n=0,1e3*(t=e))},o.randomInt=function(e,t){return Math.floor(Math.random()*(t-e+1)+e)},o.randomToken=function(){return Math.random().toString(36).substring(2)},o.sleep=function(t){t=t||0;return new Promise(function(e){return setTimeout(e,t)})};var e=Promise.resolve(!1);o.PROMISE_RESOLVED_FALSE=e;e=Promise.resolve();o.PROMISE_RESOLVED_VOID=e;e=Promise.reject(new Error);o.PROMISE_REJECTED=e;var t=0,n=0;e="[object process]"===Object.prototype.toString.call(void 0!==r?r:0);o.isNode=e}.call(this)}.call(this,e("_process"))},{_process:18}],13:[function(e,t,n){t.exports=function(e){return e&&e.__esModule?e:{default:e}},t.exports.default=t.exports,t.exports.__esModule=!0},{}],14:[function(e,t,n){function r(e){return"function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?t.exports=r=function(e){return typeof e}:t.exports=r=function(e){return e&&"function"==typeof Symbol&&e.constructor===Symbol&&e!==Symbol.prototype?"symbol":typeof e},t.exports.default=t.exports,t.exports.__esModule=!0,r(e)}t.exports=r,t.exports.default=t.exports,t.exports.__esModule=!0},{}],15:[function(e,t,n){},{}],16:[function(e,t,n){t.exports=!1},{}],17:[function(e,t,n){"use strict";Object.defineProperty(n,"__esModule",{value:!0}),n.now=n.removeTooOldValues=n.ObliviousSet=void 0;var r=(o.prototype.has=function(e){return this.set.has(e)},o.prototype.add=function(e){var t=this;this.timeMap.set(e,s()),this.set.add(e),setTimeout(function(){i(t)},0)},o.prototype.clear=function(){this.set.clear(),this.timeMap.clear()},o);function o(e){this.ttl=e,this.set=new Set,this.timeMap=new Map}function i(e){for(var t=s()-e.ttl,n=e.set[Symbol.iterator]();;){var r=n.next().value;if(!r)return;if(!(e.timeMap.get(r)<t))return;e.timeMap.delete(r),e.set.delete(r)}}function s(){return(new Date).getTime()}n.ObliviousSet=r,n.removeTooOldValues=i,n.now=s},{}],18:[function(e,t,n){var r,o,t=t.exports={};function i(){throw new Error("setTimeout has not been defined")}function s(){throw new Error("clearTimeout has not been defined")}function a(t){if(r===setTimeout)return setTimeout(t,0);if((r===i||!r)&&setTimeout)return r=setTimeout,setTimeout(t,0);try{return r(t,0)}catch(e){try{return r.call(null,t,0)}catch(e){return r.call(this,t,0)}}}!function(){try{r="function"==typeof setTimeout?setTimeout:i}catch(e){r=i}try{o="function"==typeof clearTimeout?clearTimeout:s}catch(e){o=s}}();var u,c=[],l=!1,d=-1;function f(){l&&u&&(l=!1,u.length?c=u.concat(c):d=-1,c.length&&p())}function p(){if(!l){var e=a(f);l=!0;for(var t=c.length;t;){for(u=c,c=[];++d<t;)u&&u[d].run();d=-1,t=c.length}u=null,l=!1,function(t){if(o===clearTimeout)return clearTimeout(t);if((o===s||!o)&&clearTimeout)return o=clearTimeout,clearTimeout(t);try{o(t)}catch(e){try{return o.call(null,t)}catch(e){return o.call(this,t)}}}(e)}}function h(e,t){this.fun=e,this.array=t}function m(){}t.nextTick=function(e){var t=new Array(arguments.length-1);if(1<arguments.length)for(var n=1;n<arguments.length;n++)t[n-1]=arguments[n];c.push(new h(e,t)),1!==c.length||l||a(p)},h.prototype.run=function(){this.fun.apply(null,this.array)},t.title="browser",t.browser=!0,t.env={},t.argv=[],t.version="",t.versions={},t.on=m,t.addListener=m,t.once=m,t.off=m,t.removeListener=m,t.removeAllListeners=m,t.emit=m,t.prependListener=m,t.prependOnceListener=m,t.listeners=function(e){return[]},t.binding=function(e){throw new Error("process.binding is not supported")},t.cwd=function(){return"/"},t.chdir=function(e){throw new Error("process.chdir is not supported")},t.umask=function(){return 0}},{}],19:[function(e,t,n){"use strict";Object.defineProperty(n,"__esModule",{value:!0}),n.default=void 0,n.default={add:function(e){"function"==typeof WorkerGlobalScope&&self instanceof WorkerGlobalScope||"function"==typeof window.addEventListener&&(window.addEventListener("beforeunload",function(){e()},!0),window.addEventListener("unload",function(){e()},!0))}}},{}],20:[function(e,t,n){"use strict";var r=e("@babel/runtime/helpers/interopRequireDefault");Object.defineProperty(n,"__esModule",{value:!0}),n.add=c,n.runAll=l,n.removeAll=d,n.getSize=f,n.default=void 0;var o=r(e("detect-node")),i=r(e("./browser.js")),e=r(e("./node.js")),s=(o.default?e:i).default,a=new Set,u=!1;function c(e){if(u||(u=!0,s.add(l)),"function"!=typeof e)throw new Error("Listener is no function");return a.add(e),{remove:function(){return a.delete(e)},run:function(){return a.delete(e),e()}}}function l(){var t=[];return a.forEach(function(e){t.push(e()),a.delete(e)}),Promise.all(t)}function d(){a.clear()}function f(){return a.size}n.default={add:c,runAll:l,removeAll:d,getSize:f}},{"./browser.js":19,"./node.js":15,"@babel/runtime/helpers/interopRequireDefault":13,"detect-node":16}]},{},[2]);
\ No newline at end of file
diff --git a/dist/lib/index.js b/dist/lib/index.js
index cbfd05e1..8bc266af 100644
--- a/dist/lib/index.js
+++ b/dist/lib/index.js
@@ -9,16 +9,16 @@ Object.defineProperty(exports, "BroadcastChannel", {
     return _broadcastChannel.BroadcastChannel;
   }
 });
-Object.defineProperty(exports, "clearNodeFolder", {
+Object.defineProperty(exports, "beLeader", {
   enumerable: true,
   get: function get() {
-    return _broadcastChannel.clearNodeFolder;
+    return _leaderElection.beLeader;
   }
 });
-Object.defineProperty(exports, "enforceOptions", {
+Object.defineProperty(exports, "clearNodeFolder", {
   enumerable: true,
   get: function get() {
-    return _broadcastChannel.enforceOptions;
+    return _broadcastChannel.clearNodeFolder;
   }
 });
 Object.defineProperty(exports, "createLeaderElection", {
@@ -27,10 +27,10 @@ Object.defineProperty(exports, "createLeaderElection", {
     return _leaderElection.createLeaderElection;
   }
 });
-Object.defineProperty(exports, "beLeader", {
+Object.defineProperty(exports, "enforceOptions", {
   enumerable: true,
   get: function get() {
-    return _leaderElection.beLeader;
+    return _broadcastChannel.enforceOptions;
   }
 });
 
diff --git a/dist/lib/leader-election.js b/dist/lib/leader-election.js
index 3b2a9105..131febfe 100644
--- a/dist/lib/leader-election.js
+++ b/dist/lib/leader-election.js
@@ -12,10 +12,11 @@ var _util = require("./util.js");
 
 var _unload = _interopRequireDefault(require("unload"));
 
-var LeaderElection = function LeaderElection(channel, options) {
-  this._channel = channel;
+var LeaderElection = function LeaderElection(broadcastChannel, options) {
+  this.broadcastChannel = broadcastChannel;
   this._options = options;
   this.isLeader = false;
+  this.hasLeader = false;
   this.isDead = false;
   this.token = (0, _util.randomToken)();
   this._isApl = false; // _isApplying
@@ -38,12 +39,18 @@ LeaderElection.prototype = {
   applyOnce: function applyOnce() {
     var _this = this;
 
-    if (this.isLeader) return Promise.resolve(false);
-    if (this.isDead) return Promise.resolve(false); // do nothing if already running
+    if (this.isLeader) {
+      return _util.PROMISE_RESOLVED_FALSE;
+    }
+
+    if (this.isDead) {
+      return _util.PROMISE_RESOLVED_FALSE;
+    } // do nothing if already running
+
 
     if (this._isApl) {
       this._reApply = true;
-      return Promise.resolve(false);
+      return _util.PROMISE_RESOLVED_FALSE;
     }
 
     this._isApl = true;
@@ -65,23 +72,32 @@ LeaderElection.prototype = {
         if (msg.action === 'tell') {
           // other is already leader
           stopCriteria = true;
+          _this.hasLeader = true;
         }
       }
     };
 
-    this._channel.addEventListener('internal', handleMessage);
+    this.broadcastChannel.addEventListener('internal', handleMessage);
 
     var ret = _sendMessage(this, 'apply') // send out that this one is applying
     .then(function () {
       return (0, _util.sleep)(_this._options.responseTime);
     }) // let others time to respond
     .then(function () {
-      if (stopCriteria) return Promise.reject(new Error());else return _sendMessage(_this, 'apply');
+      if (stopCriteria) {
+        return _util.PROMISE_REJECTED;
+      } else {
+        return _sendMessage(_this, 'apply');
+      }
     }).then(function () {
       return (0, _util.sleep)(_this._options.responseTime);
     }) // let others time to respond
     .then(function () {
-      if (stopCriteria) return Promise.reject(new Error());else return _sendMessage(_this);
+      if (stopCriteria) {
+        return _util.PROMISE_REJECTED;
+      } else {
+        return _sendMessage(_this);
+      }
     }).then(function () {
       return beLeader(_this);
     }) // no one disagreed -> this one is now leader
@@ -91,7 +107,7 @@ LeaderElection.prototype = {
       return false;
     }) // apply not successfull
     .then(function (success) {
-      _this._channel.removeEventListener('internal', handleMessage);
+      _this.broadcastChannel.removeEventListener('internal', handleMessage);
 
       _this._isApl = false;
 
@@ -120,11 +136,15 @@ LeaderElection.prototype = {
   die: function die() {
     var _this2 = this;
 
-    if (this.isDead) return;
+    if (this.isDead || !this.isLeader) {
+      return;
+    }
+
+    this.hasLeader = false;
     this.isDead = true;
 
     this._lstns.forEach(function (listener) {
-      return _this2._channel.removeEventListener('internal', listener);
+      return _this2.broadcastChannel.removeEventListener('internal', listener);
     });
 
     this._invs.forEach(function (interval) {
@@ -138,9 +158,15 @@ LeaderElection.prototype = {
     return _sendMessage(this, 'death');
   }
 };
+/**
+ * @param leaderElector {LeaderElector}
+ */
 
 function _awaitLeadershipOnce(leaderElector) {
-  if (leaderElector.isLeader) return Promise.resolve();
+  if (leaderElector.isLeader) {
+    return _util.PROMISE_RESOLVED_VOID;
+  }
+
   return new Promise(function (res) {
     var resolved = false;
 
@@ -151,9 +177,7 @@ function _awaitLeadershipOnce(leaderElector) {
 
       resolved = true;
       clearInterval(interval);
-
-      leaderElector._channel.removeEventListener('internal', whenDeathListener);
-
+      leaderElector.broadcastChannel.removeEventListener('internal', whenDeathListener);
       res(true);
     } // try once now
 
@@ -177,13 +201,16 @@ function _awaitLeadershipOnce(leaderElector) {
 
     var whenDeathListener = function whenDeathListener(msg) {
       if (msg.context === 'leader' && msg.action === 'death') {
+        leaderElector.hasLeader = false;
         leaderElector.applyOnce().then(function () {
-          if (leaderElector.isLeader) finish();
+          if (leaderElector.isLeader) {
+            finish();
+          }
         });
       }
     };
 
-    leaderElector._channel.addEventListener('internal', whenDeathListener);
+    leaderElector.broadcastChannel.addEventListener('internal', whenDeathListener);
 
     leaderElector._lstns.push(whenDeathListener);
   });
@@ -199,11 +226,12 @@ function _sendMessage(leaderElector, action) {
     action: action,
     token: leaderElector.token
   };
-  return leaderElector._channel.postInternal(msgJson);
+  return leaderElector.broadcastChannel.postInternal(msgJson);
 }
 
 function beLeader(leaderElector) {
   leaderElector.isLeader = true;
+  leaderElector.hasLeader = true;
 
   var unloadFn = _unload["default"].add(function () {
     return leaderElector.die();
@@ -235,7 +263,7 @@ function beLeader(leaderElector) {
     }
   };
 
-  leaderElector._channel.addEventListener('internal', isLeaderListener);
+  leaderElector.broadcastChannel.addEventListener('internal', isLeaderListener);
 
   leaderElector._lstns.push(isLeaderListener);
 
diff --git a/dist/lib/methods/indexed-db.js b/dist/lib/methods/indexed-db.js
index 25ab2fa8..0621cc11 100644
--- a/dist/lib/methods/indexed-db.js
+++ b/dist/lib/methods/indexed-db.js
@@ -3,21 +3,23 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.getIdb = getIdb;
+exports.averageResponseTime = averageResponseTime;
+exports.canBeUsed = canBeUsed;
+exports.cleanOldMessages = cleanOldMessages;
+exports.close = close;
+exports.create = create;
 exports.createDatabase = createDatabase;
-exports.writeMessage = writeMessage;
+exports["default"] = void 0;
 exports.getAllMessages = getAllMessages;
+exports.getIdb = getIdb;
 exports.getMessagesHigherThan = getMessagesHigherThan;
-exports.removeMessageById = removeMessageById;
 exports.getOldMessages = getOldMessages;
-exports.cleanOldMessages = cleanOldMessages;
-exports.create = create;
-exports.close = close;
-exports.postMessage = postMessage;
+exports.microSeconds = void 0;
 exports.onMessage = onMessage;
-exports.canBeUsed = canBeUsed;
-exports.averageResponseTime = averageResponseTime;
-exports["default"] = exports.type = exports.microSeconds = void 0;
+exports.postMessage = postMessage;
+exports.removeMessageById = removeMessageById;
+exports.type = void 0;
+exports.writeMessage = writeMessage;
 
 var _util = require("../util.js");
 
@@ -215,7 +217,7 @@ function create(channelName, options) {
        */
       eMIs: new _obliviousSet.ObliviousSet(options.idb.ttl * 2),
       // ensures we do not read messages in parrallel
-      writeBlockPromise: Promise.resolve(),
+      writeBlockPromise: _util.PROMISE_RESOLVED_VOID,
       messagesCallback: null,
       readQueuePromises: [],
       db: db
@@ -269,9 +271,9 @@ function _filterMessage(msgObj, state) {
 
 function readNewMessages(state) {
   // channel already closed
-  if (state.closed) return Promise.resolve(); // if no one is listening, we do not need to scan for new messages
+  if (state.closed) return _util.PROMISE_RESOLVED_VOID; // if no one is listening, we do not need to scan for new messages
 
-  if (!state.messagesCallback) return Promise.resolve();
+  if (!state.messagesCallback) return _util.PROMISE_RESOLVED_VOID;
   return getMessagesHigherThan(state.db, state.lastCursorId).then(function (newerMessages) {
     var useMessages = newerMessages
     /**
@@ -299,7 +301,7 @@ function readNewMessages(state) {
         state.messagesCallback(msgObj.data);
       }
     });
-    return Promise.resolve();
+    return _util.PROMISE_RESOLVED_VOID;
   });
 }
 
diff --git a/dist/lib/methods/localstorage.js b/dist/lib/methods/localstorage.js
index f9261883..31921f6a 100644
--- a/dist/lib/methods/localstorage.js
+++ b/dist/lib/methods/localstorage.js
@@ -3,17 +3,19 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.getLocalStorage = getLocalStorage;
-exports.storageKey = storageKey;
-exports.postMessage = postMessage;
 exports.addStorageEventListener = addStorageEventListener;
-exports.removeStorageEventListener = removeStorageEventListener;
-exports.create = create;
+exports.averageResponseTime = averageResponseTime;
+exports.canBeUsed = canBeUsed;
 exports.close = close;
+exports.create = create;
+exports["default"] = void 0;
+exports.getLocalStorage = getLocalStorage;
+exports.microSeconds = void 0;
 exports.onMessage = onMessage;
-exports.canBeUsed = canBeUsed;
-exports.averageResponseTime = averageResponseTime;
-exports["default"] = exports.type = exports.microSeconds = void 0;
+exports.postMessage = postMessage;
+exports.removeStorageEventListener = removeStorageEventListener;
+exports.storageKey = storageKey;
+exports.type = void 0;
 
 var _obliviousSet = require("oblivious-set");
 
diff --git a/dist/lib/methods/native.js b/dist/lib/methods/native.js
index 504ac8e8..3b1ec366 100644
--- a/dist/lib/methods/native.js
+++ b/dist/lib/methods/native.js
@@ -3,13 +3,14 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.create = create;
+exports.averageResponseTime = averageResponseTime;
+exports.canBeUsed = canBeUsed;
 exports.close = close;
-exports.postMessage = postMessage;
+exports.create = create;
+exports.microSeconds = exports["default"] = void 0;
 exports.onMessage = onMessage;
-exports.canBeUsed = canBeUsed;
-exports.averageResponseTime = averageResponseTime;
-exports["default"] = exports.type = exports.microSeconds = void 0;
+exports.postMessage = postMessage;
+exports.type = void 0;
 
 var _util = require("../util");
 
@@ -43,7 +44,7 @@ function close(channelState) {
 function postMessage(channelState, messageJson) {
   try {
     channelState.bc.postMessage(messageJson, false);
-    return Promise.resolve();
+    return _util.PROMISE_RESOLVED_VOID;
   } catch (err) {
     return Promise.reject(err);
   }
diff --git a/dist/lib/methods/node.js b/dist/lib/methods/node.js
index 2439f173..0dfb23b7 100644
--- a/dist/lib/methods/node.js
+++ b/dist/lib/methods/node.js
@@ -5,35 +5,36 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
+exports.TMP_FOLDER_BASE = void 0;
+exports._filterMessage = _filterMessage;
+exports.averageResponseTime = averageResponseTime;
+exports.canBeUsed = canBeUsed;
+exports.cleanOldMessages = cleanOldMessages;
 exports.cleanPipeName = cleanPipeName;
-exports.getPaths = getPaths;
-exports.ensureFoldersExist = ensureFoldersExist;
 exports.clearNodeFolder = clearNodeFolder;
-exports.socketPath = socketPath;
-exports.socketInfoPath = socketInfoPath;
-exports.createSocketInfoFile = createSocketInfoFile;
+exports.close = close;
 exports.countChannelFolders = countChannelFolders;
+exports.create = create;
 exports.createSocketEventEmitter = createSocketEventEmitter;
-exports.openClientConnection = openClientConnection;
-exports.writeMessage = writeMessage;
-exports.getReadersUuids = getReadersUuids;
-exports.messagePath = messagePath;
+exports.createSocketInfoFile = createSocketInfoFile;
+exports.emitOverFastPath = emitOverFastPath;
+exports.ensureFoldersExist = ensureFoldersExist;
 exports.getAllMessages = getAllMessages;
+exports.getPaths = getPaths;
+exports.getReadersUuids = getReadersUuids;
 exports.getSingleMessage = getSingleMessage;
-exports.readMessage = readMessage;
-exports.cleanOldMessages = cleanOldMessages;
-exports.create = create;
-exports._filterMessage = _filterMessage;
 exports.handleMessagePing = handleMessagePing;
-exports.refreshReaderClients = refreshReaderClients;
-exports.postMessage = postMessage;
-exports.emitOverFastPath = emitOverFastPath;
-exports.onMessage = onMessage;
-exports.close = close;
-exports.canBeUsed = canBeUsed;
-exports.averageResponseTime = averageResponseTime;
+exports.messagePath = messagePath;
 exports.microSeconds = microSeconds;
-exports.type = exports.TMP_FOLDER_BASE = void 0;
+exports.onMessage = onMessage;
+exports.openClientConnection = openClientConnection;
+exports.postMessage = postMessage;
+exports.readMessage = readMessage;
+exports.refreshReaderClients = refreshReaderClients;
+exports.socketInfoPath = socketInfoPath;
+exports.socketPath = socketPath;
+exports.type = void 0;
+exports.writeMessage = writeMessage;
 
 var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
 
@@ -736,7 +737,7 @@ function _create() {
               messagesCallbackTime: null,
               messagesCallback: null,
               // ensures we do not read messages in parrallel
-              writeBlockPromise: Promise.resolve(),
+              writeBlockPromise: _util2.PROMISE_RESOLVED_VOID,
               otherReaderClients: {},
               // ensure if process crashes, everything is cleaned up
               removeUnload: _unload["default"].add(function () {
diff --git a/dist/lib/methods/simulate.js b/dist/lib/methods/simulate.js
index 09b12b89..cb4ef3b2 100644
--- a/dist/lib/methods/simulate.js
+++ b/dist/lib/methods/simulate.js
@@ -3,13 +3,14 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.create = create;
+exports.averageResponseTime = averageResponseTime;
+exports.canBeUsed = canBeUsed;
 exports.close = close;
-exports.postMessage = postMessage;
+exports.create = create;
+exports.microSeconds = exports["default"] = void 0;
 exports.onMessage = onMessage;
-exports.canBeUsed = canBeUsed;
-exports.averageResponseTime = averageResponseTime;
-exports["default"] = exports.type = exports.microSeconds = void 0;
+exports.postMessage = postMessage;
+exports.type = void 0;
 
 var _util = require("../util");
 
diff --git a/dist/lib/util.js b/dist/lib/util.js
index 8fba57af..c8e8bd85 100644
--- a/dist/lib/util.js
+++ b/dist/lib/util.js
@@ -3,12 +3,12 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
+exports.isNode = exports.PROMISE_RESOLVED_VOID = exports.PROMISE_RESOLVED_FALSE = exports.PROMISE_REJECTED = void 0;
 exports.isPromise = isPromise;
-exports.sleep = sleep;
+exports.microSeconds = microSeconds;
 exports.randomInt = randomInt;
 exports.randomToken = randomToken;
-exports.microSeconds = microSeconds;
-exports.isNode = void 0;
+exports.sleep = sleep;
 
 /**
  * returns true if the given object is a promise
@@ -21,6 +21,13 @@ function isPromise(obj) {
   }
 }
 
+var PROMISE_RESOLVED_FALSE = Promise.resolve(false);
+exports.PROMISE_RESOLVED_FALSE = PROMISE_RESOLVED_FALSE;
+var PROMISE_RESOLVED_VOID = Promise.resolve();
+exports.PROMISE_RESOLVED_VOID = PROMISE_RESOLVED_VOID;
+var PROMISE_REJECTED = Promise.reject(new Error());
+exports.PROMISE_REJECTED = PROMISE_REJECTED;
+
 function sleep(time) {
   if (!time) time = 0;
   return new Promise(function (res) {
diff --git a/docs/e2e.js b/docs/e2e.js
index 659bdf6d..b8df9c6d 100644
--- a/docs/e2e.js
+++ b/docs/e2e.js
@@ -4,9 +4,9 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
+exports.BroadcastChannel = void 0;
 exports.clearNodeFolder = clearNodeFolder;
 exports.enforceOptions = enforceOptions;
-exports.BroadcastChannel = void 0;
 
 var _util = require("./util.js");
 
@@ -86,7 +86,7 @@ function clearNodeFolder(options) {
       return true;
     });
   } else {
-    return Promise.resolve(false);
+    return _util.PROMISE_RESOLVED_FALSE;
   }
 }
 /**
@@ -156,7 +156,7 @@ BroadcastChannel.prototype = {
     }
 
     this.closed = true;
-    var awaitPrepare = this._prepP ? this._prepP : Promise.resolve();
+    var awaitPrepare = this._prepP ? this._prepP : _util.PROMISE_RESOLVED_VOID;
     this._onML = null;
     this._addEL.message = [];
     return awaitPrepare // wait until all current sending are processed
@@ -194,7 +194,7 @@ function _post(broadcastChannel, type, msg) {
     type: type,
     data: msg
   };
-  var awaitPrepare = broadcastChannel._prepP ? broadcastChannel._prepP : Promise.resolve();
+  var awaitPrepare = broadcastChannel._prepP ? broadcastChannel._prepP : _util.PROMISE_RESOLVED_VOID;
   return awaitPrepare.then(function () {
     var sendPromise = broadcastChannel.method.postMessage(broadcastChannel._state, msgObj); // add/remove to unsend messages list
 
@@ -310,16 +310,16 @@ Object.defineProperty(exports, "BroadcastChannel", {
     return _broadcastChannel.BroadcastChannel;
   }
 });
-Object.defineProperty(exports, "clearNodeFolder", {
+Object.defineProperty(exports, "beLeader", {
   enumerable: true,
   get: function get() {
-    return _broadcastChannel.clearNodeFolder;
+    return _leaderElection.beLeader;
   }
 });
-Object.defineProperty(exports, "enforceOptions", {
+Object.defineProperty(exports, "clearNodeFolder", {
   enumerable: true,
   get: function get() {
-    return _broadcastChannel.enforceOptions;
+    return _broadcastChannel.clearNodeFolder;
   }
 });
 Object.defineProperty(exports, "createLeaderElection", {
@@ -328,10 +328,10 @@ Object.defineProperty(exports, "createLeaderElection", {
     return _leaderElection.createLeaderElection;
   }
 });
-Object.defineProperty(exports, "beLeader", {
+Object.defineProperty(exports, "enforceOptions", {
   enumerable: true,
   get: function get() {
-    return _leaderElection.beLeader;
+    return _broadcastChannel.enforceOptions;
   }
 });
 
@@ -353,10 +353,11 @@ var _util = require("./util.js");
 
 var _unload = _interopRequireDefault(require("unload"));
 
-var LeaderElection = function LeaderElection(channel, options) {
-  this._channel = channel;
+var LeaderElection = function LeaderElection(broadcastChannel, options) {
+  this.broadcastChannel = broadcastChannel;
   this._options = options;
   this.isLeader = false;
+  this.hasLeader = false;
   this.isDead = false;
   this.token = (0, _util.randomToken)();
   this._isApl = false; // _isApplying
@@ -379,12 +380,18 @@ LeaderElection.prototype = {
   applyOnce: function applyOnce() {
     var _this = this;
 
-    if (this.isLeader) return Promise.resolve(false);
-    if (this.isDead) return Promise.resolve(false); // do nothing if already running
+    if (this.isLeader) {
+      return _util.PROMISE_RESOLVED_FALSE;
+    }
+
+    if (this.isDead) {
+      return _util.PROMISE_RESOLVED_FALSE;
+    } // do nothing if already running
+
 
     if (this._isApl) {
       this._reApply = true;
-      return Promise.resolve(false);
+      return _util.PROMISE_RESOLVED_FALSE;
     }
 
     this._isApl = true;
@@ -406,23 +413,32 @@ LeaderElection.prototype = {
         if (msg.action === 'tell') {
           // other is already leader
           stopCriteria = true;
+          _this.hasLeader = true;
         }
       }
     };
 
-    this._channel.addEventListener('internal', handleMessage);
+    this.broadcastChannel.addEventListener('internal', handleMessage);
 
     var ret = _sendMessage(this, 'apply') // send out that this one is applying
     .then(function () {
       return (0, _util.sleep)(_this._options.responseTime);
     }) // let others time to respond
     .then(function () {
-      if (stopCriteria) return Promise.reject(new Error());else return _sendMessage(_this, 'apply');
+      if (stopCriteria) {
+        return _util.PROMISE_REJECTED;
+      } else {
+        return _sendMessage(_this, 'apply');
+      }
     }).then(function () {
       return (0, _util.sleep)(_this._options.responseTime);
     }) // let others time to respond
     .then(function () {
-      if (stopCriteria) return Promise.reject(new Error());else return _sendMessage(_this);
+      if (stopCriteria) {
+        return _util.PROMISE_REJECTED;
+      } else {
+        return _sendMessage(_this);
+      }
     }).then(function () {
       return beLeader(_this);
     }) // no one disagreed -> this one is now leader
@@ -432,7 +448,7 @@ LeaderElection.prototype = {
       return false;
     }) // apply not successfull
     .then(function (success) {
-      _this._channel.removeEventListener('internal', handleMessage);
+      _this.broadcastChannel.removeEventListener('internal', handleMessage);
 
       _this._isApl = false;
 
@@ -461,11 +477,15 @@ LeaderElection.prototype = {
   die: function die() {
     var _this2 = this;
 
-    if (this.isDead) return;
+    if (this.isDead || !this.isLeader) {
+      return;
+    }
+
+    this.hasLeader = false;
     this.isDead = true;
 
     this._lstns.forEach(function (listener) {
-      return _this2._channel.removeEventListener('internal', listener);
+      return _this2.broadcastChannel.removeEventListener('internal', listener);
     });
 
     this._invs.forEach(function (interval) {
@@ -479,9 +499,15 @@ LeaderElection.prototype = {
     return _sendMessage(this, 'death');
   }
 };
+/**
+ * @param leaderElector {LeaderElector}
+ */
 
 function _awaitLeadershipOnce(leaderElector) {
-  if (leaderElector.isLeader) return Promise.resolve();
+  if (leaderElector.isLeader) {
+    return _util.PROMISE_RESOLVED_VOID;
+  }
+
   return new Promise(function (res) {
     var resolved = false;
 
@@ -492,9 +518,7 @@ function _awaitLeadershipOnce(leaderElector) {
 
       resolved = true;
       clearInterval(interval);
-
-      leaderElector._channel.removeEventListener('internal', whenDeathListener);
-
+      leaderElector.broadcastChannel.removeEventListener('internal', whenDeathListener);
       res(true);
     } // try once now
 
@@ -518,13 +542,16 @@ function _awaitLeadershipOnce(leaderElector) {
 
     var whenDeathListener = function whenDeathListener(msg) {
       if (msg.context === 'leader' && msg.action === 'death') {
+        leaderElector.hasLeader = false;
         leaderElector.applyOnce().then(function () {
-          if (leaderElector.isLeader) finish();
+          if (leaderElector.isLeader) {
+            finish();
+          }
         });
       }
     };
 
-    leaderElector._channel.addEventListener('internal', whenDeathListener);
+    leaderElector.broadcastChannel.addEventListener('internal', whenDeathListener);
 
     leaderElector._lstns.push(whenDeathListener);
   });
@@ -540,11 +567,12 @@ function _sendMessage(leaderElector, action) {
     action: action,
     token: leaderElector.token
   };
-  return leaderElector._channel.postInternal(msgJson);
+  return leaderElector.broadcastChannel.postInternal(msgJson);
 }
 
 function beLeader(leaderElector) {
   leaderElector.isLeader = true;
+  leaderElector.hasLeader = true;
 
   var unloadFn = _unload["default"].add(function () {
     return leaderElector.die();
@@ -576,7 +604,7 @@ function beLeader(leaderElector) {
     }
   };
 
-  leaderElector._channel.addEventListener('internal', isLeaderListener);
+  leaderElector.broadcastChannel.addEventListener('internal', isLeaderListener);
 
   leaderElector._lstns.push(isLeaderListener);
 
@@ -687,21 +715,23 @@ function chooseMethod(options) {
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.getIdb = getIdb;
+exports.averageResponseTime = averageResponseTime;
+exports.canBeUsed = canBeUsed;
+exports.cleanOldMessages = cleanOldMessages;
+exports.close = close;
+exports.create = create;
 exports.createDatabase = createDatabase;
-exports.writeMessage = writeMessage;
+exports["default"] = void 0;
 exports.getAllMessages = getAllMessages;
+exports.getIdb = getIdb;
 exports.getMessagesHigherThan = getMessagesHigherThan;
-exports.removeMessageById = removeMessageById;
 exports.getOldMessages = getOldMessages;
-exports.cleanOldMessages = cleanOldMessages;
-exports.create = create;
-exports.close = close;
-exports.postMessage = postMessage;
+exports.microSeconds = void 0;
 exports.onMessage = onMessage;
-exports.canBeUsed = canBeUsed;
-exports.averageResponseTime = averageResponseTime;
-exports["default"] = exports.type = exports.microSeconds = void 0;
+exports.postMessage = postMessage;
+exports.removeMessageById = removeMessageById;
+exports.type = void 0;
+exports.writeMessage = writeMessage;
 
 var _util = require("../util.js");
 
@@ -899,7 +929,7 @@ function create(channelName, options) {
        */
       eMIs: new _obliviousSet.ObliviousSet(options.idb.ttl * 2),
       // ensures we do not read messages in parrallel
-      writeBlockPromise: Promise.resolve(),
+      writeBlockPromise: _util.PROMISE_RESOLVED_VOID,
       messagesCallback: null,
       readQueuePromises: [],
       db: db
@@ -953,9 +983,9 @@ function _filterMessage(msgObj, state) {
 
 function readNewMessages(state) {
   // channel already closed
-  if (state.closed) return Promise.resolve(); // if no one is listening, we do not need to scan for new messages
+  if (state.closed) return _util.PROMISE_RESOLVED_VOID; // if no one is listening, we do not need to scan for new messages
 
-  if (!state.messagesCallback) return Promise.resolve();
+  if (!state.messagesCallback) return _util.PROMISE_RESOLVED_VOID;
   return getMessagesHigherThan(state.db, state.lastCursorId).then(function (newerMessages) {
     var useMessages = newerMessages
     /**
@@ -983,7 +1013,7 @@ function readNewMessages(state) {
         state.messagesCallback(msgObj.data);
       }
     });
-    return Promise.resolve();
+    return _util.PROMISE_RESOLVED_VOID;
   });
 }
 
@@ -1038,17 +1068,19 @@ exports["default"] = _default;
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.getLocalStorage = getLocalStorage;
-exports.storageKey = storageKey;
-exports.postMessage = postMessage;
 exports.addStorageEventListener = addStorageEventListener;
-exports.removeStorageEventListener = removeStorageEventListener;
-exports.create = create;
+exports.averageResponseTime = averageResponseTime;
+exports.canBeUsed = canBeUsed;
 exports.close = close;
+exports.create = create;
+exports["default"] = void 0;
+exports.getLocalStorage = getLocalStorage;
+exports.microSeconds = void 0;
 exports.onMessage = onMessage;
-exports.canBeUsed = canBeUsed;
-exports.averageResponseTime = averageResponseTime;
-exports["default"] = exports.type = exports.microSeconds = void 0;
+exports.postMessage = postMessage;
+exports.removeStorageEventListener = removeStorageEventListener;
+exports.storageKey = storageKey;
+exports.type = void 0;
 
 var _obliviousSet = require("oblivious-set");
 
@@ -1236,13 +1268,14 @@ exports["default"] = _default;
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.create = create;
+exports.averageResponseTime = averageResponseTime;
+exports.canBeUsed = canBeUsed;
 exports.close = close;
-exports.postMessage = postMessage;
+exports.create = create;
+exports.microSeconds = exports["default"] = void 0;
 exports.onMessage = onMessage;
-exports.canBeUsed = canBeUsed;
-exports.averageResponseTime = averageResponseTime;
-exports["default"] = exports.type = exports.microSeconds = void 0;
+exports.postMessage = postMessage;
+exports.type = void 0;
 
 var _util = require("../util");
 
@@ -1276,7 +1309,7 @@ function close(channelState) {
 function postMessage(channelState, messageJson) {
   try {
     channelState.bc.postMessage(messageJson, false);
-    return Promise.resolve();
+    return _util.PROMISE_RESOLVED_VOID;
   } catch (err) {
     return Promise.reject(err);
   }
@@ -1323,13 +1356,14 @@ exports["default"] = _default;
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.create = create;
+exports.averageResponseTime = averageResponseTime;
+exports.canBeUsed = canBeUsed;
 exports.close = close;
-exports.postMessage = postMessage;
+exports.create = create;
+exports.microSeconds = exports["default"] = void 0;
 exports.onMessage = onMessage;
-exports.canBeUsed = canBeUsed;
-exports.averageResponseTime = averageResponseTime;
-exports["default"] = exports.type = exports.microSeconds = void 0;
+exports.postMessage = postMessage;
+exports.type = void 0;
 
 var _util = require("../util");
 
@@ -1432,12 +1466,12 @@ function fillOptionsWithDefaults() {
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
+exports.isNode = exports.PROMISE_RESOLVED_VOID = exports.PROMISE_RESOLVED_FALSE = exports.PROMISE_REJECTED = void 0;
 exports.isPromise = isPromise;
-exports.sleep = sleep;
+exports.microSeconds = microSeconds;
 exports.randomInt = randomInt;
 exports.randomToken = randomToken;
-exports.microSeconds = microSeconds;
-exports.isNode = void 0;
+exports.sleep = sleep;
 
 /**
  * returns true if the given object is a promise
@@ -1450,6 +1484,13 @@ function isPromise(obj) {
   }
 }
 
+var PROMISE_RESOLVED_FALSE = Promise.resolve(false);
+exports.PROMISE_RESOLVED_FALSE = PROMISE_RESOLVED_FALSE;
+var PROMISE_RESOLVED_VOID = Promise.resolve();
+exports.PROMISE_RESOLVED_VOID = PROMISE_RESOLVED_VOID;
+var PROMISE_REJECTED = Promise.reject(new Error());
+exports.PROMISE_REJECTED = PROMISE_REJECTED;
+
 function sleep(time) {
   if (!time) time = 0;
   return new Promise(function (res) {
diff --git a/docs/iframe.js b/docs/iframe.js
index 5b28b68c..2882b315 100644
--- a/docs/iframe.js
+++ b/docs/iframe.js
@@ -4,9 +4,9 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
+exports.BroadcastChannel = void 0;
 exports.clearNodeFolder = clearNodeFolder;
 exports.enforceOptions = enforceOptions;
-exports.BroadcastChannel = void 0;
 
 var _util = require("./util.js");
 
@@ -86,7 +86,7 @@ function clearNodeFolder(options) {
       return true;
     });
   } else {
-    return Promise.resolve(false);
+    return _util.PROMISE_RESOLVED_FALSE;
   }
 }
 /**
@@ -156,7 +156,7 @@ BroadcastChannel.prototype = {
     }
 
     this.closed = true;
-    var awaitPrepare = this._prepP ? this._prepP : Promise.resolve();
+    var awaitPrepare = this._prepP ? this._prepP : _util.PROMISE_RESOLVED_VOID;
     this._onML = null;
     this._addEL.message = [];
     return awaitPrepare // wait until all current sending are processed
@@ -194,7 +194,7 @@ function _post(broadcastChannel, type, msg) {
     type: type,
     data: msg
   };
-  var awaitPrepare = broadcastChannel._prepP ? broadcastChannel._prepP : Promise.resolve();
+  var awaitPrepare = broadcastChannel._prepP ? broadcastChannel._prepP : _util.PROMISE_RESOLVED_VOID;
   return awaitPrepare.then(function () {
     var sendPromise = broadcastChannel.method.postMessage(broadcastChannel._state, msgObj); // add/remove to unsend messages list
 
@@ -310,16 +310,16 @@ Object.defineProperty(exports, "BroadcastChannel", {
     return _broadcastChannel.BroadcastChannel;
   }
 });
-Object.defineProperty(exports, "clearNodeFolder", {
+Object.defineProperty(exports, "beLeader", {
   enumerable: true,
   get: function get() {
-    return _broadcastChannel.clearNodeFolder;
+    return _leaderElection.beLeader;
   }
 });
-Object.defineProperty(exports, "enforceOptions", {
+Object.defineProperty(exports, "clearNodeFolder", {
   enumerable: true,
   get: function get() {
-    return _broadcastChannel.enforceOptions;
+    return _broadcastChannel.clearNodeFolder;
   }
 });
 Object.defineProperty(exports, "createLeaderElection", {
@@ -328,10 +328,10 @@ Object.defineProperty(exports, "createLeaderElection", {
     return _leaderElection.createLeaderElection;
   }
 });
-Object.defineProperty(exports, "beLeader", {
+Object.defineProperty(exports, "enforceOptions", {
   enumerable: true,
   get: function get() {
-    return _leaderElection.beLeader;
+    return _broadcastChannel.enforceOptions;
   }
 });
 
@@ -353,10 +353,11 @@ var _util = require("./util.js");
 
 var _unload = _interopRequireDefault(require("unload"));
 
-var LeaderElection = function LeaderElection(channel, options) {
-  this._channel = channel;
+var LeaderElection = function LeaderElection(broadcastChannel, options) {
+  this.broadcastChannel = broadcastChannel;
   this._options = options;
   this.isLeader = false;
+  this.hasLeader = false;
   this.isDead = false;
   this.token = (0, _util.randomToken)();
   this._isApl = false; // _isApplying
@@ -379,12 +380,18 @@ LeaderElection.prototype = {
   applyOnce: function applyOnce() {
     var _this = this;
 
-    if (this.isLeader) return Promise.resolve(false);
-    if (this.isDead) return Promise.resolve(false); // do nothing if already running
+    if (this.isLeader) {
+      return _util.PROMISE_RESOLVED_FALSE;
+    }
+
+    if (this.isDead) {
+      return _util.PROMISE_RESOLVED_FALSE;
+    } // do nothing if already running
+
 
     if (this._isApl) {
       this._reApply = true;
-      return Promise.resolve(false);
+      return _util.PROMISE_RESOLVED_FALSE;
     }
 
     this._isApl = true;
@@ -406,23 +413,32 @@ LeaderElection.prototype = {
         if (msg.action === 'tell') {
           // other is already leader
           stopCriteria = true;
+          _this.hasLeader = true;
         }
       }
     };
 
-    this._channel.addEventListener('internal', handleMessage);
+    this.broadcastChannel.addEventListener('internal', handleMessage);
 
     var ret = _sendMessage(this, 'apply') // send out that this one is applying
     .then(function () {
       return (0, _util.sleep)(_this._options.responseTime);
     }) // let others time to respond
     .then(function () {
-      if (stopCriteria) return Promise.reject(new Error());else return _sendMessage(_this, 'apply');
+      if (stopCriteria) {
+        return _util.PROMISE_REJECTED;
+      } else {
+        return _sendMessage(_this, 'apply');
+      }
     }).then(function () {
       return (0, _util.sleep)(_this._options.responseTime);
     }) // let others time to respond
     .then(function () {
-      if (stopCriteria) return Promise.reject(new Error());else return _sendMessage(_this);
+      if (stopCriteria) {
+        return _util.PROMISE_REJECTED;
+      } else {
+        return _sendMessage(_this);
+      }
     }).then(function () {
       return beLeader(_this);
     }) // no one disagreed -> this one is now leader
@@ -432,7 +448,7 @@ LeaderElection.prototype = {
       return false;
     }) // apply not successfull
     .then(function (success) {
-      _this._channel.removeEventListener('internal', handleMessage);
+      _this.broadcastChannel.removeEventListener('internal', handleMessage);
 
       _this._isApl = false;
 
@@ -461,11 +477,15 @@ LeaderElection.prototype = {
   die: function die() {
     var _this2 = this;
 
-    if (this.isDead) return;
+    if (this.isDead || !this.isLeader) {
+      return;
+    }
+
+    this.hasLeader = false;
     this.isDead = true;
 
     this._lstns.forEach(function (listener) {
-      return _this2._channel.removeEventListener('internal', listener);
+      return _this2.broadcastChannel.removeEventListener('internal', listener);
     });
 
     this._invs.forEach(function (interval) {
@@ -479,9 +499,15 @@ LeaderElection.prototype = {
     return _sendMessage(this, 'death');
   }
 };
+/**
+ * @param leaderElector {LeaderElector}
+ */
 
 function _awaitLeadershipOnce(leaderElector) {
-  if (leaderElector.isLeader) return Promise.resolve();
+  if (leaderElector.isLeader) {
+    return _util.PROMISE_RESOLVED_VOID;
+  }
+
   return new Promise(function (res) {
     var resolved = false;
 
@@ -492,9 +518,7 @@ function _awaitLeadershipOnce(leaderElector) {
 
       resolved = true;
       clearInterval(interval);
-
-      leaderElector._channel.removeEventListener('internal', whenDeathListener);
-
+      leaderElector.broadcastChannel.removeEventListener('internal', whenDeathListener);
       res(true);
     } // try once now
 
@@ -518,13 +542,16 @@ function _awaitLeadershipOnce(leaderElector) {
 
     var whenDeathListener = function whenDeathListener(msg) {
       if (msg.context === 'leader' && msg.action === 'death') {
+        leaderElector.hasLeader = false;
         leaderElector.applyOnce().then(function () {
-          if (leaderElector.isLeader) finish();
+          if (leaderElector.isLeader) {
+            finish();
+          }
         });
       }
     };
 
-    leaderElector._channel.addEventListener('internal', whenDeathListener);
+    leaderElector.broadcastChannel.addEventListener('internal', whenDeathListener);
 
     leaderElector._lstns.push(whenDeathListener);
   });
@@ -540,11 +567,12 @@ function _sendMessage(leaderElector, action) {
     action: action,
     token: leaderElector.token
   };
-  return leaderElector._channel.postInternal(msgJson);
+  return leaderElector.broadcastChannel.postInternal(msgJson);
 }
 
 function beLeader(leaderElector) {
   leaderElector.isLeader = true;
+  leaderElector.hasLeader = true;
 
   var unloadFn = _unload["default"].add(function () {
     return leaderElector.die();
@@ -576,7 +604,7 @@ function beLeader(leaderElector) {
     }
   };
 
-  leaderElector._channel.addEventListener('internal', isLeaderListener);
+  leaderElector.broadcastChannel.addEventListener('internal', isLeaderListener);
 
   leaderElector._lstns.push(isLeaderListener);
 
@@ -687,21 +715,23 @@ function chooseMethod(options) {
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.getIdb = getIdb;
+exports.averageResponseTime = averageResponseTime;
+exports.canBeUsed = canBeUsed;
+exports.cleanOldMessages = cleanOldMessages;
+exports.close = close;
+exports.create = create;
 exports.createDatabase = createDatabase;
-exports.writeMessage = writeMessage;
+exports["default"] = void 0;
 exports.getAllMessages = getAllMessages;
+exports.getIdb = getIdb;
 exports.getMessagesHigherThan = getMessagesHigherThan;
-exports.removeMessageById = removeMessageById;
 exports.getOldMessages = getOldMessages;
-exports.cleanOldMessages = cleanOldMessages;
-exports.create = create;
-exports.close = close;
-exports.postMessage = postMessage;
+exports.microSeconds = void 0;
 exports.onMessage = onMessage;
-exports.canBeUsed = canBeUsed;
-exports.averageResponseTime = averageResponseTime;
-exports["default"] = exports.type = exports.microSeconds = void 0;
+exports.postMessage = postMessage;
+exports.removeMessageById = removeMessageById;
+exports.type = void 0;
+exports.writeMessage = writeMessage;
 
 var _util = require("../util.js");
 
@@ -899,7 +929,7 @@ function create(channelName, options) {
        */
       eMIs: new _obliviousSet.ObliviousSet(options.idb.ttl * 2),
       // ensures we do not read messages in parrallel
-      writeBlockPromise: Promise.resolve(),
+      writeBlockPromise: _util.PROMISE_RESOLVED_VOID,
       messagesCallback: null,
       readQueuePromises: [],
       db: db
@@ -953,9 +983,9 @@ function _filterMessage(msgObj, state) {
 
 function readNewMessages(state) {
   // channel already closed
-  if (state.closed) return Promise.resolve(); // if no one is listening, we do not need to scan for new messages
+  if (state.closed) return _util.PROMISE_RESOLVED_VOID; // if no one is listening, we do not need to scan for new messages
 
-  if (!state.messagesCallback) return Promise.resolve();
+  if (!state.messagesCallback) return _util.PROMISE_RESOLVED_VOID;
   return getMessagesHigherThan(state.db, state.lastCursorId).then(function (newerMessages) {
     var useMessages = newerMessages
     /**
@@ -983,7 +1013,7 @@ function readNewMessages(state) {
         state.messagesCallback(msgObj.data);
       }
     });
-    return Promise.resolve();
+    return _util.PROMISE_RESOLVED_VOID;
   });
 }
 
@@ -1038,17 +1068,19 @@ exports["default"] = _default;
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.getLocalStorage = getLocalStorage;
-exports.storageKey = storageKey;
-exports.postMessage = postMessage;
 exports.addStorageEventListener = addStorageEventListener;
-exports.removeStorageEventListener = removeStorageEventListener;
-exports.create = create;
+exports.averageResponseTime = averageResponseTime;
+exports.canBeUsed = canBeUsed;
 exports.close = close;
+exports.create = create;
+exports["default"] = void 0;
+exports.getLocalStorage = getLocalStorage;
+exports.microSeconds = void 0;
 exports.onMessage = onMessage;
-exports.canBeUsed = canBeUsed;
-exports.averageResponseTime = averageResponseTime;
-exports["default"] = exports.type = exports.microSeconds = void 0;
+exports.postMessage = postMessage;
+exports.removeStorageEventListener = removeStorageEventListener;
+exports.storageKey = storageKey;
+exports.type = void 0;
 
 var _obliviousSet = require("oblivious-set");
 
@@ -1236,13 +1268,14 @@ exports["default"] = _default;
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.create = create;
+exports.averageResponseTime = averageResponseTime;
+exports.canBeUsed = canBeUsed;
 exports.close = close;
-exports.postMessage = postMessage;
+exports.create = create;
+exports.microSeconds = exports["default"] = void 0;
 exports.onMessage = onMessage;
-exports.canBeUsed = canBeUsed;
-exports.averageResponseTime = averageResponseTime;
-exports["default"] = exports.type = exports.microSeconds = void 0;
+exports.postMessage = postMessage;
+exports.type = void 0;
 
 var _util = require("../util");
 
@@ -1276,7 +1309,7 @@ function close(channelState) {
 function postMessage(channelState, messageJson) {
   try {
     channelState.bc.postMessage(messageJson, false);
-    return Promise.resolve();
+    return _util.PROMISE_RESOLVED_VOID;
   } catch (err) {
     return Promise.reject(err);
   }
@@ -1323,13 +1356,14 @@ exports["default"] = _default;
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.create = create;
+exports.averageResponseTime = averageResponseTime;
+exports.canBeUsed = canBeUsed;
 exports.close = close;
-exports.postMessage = postMessage;
+exports.create = create;
+exports.microSeconds = exports["default"] = void 0;
 exports.onMessage = onMessage;
-exports.canBeUsed = canBeUsed;
-exports.averageResponseTime = averageResponseTime;
-exports["default"] = exports.type = exports.microSeconds = void 0;
+exports.postMessage = postMessage;
+exports.type = void 0;
 
 var _util = require("../util");
 
@@ -1432,12 +1466,12 @@ function fillOptionsWithDefaults() {
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
+exports.isNode = exports.PROMISE_RESOLVED_VOID = exports.PROMISE_RESOLVED_FALSE = exports.PROMISE_REJECTED = void 0;
 exports.isPromise = isPromise;
-exports.sleep = sleep;
+exports.microSeconds = microSeconds;
 exports.randomInt = randomInt;
 exports.randomToken = randomToken;
-exports.microSeconds = microSeconds;
-exports.isNode = void 0;
+exports.sleep = sleep;
 
 /**
  * returns true if the given object is a promise
@@ -1450,6 +1484,13 @@ function isPromise(obj) {
   }
 }
 
+var PROMISE_RESOLVED_FALSE = Promise.resolve(false);
+exports.PROMISE_RESOLVED_FALSE = PROMISE_RESOLVED_FALSE;
+var PROMISE_RESOLVED_VOID = Promise.resolve();
+exports.PROMISE_RESOLVED_VOID = PROMISE_RESOLVED_VOID;
+var PROMISE_REJECTED = Promise.reject(new Error());
+exports.PROMISE_REJECTED = PROMISE_REJECTED;
+
 function sleep(time) {
   if (!time) time = 0;
   return new Promise(function (res) {
diff --git a/docs/index.js b/docs/index.js
index 11a78067..889790ac 100644
--- a/docs/index.js
+++ b/docs/index.js
@@ -4,9 +4,9 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
+exports.BroadcastChannel = void 0;
 exports.clearNodeFolder = clearNodeFolder;
 exports.enforceOptions = enforceOptions;
-exports.BroadcastChannel = void 0;
 
 var _util = require("./util.js");
 
@@ -86,7 +86,7 @@ function clearNodeFolder(options) {
       return true;
     });
   } else {
-    return Promise.resolve(false);
+    return _util.PROMISE_RESOLVED_FALSE;
   }
 }
 /**
@@ -156,7 +156,7 @@ BroadcastChannel.prototype = {
     }
 
     this.closed = true;
-    var awaitPrepare = this._prepP ? this._prepP : Promise.resolve();
+    var awaitPrepare = this._prepP ? this._prepP : _util.PROMISE_RESOLVED_VOID;
     this._onML = null;
     this._addEL.message = [];
     return awaitPrepare // wait until all current sending are processed
@@ -194,7 +194,7 @@ function _post(broadcastChannel, type, msg) {
     type: type,
     data: msg
   };
-  var awaitPrepare = broadcastChannel._prepP ? broadcastChannel._prepP : Promise.resolve();
+  var awaitPrepare = broadcastChannel._prepP ? broadcastChannel._prepP : _util.PROMISE_RESOLVED_VOID;
   return awaitPrepare.then(function () {
     var sendPromise = broadcastChannel.method.postMessage(broadcastChannel._state, msgObj); // add/remove to unsend messages list
 
@@ -310,16 +310,16 @@ Object.defineProperty(exports, "BroadcastChannel", {
     return _broadcastChannel.BroadcastChannel;
   }
 });
-Object.defineProperty(exports, "clearNodeFolder", {
+Object.defineProperty(exports, "beLeader", {
   enumerable: true,
   get: function get() {
-    return _broadcastChannel.clearNodeFolder;
+    return _leaderElection.beLeader;
   }
 });
-Object.defineProperty(exports, "enforceOptions", {
+Object.defineProperty(exports, "clearNodeFolder", {
   enumerable: true,
   get: function get() {
-    return _broadcastChannel.enforceOptions;
+    return _broadcastChannel.clearNodeFolder;
   }
 });
 Object.defineProperty(exports, "createLeaderElection", {
@@ -328,10 +328,10 @@ Object.defineProperty(exports, "createLeaderElection", {
     return _leaderElection.createLeaderElection;
   }
 });
-Object.defineProperty(exports, "beLeader", {
+Object.defineProperty(exports, "enforceOptions", {
   enumerable: true,
   get: function get() {
-    return _leaderElection.beLeader;
+    return _broadcastChannel.enforceOptions;
   }
 });
 
@@ -353,10 +353,11 @@ var _util = require("./util.js");
 
 var _unload = _interopRequireDefault(require("unload"));
 
-var LeaderElection = function LeaderElection(channel, options) {
-  this._channel = channel;
+var LeaderElection = function LeaderElection(broadcastChannel, options) {
+  this.broadcastChannel = broadcastChannel;
   this._options = options;
   this.isLeader = false;
+  this.hasLeader = false;
   this.isDead = false;
   this.token = (0, _util.randomToken)();
   this._isApl = false; // _isApplying
@@ -379,12 +380,18 @@ LeaderElection.prototype = {
   applyOnce: function applyOnce() {
     var _this = this;
 
-    if (this.isLeader) return Promise.resolve(false);
-    if (this.isDead) return Promise.resolve(false); // do nothing if already running
+    if (this.isLeader) {
+      return _util.PROMISE_RESOLVED_FALSE;
+    }
+
+    if (this.isDead) {
+      return _util.PROMISE_RESOLVED_FALSE;
+    } // do nothing if already running
+
 
     if (this._isApl) {
       this._reApply = true;
-      return Promise.resolve(false);
+      return _util.PROMISE_RESOLVED_FALSE;
     }
 
     this._isApl = true;
@@ -406,23 +413,32 @@ LeaderElection.prototype = {
         if (msg.action === 'tell') {
           // other is already leader
           stopCriteria = true;
+          _this.hasLeader = true;
         }
       }
     };
 
-    this._channel.addEventListener('internal', handleMessage);
+    this.broadcastChannel.addEventListener('internal', handleMessage);
 
     var ret = _sendMessage(this, 'apply') // send out that this one is applying
     .then(function () {
       return (0, _util.sleep)(_this._options.responseTime);
     }) // let others time to respond
     .then(function () {
-      if (stopCriteria) return Promise.reject(new Error());else return _sendMessage(_this, 'apply');
+      if (stopCriteria) {
+        return _util.PROMISE_REJECTED;
+      } else {
+        return _sendMessage(_this, 'apply');
+      }
     }).then(function () {
       return (0, _util.sleep)(_this._options.responseTime);
     }) // let others time to respond
     .then(function () {
-      if (stopCriteria) return Promise.reject(new Error());else return _sendMessage(_this);
+      if (stopCriteria) {
+        return _util.PROMISE_REJECTED;
+      } else {
+        return _sendMessage(_this);
+      }
     }).then(function () {
       return beLeader(_this);
     }) // no one disagreed -> this one is now leader
@@ -432,7 +448,7 @@ LeaderElection.prototype = {
       return false;
     }) // apply not successfull
     .then(function (success) {
-      _this._channel.removeEventListener('internal', handleMessage);
+      _this.broadcastChannel.removeEventListener('internal', handleMessage);
 
       _this._isApl = false;
 
@@ -461,11 +477,15 @@ LeaderElection.prototype = {
   die: function die() {
     var _this2 = this;
 
-    if (this.isDead) return;
+    if (this.isDead || !this.isLeader) {
+      return;
+    }
+
+    this.hasLeader = false;
     this.isDead = true;
 
     this._lstns.forEach(function (listener) {
-      return _this2._channel.removeEventListener('internal', listener);
+      return _this2.broadcastChannel.removeEventListener('internal', listener);
     });
 
     this._invs.forEach(function (interval) {
@@ -479,9 +499,15 @@ LeaderElection.prototype = {
     return _sendMessage(this, 'death');
   }
 };
+/**
+ * @param leaderElector {LeaderElector}
+ */
 
 function _awaitLeadershipOnce(leaderElector) {
-  if (leaderElector.isLeader) return Promise.resolve();
+  if (leaderElector.isLeader) {
+    return _util.PROMISE_RESOLVED_VOID;
+  }
+
   return new Promise(function (res) {
     var resolved = false;
 
@@ -492,9 +518,7 @@ function _awaitLeadershipOnce(leaderElector) {
 
       resolved = true;
       clearInterval(interval);
-
-      leaderElector._channel.removeEventListener('internal', whenDeathListener);
-
+      leaderElector.broadcastChannel.removeEventListener('internal', whenDeathListener);
       res(true);
     } // try once now
 
@@ -518,13 +542,16 @@ function _awaitLeadershipOnce(leaderElector) {
 
     var whenDeathListener = function whenDeathListener(msg) {
       if (msg.context === 'leader' && msg.action === 'death') {
+        leaderElector.hasLeader = false;
         leaderElector.applyOnce().then(function () {
-          if (leaderElector.isLeader) finish();
+          if (leaderElector.isLeader) {
+            finish();
+          }
         });
       }
     };
 
-    leaderElector._channel.addEventListener('internal', whenDeathListener);
+    leaderElector.broadcastChannel.addEventListener('internal', whenDeathListener);
 
     leaderElector._lstns.push(whenDeathListener);
   });
@@ -540,11 +567,12 @@ function _sendMessage(leaderElector, action) {
     action: action,
     token: leaderElector.token
   };
-  return leaderElector._channel.postInternal(msgJson);
+  return leaderElector.broadcastChannel.postInternal(msgJson);
 }
 
 function beLeader(leaderElector) {
   leaderElector.isLeader = true;
+  leaderElector.hasLeader = true;
 
   var unloadFn = _unload["default"].add(function () {
     return leaderElector.die();
@@ -576,7 +604,7 @@ function beLeader(leaderElector) {
     }
   };
 
-  leaderElector._channel.addEventListener('internal', isLeaderListener);
+  leaderElector.broadcastChannel.addEventListener('internal', isLeaderListener);
 
   leaderElector._lstns.push(isLeaderListener);
 
@@ -687,21 +715,23 @@ function chooseMethod(options) {
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.getIdb = getIdb;
+exports.averageResponseTime = averageResponseTime;
+exports.canBeUsed = canBeUsed;
+exports.cleanOldMessages = cleanOldMessages;
+exports.close = close;
+exports.create = create;
 exports.createDatabase = createDatabase;
-exports.writeMessage = writeMessage;
+exports["default"] = void 0;
 exports.getAllMessages = getAllMessages;
+exports.getIdb = getIdb;
 exports.getMessagesHigherThan = getMessagesHigherThan;
-exports.removeMessageById = removeMessageById;
 exports.getOldMessages = getOldMessages;
-exports.cleanOldMessages = cleanOldMessages;
-exports.create = create;
-exports.close = close;
-exports.postMessage = postMessage;
+exports.microSeconds = void 0;
 exports.onMessage = onMessage;
-exports.canBeUsed = canBeUsed;
-exports.averageResponseTime = averageResponseTime;
-exports["default"] = exports.type = exports.microSeconds = void 0;
+exports.postMessage = postMessage;
+exports.removeMessageById = removeMessageById;
+exports.type = void 0;
+exports.writeMessage = writeMessage;
 
 var _util = require("../util.js");
 
@@ -899,7 +929,7 @@ function create(channelName, options) {
        */
       eMIs: new _obliviousSet.ObliviousSet(options.idb.ttl * 2),
       // ensures we do not read messages in parrallel
-      writeBlockPromise: Promise.resolve(),
+      writeBlockPromise: _util.PROMISE_RESOLVED_VOID,
       messagesCallback: null,
       readQueuePromises: [],
       db: db
@@ -953,9 +983,9 @@ function _filterMessage(msgObj, state) {
 
 function readNewMessages(state) {
   // channel already closed
-  if (state.closed) return Promise.resolve(); // if no one is listening, we do not need to scan for new messages
+  if (state.closed) return _util.PROMISE_RESOLVED_VOID; // if no one is listening, we do not need to scan for new messages
 
-  if (!state.messagesCallback) return Promise.resolve();
+  if (!state.messagesCallback) return _util.PROMISE_RESOLVED_VOID;
   return getMessagesHigherThan(state.db, state.lastCursorId).then(function (newerMessages) {
     var useMessages = newerMessages
     /**
@@ -983,7 +1013,7 @@ function readNewMessages(state) {
         state.messagesCallback(msgObj.data);
       }
     });
-    return Promise.resolve();
+    return _util.PROMISE_RESOLVED_VOID;
   });
 }
 
@@ -1038,17 +1068,19 @@ exports["default"] = _default;
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.getLocalStorage = getLocalStorage;
-exports.storageKey = storageKey;
-exports.postMessage = postMessage;
 exports.addStorageEventListener = addStorageEventListener;
-exports.removeStorageEventListener = removeStorageEventListener;
-exports.create = create;
+exports.averageResponseTime = averageResponseTime;
+exports.canBeUsed = canBeUsed;
 exports.close = close;
+exports.create = create;
+exports["default"] = void 0;
+exports.getLocalStorage = getLocalStorage;
+exports.microSeconds = void 0;
 exports.onMessage = onMessage;
-exports.canBeUsed = canBeUsed;
-exports.averageResponseTime = averageResponseTime;
-exports["default"] = exports.type = exports.microSeconds = void 0;
+exports.postMessage = postMessage;
+exports.removeStorageEventListener = removeStorageEventListener;
+exports.storageKey = storageKey;
+exports.type = void 0;
 
 var _obliviousSet = require("oblivious-set");
 
@@ -1236,13 +1268,14 @@ exports["default"] = _default;
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.create = create;
+exports.averageResponseTime = averageResponseTime;
+exports.canBeUsed = canBeUsed;
 exports.close = close;
-exports.postMessage = postMessage;
+exports.create = create;
+exports.microSeconds = exports["default"] = void 0;
 exports.onMessage = onMessage;
-exports.canBeUsed = canBeUsed;
-exports.averageResponseTime = averageResponseTime;
-exports["default"] = exports.type = exports.microSeconds = void 0;
+exports.postMessage = postMessage;
+exports.type = void 0;
 
 var _util = require("../util");
 
@@ -1276,7 +1309,7 @@ function close(channelState) {
 function postMessage(channelState, messageJson) {
   try {
     channelState.bc.postMessage(messageJson, false);
-    return Promise.resolve();
+    return _util.PROMISE_RESOLVED_VOID;
   } catch (err) {
     return Promise.reject(err);
   }
@@ -1323,13 +1356,14 @@ exports["default"] = _default;
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.create = create;
+exports.averageResponseTime = averageResponseTime;
+exports.canBeUsed = canBeUsed;
 exports.close = close;
-exports.postMessage = postMessage;
+exports.create = create;
+exports.microSeconds = exports["default"] = void 0;
 exports.onMessage = onMessage;
-exports.canBeUsed = canBeUsed;
-exports.averageResponseTime = averageResponseTime;
-exports["default"] = exports.type = exports.microSeconds = void 0;
+exports.postMessage = postMessage;
+exports.type = void 0;
 
 var _util = require("../util");
 
@@ -1432,12 +1466,12 @@ function fillOptionsWithDefaults() {
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
+exports.isNode = exports.PROMISE_RESOLVED_VOID = exports.PROMISE_RESOLVED_FALSE = exports.PROMISE_REJECTED = void 0;
 exports.isPromise = isPromise;
-exports.sleep = sleep;
+exports.microSeconds = microSeconds;
 exports.randomInt = randomInt;
 exports.randomToken = randomToken;
-exports.microSeconds = microSeconds;
-exports.isNode = void 0;
+exports.sleep = sleep;
 
 /**
  * returns true if the given object is a promise
@@ -1450,6 +1484,13 @@ function isPromise(obj) {
   }
 }
 
+var PROMISE_RESOLVED_FALSE = Promise.resolve(false);
+exports.PROMISE_RESOLVED_FALSE = PROMISE_RESOLVED_FALSE;
+var PROMISE_RESOLVED_VOID = Promise.resolve();
+exports.PROMISE_RESOLVED_VOID = PROMISE_RESOLVED_VOID;
+var PROMISE_REJECTED = Promise.reject(new Error());
+exports.PROMISE_REJECTED = PROMISE_REJECTED;
+
 function sleep(time) {
   if (!time) time = 0;
   return new Promise(function (res) {
diff --git a/docs/leader-iframe.js b/docs/leader-iframe.js
index 86025d43..c16eb99f 100644
--- a/docs/leader-iframe.js
+++ b/docs/leader-iframe.js
@@ -4,9 +4,9 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
+exports.BroadcastChannel = void 0;
 exports.clearNodeFolder = clearNodeFolder;
 exports.enforceOptions = enforceOptions;
-exports.BroadcastChannel = void 0;
 
 var _util = require("./util.js");
 
@@ -86,7 +86,7 @@ function clearNodeFolder(options) {
       return true;
     });
   } else {
-    return Promise.resolve(false);
+    return _util.PROMISE_RESOLVED_FALSE;
   }
 }
 /**
@@ -156,7 +156,7 @@ BroadcastChannel.prototype = {
     }
 
     this.closed = true;
-    var awaitPrepare = this._prepP ? this._prepP : Promise.resolve();
+    var awaitPrepare = this._prepP ? this._prepP : _util.PROMISE_RESOLVED_VOID;
     this._onML = null;
     this._addEL.message = [];
     return awaitPrepare // wait until all current sending are processed
@@ -194,7 +194,7 @@ function _post(broadcastChannel, type, msg) {
     type: type,
     data: msg
   };
-  var awaitPrepare = broadcastChannel._prepP ? broadcastChannel._prepP : Promise.resolve();
+  var awaitPrepare = broadcastChannel._prepP ? broadcastChannel._prepP : _util.PROMISE_RESOLVED_VOID;
   return awaitPrepare.then(function () {
     var sendPromise = broadcastChannel.method.postMessage(broadcastChannel._state, msgObj); // add/remove to unsend messages list
 
@@ -310,16 +310,16 @@ Object.defineProperty(exports, "BroadcastChannel", {
     return _broadcastChannel.BroadcastChannel;
   }
 });
-Object.defineProperty(exports, "clearNodeFolder", {
+Object.defineProperty(exports, "beLeader", {
   enumerable: true,
   get: function get() {
-    return _broadcastChannel.clearNodeFolder;
+    return _leaderElection.beLeader;
   }
 });
-Object.defineProperty(exports, "enforceOptions", {
+Object.defineProperty(exports, "clearNodeFolder", {
   enumerable: true,
   get: function get() {
-    return _broadcastChannel.enforceOptions;
+    return _broadcastChannel.clearNodeFolder;
   }
 });
 Object.defineProperty(exports, "createLeaderElection", {
@@ -328,10 +328,10 @@ Object.defineProperty(exports, "createLeaderElection", {
     return _leaderElection.createLeaderElection;
   }
 });
-Object.defineProperty(exports, "beLeader", {
+Object.defineProperty(exports, "enforceOptions", {
   enumerable: true,
   get: function get() {
-    return _leaderElection.beLeader;
+    return _broadcastChannel.enforceOptions;
   }
 });
 
@@ -353,10 +353,11 @@ var _util = require("./util.js");
 
 var _unload = _interopRequireDefault(require("unload"));
 
-var LeaderElection = function LeaderElection(channel, options) {
-  this._channel = channel;
+var LeaderElection = function LeaderElection(broadcastChannel, options) {
+  this.broadcastChannel = broadcastChannel;
   this._options = options;
   this.isLeader = false;
+  this.hasLeader = false;
   this.isDead = false;
   this.token = (0, _util.randomToken)();
   this._isApl = false; // _isApplying
@@ -379,12 +380,18 @@ LeaderElection.prototype = {
   applyOnce: function applyOnce() {
     var _this = this;
 
-    if (this.isLeader) return Promise.resolve(false);
-    if (this.isDead) return Promise.resolve(false); // do nothing if already running
+    if (this.isLeader) {
+      return _util.PROMISE_RESOLVED_FALSE;
+    }
+
+    if (this.isDead) {
+      return _util.PROMISE_RESOLVED_FALSE;
+    } // do nothing if already running
+
 
     if (this._isApl) {
       this._reApply = true;
-      return Promise.resolve(false);
+      return _util.PROMISE_RESOLVED_FALSE;
     }
 
     this._isApl = true;
@@ -406,23 +413,32 @@ LeaderElection.prototype = {
         if (msg.action === 'tell') {
           // other is already leader
           stopCriteria = true;
+          _this.hasLeader = true;
         }
       }
     };
 
-    this._channel.addEventListener('internal', handleMessage);
+    this.broadcastChannel.addEventListener('internal', handleMessage);
 
     var ret = _sendMessage(this, 'apply') // send out that this one is applying
     .then(function () {
       return (0, _util.sleep)(_this._options.responseTime);
     }) // let others time to respond
     .then(function () {
-      if (stopCriteria) return Promise.reject(new Error());else return _sendMessage(_this, 'apply');
+      if (stopCriteria) {
+        return _util.PROMISE_REJECTED;
+      } else {
+        return _sendMessage(_this, 'apply');
+      }
     }).then(function () {
       return (0, _util.sleep)(_this._options.responseTime);
     }) // let others time to respond
     .then(function () {
-      if (stopCriteria) return Promise.reject(new Error());else return _sendMessage(_this);
+      if (stopCriteria) {
+        return _util.PROMISE_REJECTED;
+      } else {
+        return _sendMessage(_this);
+      }
     }).then(function () {
       return beLeader(_this);
     }) // no one disagreed -> this one is now leader
@@ -432,7 +448,7 @@ LeaderElection.prototype = {
       return false;
     }) // apply not successfull
     .then(function (success) {
-      _this._channel.removeEventListener('internal', handleMessage);
+      _this.broadcastChannel.removeEventListener('internal', handleMessage);
 
       _this._isApl = false;
 
@@ -461,11 +477,15 @@ LeaderElection.prototype = {
   die: function die() {
     var _this2 = this;
 
-    if (this.isDead) return;
+    if (this.isDead || !this.isLeader) {
+      return;
+    }
+
+    this.hasLeader = false;
     this.isDead = true;
 
     this._lstns.forEach(function (listener) {
-      return _this2._channel.removeEventListener('internal', listener);
+      return _this2.broadcastChannel.removeEventListener('internal', listener);
     });
 
     this._invs.forEach(function (interval) {
@@ -479,9 +499,15 @@ LeaderElection.prototype = {
     return _sendMessage(this, 'death');
   }
 };
+/**
+ * @param leaderElector {LeaderElector}
+ */
 
 function _awaitLeadershipOnce(leaderElector) {
-  if (leaderElector.isLeader) return Promise.resolve();
+  if (leaderElector.isLeader) {
+    return _util.PROMISE_RESOLVED_VOID;
+  }
+
   return new Promise(function (res) {
     var resolved = false;
 
@@ -492,9 +518,7 @@ function _awaitLeadershipOnce(leaderElector) {
 
       resolved = true;
       clearInterval(interval);
-
-      leaderElector._channel.removeEventListener('internal', whenDeathListener);
-
+      leaderElector.broadcastChannel.removeEventListener('internal', whenDeathListener);
       res(true);
     } // try once now
 
@@ -518,13 +542,16 @@ function _awaitLeadershipOnce(leaderElector) {
 
     var whenDeathListener = function whenDeathListener(msg) {
       if (msg.context === 'leader' && msg.action === 'death') {
+        leaderElector.hasLeader = false;
         leaderElector.applyOnce().then(function () {
-          if (leaderElector.isLeader) finish();
+          if (leaderElector.isLeader) {
+            finish();
+          }
         });
       }
     };
 
-    leaderElector._channel.addEventListener('internal', whenDeathListener);
+    leaderElector.broadcastChannel.addEventListener('internal', whenDeathListener);
 
     leaderElector._lstns.push(whenDeathListener);
   });
@@ -540,11 +567,12 @@ function _sendMessage(leaderElector, action) {
     action: action,
     token: leaderElector.token
   };
-  return leaderElector._channel.postInternal(msgJson);
+  return leaderElector.broadcastChannel.postInternal(msgJson);
 }
 
 function beLeader(leaderElector) {
   leaderElector.isLeader = true;
+  leaderElector.hasLeader = true;
 
   var unloadFn = _unload["default"].add(function () {
     return leaderElector.die();
@@ -576,7 +604,7 @@ function beLeader(leaderElector) {
     }
   };
 
-  leaderElector._channel.addEventListener('internal', isLeaderListener);
+  leaderElector.broadcastChannel.addEventListener('internal', isLeaderListener);
 
   leaderElector._lstns.push(isLeaderListener);
 
@@ -687,21 +715,23 @@ function chooseMethod(options) {
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.getIdb = getIdb;
+exports.averageResponseTime = averageResponseTime;
+exports.canBeUsed = canBeUsed;
+exports.cleanOldMessages = cleanOldMessages;
+exports.close = close;
+exports.create = create;
 exports.createDatabase = createDatabase;
-exports.writeMessage = writeMessage;
+exports["default"] = void 0;
 exports.getAllMessages = getAllMessages;
+exports.getIdb = getIdb;
 exports.getMessagesHigherThan = getMessagesHigherThan;
-exports.removeMessageById = removeMessageById;
 exports.getOldMessages = getOldMessages;
-exports.cleanOldMessages = cleanOldMessages;
-exports.create = create;
-exports.close = close;
-exports.postMessage = postMessage;
+exports.microSeconds = void 0;
 exports.onMessage = onMessage;
-exports.canBeUsed = canBeUsed;
-exports.averageResponseTime = averageResponseTime;
-exports["default"] = exports.type = exports.microSeconds = void 0;
+exports.postMessage = postMessage;
+exports.removeMessageById = removeMessageById;
+exports.type = void 0;
+exports.writeMessage = writeMessage;
 
 var _util = require("../util.js");
 
@@ -899,7 +929,7 @@ function create(channelName, options) {
        */
       eMIs: new _obliviousSet.ObliviousSet(options.idb.ttl * 2),
       // ensures we do not read messages in parrallel
-      writeBlockPromise: Promise.resolve(),
+      writeBlockPromise: _util.PROMISE_RESOLVED_VOID,
       messagesCallback: null,
       readQueuePromises: [],
       db: db
@@ -953,9 +983,9 @@ function _filterMessage(msgObj, state) {
 
 function readNewMessages(state) {
   // channel already closed
-  if (state.closed) return Promise.resolve(); // if no one is listening, we do not need to scan for new messages
+  if (state.closed) return _util.PROMISE_RESOLVED_VOID; // if no one is listening, we do not need to scan for new messages
 
-  if (!state.messagesCallback) return Promise.resolve();
+  if (!state.messagesCallback) return _util.PROMISE_RESOLVED_VOID;
   return getMessagesHigherThan(state.db, state.lastCursorId).then(function (newerMessages) {
     var useMessages = newerMessages
     /**
@@ -983,7 +1013,7 @@ function readNewMessages(state) {
         state.messagesCallback(msgObj.data);
       }
     });
-    return Promise.resolve();
+    return _util.PROMISE_RESOLVED_VOID;
   });
 }
 
@@ -1038,17 +1068,19 @@ exports["default"] = _default;
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.getLocalStorage = getLocalStorage;
-exports.storageKey = storageKey;
-exports.postMessage = postMessage;
 exports.addStorageEventListener = addStorageEventListener;
-exports.removeStorageEventListener = removeStorageEventListener;
-exports.create = create;
+exports.averageResponseTime = averageResponseTime;
+exports.canBeUsed = canBeUsed;
 exports.close = close;
+exports.create = create;
+exports["default"] = void 0;
+exports.getLocalStorage = getLocalStorage;
+exports.microSeconds = void 0;
 exports.onMessage = onMessage;
-exports.canBeUsed = canBeUsed;
-exports.averageResponseTime = averageResponseTime;
-exports["default"] = exports.type = exports.microSeconds = void 0;
+exports.postMessage = postMessage;
+exports.removeStorageEventListener = removeStorageEventListener;
+exports.storageKey = storageKey;
+exports.type = void 0;
 
 var _obliviousSet = require("oblivious-set");
 
@@ -1236,13 +1268,14 @@ exports["default"] = _default;
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.create = create;
+exports.averageResponseTime = averageResponseTime;
+exports.canBeUsed = canBeUsed;
 exports.close = close;
-exports.postMessage = postMessage;
+exports.create = create;
+exports.microSeconds = exports["default"] = void 0;
 exports.onMessage = onMessage;
-exports.canBeUsed = canBeUsed;
-exports.averageResponseTime = averageResponseTime;
-exports["default"] = exports.type = exports.microSeconds = void 0;
+exports.postMessage = postMessage;
+exports.type = void 0;
 
 var _util = require("../util");
 
@@ -1276,7 +1309,7 @@ function close(channelState) {
 function postMessage(channelState, messageJson) {
   try {
     channelState.bc.postMessage(messageJson, false);
-    return Promise.resolve();
+    return _util.PROMISE_RESOLVED_VOID;
   } catch (err) {
     return Promise.reject(err);
   }
@@ -1323,13 +1356,14 @@ exports["default"] = _default;
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.create = create;
+exports.averageResponseTime = averageResponseTime;
+exports.canBeUsed = canBeUsed;
 exports.close = close;
-exports.postMessage = postMessage;
+exports.create = create;
+exports.microSeconds = exports["default"] = void 0;
 exports.onMessage = onMessage;
-exports.canBeUsed = canBeUsed;
-exports.averageResponseTime = averageResponseTime;
-exports["default"] = exports.type = exports.microSeconds = void 0;
+exports.postMessage = postMessage;
+exports.type = void 0;
 
 var _util = require("../util");
 
@@ -1432,12 +1466,12 @@ function fillOptionsWithDefaults() {
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
+exports.isNode = exports.PROMISE_RESOLVED_VOID = exports.PROMISE_RESOLVED_FALSE = exports.PROMISE_REJECTED = void 0;
 exports.isPromise = isPromise;
-exports.sleep = sleep;
+exports.microSeconds = microSeconds;
 exports.randomInt = randomInt;
 exports.randomToken = randomToken;
-exports.microSeconds = microSeconds;
-exports.isNode = void 0;
+exports.sleep = sleep;
 
 /**
  * returns true if the given object is a promise
@@ -1450,6 +1484,13 @@ function isPromise(obj) {
   }
 }
 
+var PROMISE_RESOLVED_FALSE = Promise.resolve(false);
+exports.PROMISE_RESOLVED_FALSE = PROMISE_RESOLVED_FALSE;
+var PROMISE_RESOLVED_VOID = Promise.resolve();
+exports.PROMISE_RESOLVED_VOID = PROMISE_RESOLVED_VOID;
+var PROMISE_REJECTED = Promise.reject(new Error());
+exports.PROMISE_REJECTED = PROMISE_REJECTED;
+
 function sleep(time) {
   if (!time) time = 0;
   return new Promise(function (res) {
diff --git a/docs/worker.js b/docs/worker.js
index 55ce0128..0cdff596 100644
--- a/docs/worker.js
+++ b/docs/worker.js
@@ -4,9 +4,9 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
+exports.BroadcastChannel = void 0;
 exports.clearNodeFolder = clearNodeFolder;
 exports.enforceOptions = enforceOptions;
-exports.BroadcastChannel = void 0;
 
 var _util = require("./util.js");
 
@@ -86,7 +86,7 @@ function clearNodeFolder(options) {
       return true;
     });
   } else {
-    return Promise.resolve(false);
+    return _util.PROMISE_RESOLVED_FALSE;
   }
 }
 /**
@@ -156,7 +156,7 @@ BroadcastChannel.prototype = {
     }
 
     this.closed = true;
-    var awaitPrepare = this._prepP ? this._prepP : Promise.resolve();
+    var awaitPrepare = this._prepP ? this._prepP : _util.PROMISE_RESOLVED_VOID;
     this._onML = null;
     this._addEL.message = [];
     return awaitPrepare // wait until all current sending are processed
@@ -194,7 +194,7 @@ function _post(broadcastChannel, type, msg) {
     type: type,
     data: msg
   };
-  var awaitPrepare = broadcastChannel._prepP ? broadcastChannel._prepP : Promise.resolve();
+  var awaitPrepare = broadcastChannel._prepP ? broadcastChannel._prepP : _util.PROMISE_RESOLVED_VOID;
   return awaitPrepare.then(function () {
     var sendPromise = broadcastChannel.method.postMessage(broadcastChannel._state, msgObj); // add/remove to unsend messages list
 
@@ -310,16 +310,16 @@ Object.defineProperty(exports, "BroadcastChannel", {
     return _broadcastChannel.BroadcastChannel;
   }
 });
-Object.defineProperty(exports, "clearNodeFolder", {
+Object.defineProperty(exports, "beLeader", {
   enumerable: true,
   get: function get() {
-    return _broadcastChannel.clearNodeFolder;
+    return _leaderElection.beLeader;
   }
 });
-Object.defineProperty(exports, "enforceOptions", {
+Object.defineProperty(exports, "clearNodeFolder", {
   enumerable: true,
   get: function get() {
-    return _broadcastChannel.enforceOptions;
+    return _broadcastChannel.clearNodeFolder;
   }
 });
 Object.defineProperty(exports, "createLeaderElection", {
@@ -328,10 +328,10 @@ Object.defineProperty(exports, "createLeaderElection", {
     return _leaderElection.createLeaderElection;
   }
 });
-Object.defineProperty(exports, "beLeader", {
+Object.defineProperty(exports, "enforceOptions", {
   enumerable: true,
   get: function get() {
-    return _leaderElection.beLeader;
+    return _broadcastChannel.enforceOptions;
   }
 });
 
@@ -353,10 +353,11 @@ var _util = require("./util.js");
 
 var _unload = _interopRequireDefault(require("unload"));
 
-var LeaderElection = function LeaderElection(channel, options) {
-  this._channel = channel;
+var LeaderElection = function LeaderElection(broadcastChannel, options) {
+  this.broadcastChannel = broadcastChannel;
   this._options = options;
   this.isLeader = false;
+  this.hasLeader = false;
   this.isDead = false;
   this.token = (0, _util.randomToken)();
   this._isApl = false; // _isApplying
@@ -379,12 +380,18 @@ LeaderElection.prototype = {
   applyOnce: function applyOnce() {
     var _this = this;
 
-    if (this.isLeader) return Promise.resolve(false);
-    if (this.isDead) return Promise.resolve(false); // do nothing if already running
+    if (this.isLeader) {
+      return _util.PROMISE_RESOLVED_FALSE;
+    }
+
+    if (this.isDead) {
+      return _util.PROMISE_RESOLVED_FALSE;
+    } // do nothing if already running
+
 
     if (this._isApl) {
       this._reApply = true;
-      return Promise.resolve(false);
+      return _util.PROMISE_RESOLVED_FALSE;
     }
 
     this._isApl = true;
@@ -406,23 +413,32 @@ LeaderElection.prototype = {
         if (msg.action === 'tell') {
           // other is already leader
           stopCriteria = true;
+          _this.hasLeader = true;
         }
       }
     };
 
-    this._channel.addEventListener('internal', handleMessage);
+    this.broadcastChannel.addEventListener('internal', handleMessage);
 
     var ret = _sendMessage(this, 'apply') // send out that this one is applying
     .then(function () {
       return (0, _util.sleep)(_this._options.responseTime);
     }) // let others time to respond
     .then(function () {
-      if (stopCriteria) return Promise.reject(new Error());else return _sendMessage(_this, 'apply');
+      if (stopCriteria) {
+        return _util.PROMISE_REJECTED;
+      } else {
+        return _sendMessage(_this, 'apply');
+      }
     }).then(function () {
       return (0, _util.sleep)(_this._options.responseTime);
     }) // let others time to respond
     .then(function () {
-      if (stopCriteria) return Promise.reject(new Error());else return _sendMessage(_this);
+      if (stopCriteria) {
+        return _util.PROMISE_REJECTED;
+      } else {
+        return _sendMessage(_this);
+      }
     }).then(function () {
       return beLeader(_this);
     }) // no one disagreed -> this one is now leader
@@ -432,7 +448,7 @@ LeaderElection.prototype = {
       return false;
     }) // apply not successfull
     .then(function (success) {
-      _this._channel.removeEventListener('internal', handleMessage);
+      _this.broadcastChannel.removeEventListener('internal', handleMessage);
 
       _this._isApl = false;
 
@@ -461,11 +477,15 @@ LeaderElection.prototype = {
   die: function die() {
     var _this2 = this;
 
-    if (this.isDead) return;
+    if (this.isDead || !this.isLeader) {
+      return;
+    }
+
+    this.hasLeader = false;
     this.isDead = true;
 
     this._lstns.forEach(function (listener) {
-      return _this2._channel.removeEventListener('internal', listener);
+      return _this2.broadcastChannel.removeEventListener('internal', listener);
     });
 
     this._invs.forEach(function (interval) {
@@ -479,9 +499,15 @@ LeaderElection.prototype = {
     return _sendMessage(this, 'death');
   }
 };
+/**
+ * @param leaderElector {LeaderElector}
+ */
 
 function _awaitLeadershipOnce(leaderElector) {
-  if (leaderElector.isLeader) return Promise.resolve();
+  if (leaderElector.isLeader) {
+    return _util.PROMISE_RESOLVED_VOID;
+  }
+
   return new Promise(function (res) {
     var resolved = false;
 
@@ -492,9 +518,7 @@ function _awaitLeadershipOnce(leaderElector) {
 
       resolved = true;
       clearInterval(interval);
-
-      leaderElector._channel.removeEventListener('internal', whenDeathListener);
-
+      leaderElector.broadcastChannel.removeEventListener('internal', whenDeathListener);
       res(true);
     } // try once now
 
@@ -518,13 +542,16 @@ function _awaitLeadershipOnce(leaderElector) {
 
     var whenDeathListener = function whenDeathListener(msg) {
       if (msg.context === 'leader' && msg.action === 'death') {
+        leaderElector.hasLeader = false;
         leaderElector.applyOnce().then(function () {
-          if (leaderElector.isLeader) finish();
+          if (leaderElector.isLeader) {
+            finish();
+          }
         });
       }
     };
 
-    leaderElector._channel.addEventListener('internal', whenDeathListener);
+    leaderElector.broadcastChannel.addEventListener('internal', whenDeathListener);
 
     leaderElector._lstns.push(whenDeathListener);
   });
@@ -540,11 +567,12 @@ function _sendMessage(leaderElector, action) {
     action: action,
     token: leaderElector.token
   };
-  return leaderElector._channel.postInternal(msgJson);
+  return leaderElector.broadcastChannel.postInternal(msgJson);
 }
 
 function beLeader(leaderElector) {
   leaderElector.isLeader = true;
+  leaderElector.hasLeader = true;
 
   var unloadFn = _unload["default"].add(function () {
     return leaderElector.die();
@@ -576,7 +604,7 @@ function beLeader(leaderElector) {
     }
   };
 
-  leaderElector._channel.addEventListener('internal', isLeaderListener);
+  leaderElector.broadcastChannel.addEventListener('internal', isLeaderListener);
 
   leaderElector._lstns.push(isLeaderListener);
 
@@ -687,21 +715,23 @@ function chooseMethod(options) {
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.getIdb = getIdb;
+exports.averageResponseTime = averageResponseTime;
+exports.canBeUsed = canBeUsed;
+exports.cleanOldMessages = cleanOldMessages;
+exports.close = close;
+exports.create = create;
 exports.createDatabase = createDatabase;
-exports.writeMessage = writeMessage;
+exports["default"] = void 0;
 exports.getAllMessages = getAllMessages;
+exports.getIdb = getIdb;
 exports.getMessagesHigherThan = getMessagesHigherThan;
-exports.removeMessageById = removeMessageById;
 exports.getOldMessages = getOldMessages;
-exports.cleanOldMessages = cleanOldMessages;
-exports.create = create;
-exports.close = close;
-exports.postMessage = postMessage;
+exports.microSeconds = void 0;
 exports.onMessage = onMessage;
-exports.canBeUsed = canBeUsed;
-exports.averageResponseTime = averageResponseTime;
-exports["default"] = exports.type = exports.microSeconds = void 0;
+exports.postMessage = postMessage;
+exports.removeMessageById = removeMessageById;
+exports.type = void 0;
+exports.writeMessage = writeMessage;
 
 var _util = require("../util.js");
 
@@ -899,7 +929,7 @@ function create(channelName, options) {
        */
       eMIs: new _obliviousSet.ObliviousSet(options.idb.ttl * 2),
       // ensures we do not read messages in parrallel
-      writeBlockPromise: Promise.resolve(),
+      writeBlockPromise: _util.PROMISE_RESOLVED_VOID,
       messagesCallback: null,
       readQueuePromises: [],
       db: db
@@ -953,9 +983,9 @@ function _filterMessage(msgObj, state) {
 
 function readNewMessages(state) {
   // channel already closed
-  if (state.closed) return Promise.resolve(); // if no one is listening, we do not need to scan for new messages
+  if (state.closed) return _util.PROMISE_RESOLVED_VOID; // if no one is listening, we do not need to scan for new messages
 
-  if (!state.messagesCallback) return Promise.resolve();
+  if (!state.messagesCallback) return _util.PROMISE_RESOLVED_VOID;
   return getMessagesHigherThan(state.db, state.lastCursorId).then(function (newerMessages) {
     var useMessages = newerMessages
     /**
@@ -983,7 +1013,7 @@ function readNewMessages(state) {
         state.messagesCallback(msgObj.data);
       }
     });
-    return Promise.resolve();
+    return _util.PROMISE_RESOLVED_VOID;
   });
 }
 
@@ -1038,17 +1068,19 @@ exports["default"] = _default;
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.getLocalStorage = getLocalStorage;
-exports.storageKey = storageKey;
-exports.postMessage = postMessage;
 exports.addStorageEventListener = addStorageEventListener;
-exports.removeStorageEventListener = removeStorageEventListener;
-exports.create = create;
+exports.averageResponseTime = averageResponseTime;
+exports.canBeUsed = canBeUsed;
 exports.close = close;
+exports.create = create;
+exports["default"] = void 0;
+exports.getLocalStorage = getLocalStorage;
+exports.microSeconds = void 0;
 exports.onMessage = onMessage;
-exports.canBeUsed = canBeUsed;
-exports.averageResponseTime = averageResponseTime;
-exports["default"] = exports.type = exports.microSeconds = void 0;
+exports.postMessage = postMessage;
+exports.removeStorageEventListener = removeStorageEventListener;
+exports.storageKey = storageKey;
+exports.type = void 0;
 
 var _obliviousSet = require("oblivious-set");
 
@@ -1236,13 +1268,14 @@ exports["default"] = _default;
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.create = create;
+exports.averageResponseTime = averageResponseTime;
+exports.canBeUsed = canBeUsed;
 exports.close = close;
-exports.postMessage = postMessage;
+exports.create = create;
+exports.microSeconds = exports["default"] = void 0;
 exports.onMessage = onMessage;
-exports.canBeUsed = canBeUsed;
-exports.averageResponseTime = averageResponseTime;
-exports["default"] = exports.type = exports.microSeconds = void 0;
+exports.postMessage = postMessage;
+exports.type = void 0;
 
 var _util = require("../util");
 
@@ -1276,7 +1309,7 @@ function close(channelState) {
 function postMessage(channelState, messageJson) {
   try {
     channelState.bc.postMessage(messageJson, false);
-    return Promise.resolve();
+    return _util.PROMISE_RESOLVED_VOID;
   } catch (err) {
     return Promise.reject(err);
   }
@@ -1323,13 +1356,14 @@ exports["default"] = _default;
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.create = create;
+exports.averageResponseTime = averageResponseTime;
+exports.canBeUsed = canBeUsed;
 exports.close = close;
-exports.postMessage = postMessage;
+exports.create = create;
+exports.microSeconds = exports["default"] = void 0;
 exports.onMessage = onMessage;
-exports.canBeUsed = canBeUsed;
-exports.averageResponseTime = averageResponseTime;
-exports["default"] = exports.type = exports.microSeconds = void 0;
+exports.postMessage = postMessage;
+exports.type = void 0;
 
 var _util = require("../util");
 
@@ -1432,12 +1466,12 @@ function fillOptionsWithDefaults() {
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
+exports.isNode = exports.PROMISE_RESOLVED_VOID = exports.PROMISE_RESOLVED_FALSE = exports.PROMISE_REJECTED = void 0;
 exports.isPromise = isPromise;
-exports.sleep = sleep;
+exports.microSeconds = microSeconds;
 exports.randomInt = randomInt;
 exports.randomToken = randomToken;
-exports.microSeconds = microSeconds;
-exports.isNode = void 0;
+exports.sleep = sleep;
 
 /**
  * returns true if the given object is a promise
@@ -1450,6 +1484,13 @@ function isPromise(obj) {
   }
 }
 
+var PROMISE_RESOLVED_FALSE = Promise.resolve(false);
+exports.PROMISE_RESOLVED_FALSE = PROMISE_RESOLVED_FALSE;
+var PROMISE_RESOLVED_VOID = Promise.resolve();
+exports.PROMISE_RESOLVED_VOID = PROMISE_RESOLVED_VOID;
+var PROMISE_REJECTED = Promise.reject(new Error());
+exports.PROMISE_REJECTED = PROMISE_REJECTED;
+
 function sleep(time) {
   if (!time) time = 0;
   return new Promise(function (res) {
diff --git a/package.json b/package.json
index 3c7d4e33..703cb139 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "broadcast-channel",
-  "version": "4.2.0",
+  "version": "4.3.0",
   "description": "A BroadcastChannel that works in New Browsers, Old Browsers, WebWorkers and NodeJs",
   "exports": {
     ".": {