Time when editing event could be wrong. A few cosmetic improvements.