work on event editing function and other fixes