fixed some event table issues