minor bug fixes edit event not populating correctly