Event class & misc fixes