cleanup and bugfix at event loading