updated with events added to correct date and editable