Closes #51 and closes #52 Fix glitches in saving of events