Improves leader election so that we don't lose events (#153)

Improves leader election so that we don't lose events (#153) #228